diff --git a/media-video/avidemux/additional-files/haikuicons.zip b/media-video/avidemux/additional-files/haikuicons.zip index 324aad780..3353808a9 100644 Binary files a/media-video/avidemux/additional-files/haikuicons.zip and b/media-video/avidemux/additional-files/haikuicons.zip differ 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