From 3cea02207a0dbf373bc2200938b4757ae1c8a5bc Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 17 Mar 2024 20:13:02 +1000
Subject: [PATCH] avidemux: bump version

---
 .../avidemux/additional-files/haikuicons.zip  | Bin 19978 -> 24145 bytes
 ...mux-2.8.0.recipe => avidemux-2.8.1.recipe} |   6 +--
 ...2.8.0.patchset => avidemux-2.8.1.patchset} |  47 ++++--------------
 3 files changed, 13 insertions(+), 40 deletions(-)
 rename media-video/avidemux/{avidemux-2.8.0.recipe => avidemux-2.8.1.recipe} (97%)
 rename media-video/avidemux/patches/{avidemux-2.8.0.patchset => avidemux-2.8.1.patchset} (96%)

diff --git a/media-video/avidemux/additional-files/haikuicons.zip b/media-video/avidemux/additional-files/haikuicons.zip
index 324aad7808d48b9856d6ba98fc2e9070311a5955..3353808a962b6f2d90f001d0fb0dfe8c2c3e55fe 100644
GIT binary patch
delta 4329
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
G|KdO37~{bJ

delta 477
zcmcb(hp}r8;{<)iZ<7_`L?+9-ac=ZwXNL0hwc|IRU`}D4yh=<HuAq5yws<%b5;saJ
z6TxlT93^`VreEHzdGiUy9+)iHIF)#0+5H;PP}$A;+TRfh6E@G*D~54F#w;^D2jl8%
z2TlGT#JBmS2`jQuZ5C@`DnJ@eTk{}fn>Od!`ysf^n?szpK^1S7cUy*#;hgAOwK>*H
z7Ams2-*+h^l2_08pMlu{bj9ZXL2H;NmxRkPDX~wU5+2DU$Tj&rkP_gX>=hBs)F3!{
zc|-)$LXpXgk<m<55|iU1Lz!}<CvS}mW2%sw%o`QP6s<TpH7b&2OXFdc$%mpMnJhFW
z%SOjBHE2(+jgDqg(Vu(^NO2fXHjjy63OAcPH71%#z-scRm{_J`wvz*6W0)H4C$EnM
a8Sva`GEba2pD2SULkBwpLyj8*5C8yuK&GSs

diff --git a/media-video/avidemux/avidemux-2.8.0.recipe b/media-video/avidemux/avidemux-2.8.1.recipe
similarity index 97%
rename from media-video/avidemux/avidemux-2.8.0.recipe
rename to media-video/avidemux/avidemux-2.8.1.recipe
index b76820c0c..186406520 100644
--- a/media-video/avidemux/avidemux-2.8.0.recipe
+++ b/media-video/avidemux/avidemux-2.8.1.recipe
@@ -4,11 +4,11 @@ filtering and encoding tasks. It supports many file types, including AVI, \
 DVD compatible MPEG files, MP4 and ASF, using a variety of codecs. Tasks \
 can be automated using projects, job queue and powerful scripting capabilities."
 HOMEPAGE="http://fixounet.free.fr/avidemux/"
-COPYRIGHT="2001–2021 Mean"
+COPYRIGHT="2001–2023 Mean"
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://sourceforge.net/projects/avidemux/files/avidemux/$portVersion/avidemux_$portVersion.tar.gz"
-CHECKSUM_SHA256="d1ec6f5277e51228ecf0ee1ca89fae24c591f520f87ce96fabec8818d04de33b"
+CHECKSUM_SHA256="77d9bdca8683ce57c192b69d207cfab7cf92a7759ce0f63fa37b5c8e42ad3da2"
 SOURCE_DIR="avidemux_$portVersion"
 PATCHES="avidemux-$portVersion.patchset"
 ADDITIONAL_FILES="
diff --git a/media-video/avidemux/patches/avidemux-2.8.0.patchset b/media-video/avidemux/patches/avidemux-2.8.1.patchset
similarity index 96%
rename from media-video/avidemux/patches/avidemux-2.8.0.patchset
rename to media-video/avidemux/patches/avidemux-2.8.1.patchset
index cc85c393a..25453b321 100644
--- a/media-video/avidemux/patches/avidemux-2.8.0.patchset
+++ b/media-video/avidemux/patches/avidemux-2.8.1.patchset
@@ -1,36 +1,9 @@
-From 7e9ed4dafd3151061299116c745a0ec1abd3361a Mon Sep 17 00:00:00 2001
+From f1d4e6fc9978f2786e5614bed468bb34eada01a0 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Wed, 29 Dec 2021 15:12:15 +1000
+Date: Sun, 17 Mar 2024 18:58:41 +1000
 Subject: Add Haiku support
 
 
-diff --git a/.gitignore b/.gitignore
-deleted file mode 100644
-index 7df8bb0..0000000
---- a/.gitignore
-+++ /dev/null
-@@ -1,21 +0,0 @@
--*~
--*.rej
--*.orig
--[tT]ags
--Doxyfile
--*.kdev*
--ffconf
--*.sw*
--build*
--debs
--addons/*
--install/*
--avidemux/qt4/common
--oldcrap/*
--nbproject
--avidemux/oldFiles/
--myBuild*
--oprofile_data
--avidemux/winInstaller/AvidemuxVersion.nsh
--avidemux/qt4/xdg_data/org.avidemux.Avidemux.appdata.xml
--*.DS_Store
 diff --git a/avidemux/common/main.cpp b/avidemux/common/main.cpp
 old mode 100755
 new mode 100644
@@ -97,7 +70,7 @@ index cfb29a9..c64e971 100644
      return 0;
  }
 diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp b/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp
-index caba43f..d8b1e39 100644
+index 10310d7..326727a 100644
 --- a/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp
 +++ b/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp
 @@ -29,7 +29,7 @@
@@ -136,8 +109,8 @@ index caba43f..d8b1e39 100644
 +    xinfo->display = NULL;
 +    xinfo->systemWindowId=0;
  #elif defined(__APPLE__)
- #   if defined(ADM_CPU_X86_64)
      xinfo->display = NULL; // we may not call winId() on a QWidget on macOS, it breaks OpenGL
+     xinfo->systemWindowId=0;
 diff --git a/avidemux/qt4/CMakeLists.txt b/avidemux/qt4/CMakeLists.txt
 old mode 100755
 new mode 100644
@@ -307,10 +280,10 @@ index 29054cd..db88952 100644
  ENDIF (UNIX)
  
 diff --git a/avidemux_core/ADM_coreUtils/src/prefs2_pref.h b/avidemux_core/ADM_coreUtils/src/prefs2_pref.h
-index 490784d..c7a6718 100644
+index 46f4f63..e646811 100644
 --- a/avidemux_core/ADM_coreUtils/src/prefs2_pref.h
 +++ b/avidemux_core/ADM_coreUtils/src/prefs2_pref.h
-@@ -61,7 +61,7 @@ static optionDesc myOptions[]={
+@@ -63,7 +63,7 @@ static optionDesc myOptions[]={
  { LASTPROJECTS_FILE3,"lastprojects.file3"                             ,ADM_param_stdstring  	,"",	0,	0},
  { LASTPROJECTS_FILE4,"lastprojects.file4"                             ,ADM_param_stdstring  	,"",	0,	0},
  { MESSAGE_LEVEL,"message_level"                                       ,ADM_param_uint32_t	,"2",	0,	2},
@@ -849,10 +822,10 @@ index 43a135c..99da224 100644
  		string(REGEX MATCH "#define[ ]+HAVE_YASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
  
 diff --git a/cmake/admFFmpegBuild_helpers.cmake b/cmake/admFFmpegBuild_helpers.cmake
-index 40796ef..1f5fc39 100644
+index 607d0da..9ce427a 100644
 --- a/cmake/admFFmpegBuild_helpers.cmake
 +++ b/cmake/admFFmpegBuild_helpers.cmake
-@@ -44,7 +44,7 @@ set(FFMPEG_BSFS         h264_mp4toannexb aac_adtstoasc)
+@@ -44,7 +44,7 @@ set(FFMPEG_BSFS         h264_mp4toannexb hevc_mp4toannexb aac_adtstoasc extract_
  #
  MACRO(ADM_FF_SET_DEFAULT)
      xadd("--enable-shared --disable-static --disable-everything --disable-avfilter --enable-hwaccels --enable-postproc --enable-gpl")
@@ -871,7 +844,7 @@ index 40796ef..1f5fc39 100644
          string(REGEX MATCH "#define[ ]+HAVE_X86ASM[ ]+1" FF_YASM "${FF_CONFIG_H}")
  
 diff --git a/cmake/admFFmpegBuild_native.cmake b/cmake/admFFmpegBuild_native.cmake
-index ba4c020..b7638c6 100644
+index 0476d7f..6e7fd9e 100644
 --- a/cmake/admFFmpegBuild_native.cmake
 +++ b/cmake/admFFmpegBuild_native.cmake
 @@ -47,6 +47,11 @@ if (NOT APPLE AND NOT ADM_CPU_X86_32)
@@ -928,5 +901,5 @@ index 00304cf..07077fa 100644
     return 0;
  }
 -- 
-2.30.2
+2.43.2