From a02802fab218b68b516c6764eaa0592c24929f98 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 21 Aug 2020 13:41:12 +1000 Subject: [PATCH] Avidemux: bump version --- .../additional-files/avidemux.rdef.in | 2 + ...mux-2.7.4.recipe => avidemux-2.7.6.recipe} | 6 +- ...2.7.4.patchset => avidemux-2.7.6.patchset} | 171 ++++++++---------- 3 files changed, 77 insertions(+), 102 deletions(-) rename media-video/avidemux/{avidemux-2.7.4.recipe => avidemux-2.7.6.recipe} (97%) rename media-video/avidemux/patches/{avidemux-2.7.4.patchset => avidemux-2.7.6.patchset} (93%) diff --git a/media-video/avidemux/additional-files/avidemux.rdef.in b/media-video/avidemux/additional-files/avidemux.rdef.in index b672c1c06..23adf8ecc 100644 --- a/media-video/avidemux/additional-files/avidemux.rdef.in +++ b/media-video/avidemux/additional-files/avidemux.rdef.in @@ -15,6 +15,8 @@ resource app_version { resource app_signature "@APP_SIGNATURE@"; +resource("QT:QPA_FLAGS") "Q_REF_TO_ARGV|Q_REF_TO_FORK"; + resource file_types message { "types" = "application/x-asf", "types" = "video" diff --git a/media-video/avidemux/avidemux-2.7.4.recipe b/media-video/avidemux/avidemux-2.7.6.recipe similarity index 97% rename from media-video/avidemux/avidemux-2.7.4.recipe rename to media-video/avidemux/avidemux-2.7.6.recipe index b72a76d7d..aac8f9253 100644 --- a/media-video/avidemux/avidemux-2.7.4.recipe +++ b/media-video/avidemux/avidemux-2.7.6.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–2019 Mean" +COPYRIGHT="2001–2020 Mean" LICENSE="GNU GPL v3" -REVISION="4" +REVISION="1" SOURCE_URI="https://sourceforge.net/projects/avidemux/files/avidemux/$portVersion/avidemux_$portVersion.tar.gz" -CHECKSUM_SHA256="7db0ac01c8255279a2c360ecb2725c27ea8a2c5bd1f38aeafabfed33ea588da9" +CHECKSUM_SHA256="9a88741f3535443d4bde35d4207ca2ff96d3b136db2e7232cb50dd6b4eb293cf" SOURCE_DIR="avidemux_$portVersion" PATCHES="avidemux-$portVersion.patchset" ADDITIONAL_FILES=" diff --git a/media-video/avidemux/patches/avidemux-2.7.4.patchset b/media-video/avidemux/patches/avidemux-2.7.6.patchset similarity index 93% rename from media-video/avidemux/patches/avidemux-2.7.4.patchset rename to media-video/avidemux/patches/avidemux-2.7.6.patchset index 28b9f5251..6707014c8 100644 --- a/media-video/avidemux/patches/avidemux-2.7.4.patchset +++ b/media-video/avidemux/patches/avidemux-2.7.6.patchset @@ -1,13 +1,13 @@ -From 8f383b7b46dcf51c5adde690d598b074395c9488 Mon Sep 17 00:00:00 2001 +From 6142ea29a864060eb332c96f43cf7ffc9016844b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 13 Oct 2019 11:22:36 +1000 +Date: Fri, 21 Aug 2020 13:23:05 +1000 Subject: Fix build for Haiku diff --git a/avidemux/common/main.cpp b/avidemux/common/main.cpp old mode 100755 new mode 100644 -index 0541664..aab7f84 +index d0fa9c4..ef42730 --- a/avidemux/common/main.cpp +++ b/avidemux/common/main.cpp @@ -61,7 +61,9 @@ int main(int _argc, char *_argv[]) @@ -105,7 +105,7 @@ index 006c386..9b16954 100644 diff --git a/avidemux/qt4/CMakeLists.txt b/avidemux/qt4/CMakeLists.txt old mode 100755 new mode 100644 -index e221510..ef50431 +index 3d77612..5ebacd1 --- a/avidemux/qt4/CMakeLists.txt +++ b/avidemux/qt4/CMakeLists.txt @@ -28,7 +28,11 @@ ELSE(WIN32) @@ -198,7 +198,7 @@ index 5066122..f0cc2e0 100644 dlclose(hinstLib); #endif diff --git a/avidemux_core/ADM_core/src/ADM_folder_linux.cpp b/avidemux_core/ADM_core/src/ADM_folder_linux.cpp -index 79551ed..95b4451 100644 +index 1848768..3334d2e 100644 --- a/avidemux_core/ADM_core/src/ADM_folder_linux.cpp +++ b/avidemux_core/ADM_core/src/ADM_folder_linux.cpp @@ -39,7 +39,11 @@ static std::string ADM_i18nDir; @@ -213,7 +213,7 @@ index 79551ed..95b4451 100644 if(simple2) { out=std::string(simple2)+std::string("/"); -@@ -141,9 +145,11 @@ void ADM_initBaseDir(int argc, char *argv[]) +@@ -162,9 +166,11 @@ void ADM_initBaseDir(int argc, char *argv[]) } strcpy(ADM_basedir, homeEnv); AddSeparator(ADM_basedir); @@ -228,10 +228,10 @@ index 79551ed..95b4451 100644 strcat(ADM_basedir, ADM_SEPARATOR); diff --git a/avidemux_core/ADM_core/src/CMakeLists.txt b/avidemux_core/ADM_core/src/CMakeLists.txt -index 93abbd1..f65d6d6 100644 +index 7a4a55c..85b29e2 100644 --- a/avidemux_core/ADM_core/src/CMakeLists.txt +++ b/avidemux_core/ADM_core/src/CMakeLists.txt -@@ -46,6 +46,8 @@ IF (WIN32) +@@ -44,6 +44,8 @@ IF (WIN32) target_link_libraries(ADM_core6 imagehlp ws2_32) ELSEIF (APPLE) target_link_libraries(ADM_core6 "-framework Carbon") @@ -254,7 +254,7 @@ index 82cc397..d3b4a72 100644 + ADM_INSTALL_LIB(ADM_coreSocket6) diff --git a/avidemux_core/ADM_coreSqlLight3/src/CMakeLists.txt b/avidemux_core/ADM_coreSqlLight3/src/CMakeLists.txt -index 8eb97c0..131bbc8 100644 +index 60f04b2..9c2843e 100644 --- a/avidemux_core/ADM_coreSqlLight3/src/CMakeLists.txt +++ b/avidemux_core/ADM_coreSqlLight3/src/CMakeLists.txt @@ -12,7 +12,11 @@ IF (APPLE) @@ -271,10 +271,10 @@ index 8eb97c0..131bbc8 100644 ENDIF (UNIX) diff --git a/avidemux_core/ADM_coreUtils/src/prefs2_pref.h b/avidemux_core/ADM_coreUtils/src/prefs2_pref.h -index 0102c8a..3e4e4ac 100644 +index e5d18a2..54cbf5e 100644 --- a/avidemux_core/ADM_coreUtils/src/prefs2_pref.h +++ b/avidemux_core/ADM_coreUtils/src/prefs2_pref.h -@@ -58,7 +58,7 @@ static optionDesc myOptions[]={ +@@ -57,7 +57,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}, @@ -283,23 +283,6 @@ index 0102c8a..3e4e4ac 100644 { AUDIO_DEVICE_ALSA_DEVICE,"audio_device.alsa_device" ,ADM_param_stdstring ,"dmix", 0, 0}, { VIDEODEVICE,"videodevice" ,ADM_param_uint32_t ,"0", 0, 10}, { PRIORITY_ENCODING,"priority.encoding" ,ADM_param_uint32_t ,"3", 0, 4}, -diff --git a/avidemux_core/CMakeLists.txt b/avidemux_core/CMakeLists.txt -index ba31722..1fea9d6 100644 ---- a/avidemux_core/CMakeLists.txt -+++ b/avidemux_core/CMakeLists.txt -@@ -52,9 +52,9 @@ checkFtello() - MESSAGE(STATUS "Checking for sqlite") - MESSAGE(STATUS "*******************") - --IF (UNIX) -- SET(SQLITE_REQUIRED_FLAGS "-ldl") --ENDIF (UNIX) -+#IF (UNIX AND NOT HAIKU) -+# SET(SQLITE_REQUIRED_FLAGS "-ldl") -+#ENDIF (UNIX) - - FIND_HEADER_AND_LIB(SQLITE sqlite3.h sqlite3 sqlite3_close ${SQLITE_REQUIRED_FLAGS}) - PRINT_LIBRARY_INFO("SQLite" SQLITE_FOUND "${SQLITE_INCLUDE_DIR}" "${SQLITE_LIBRARY_DIR}" FATAL_ERROR) diff --git a/avidemux_plugins/ADM_audioDevices/CMakeLists.txt b/avidemux_plugins/ADM_audioDevices/CMakeLists.txt index 0d7136b..f655b75 100644 --- a/avidemux_plugins/ADM_audioDevices/CMakeLists.txt @@ -807,6 +790,66 @@ index 2e3f4d9..f9a91e5 100644 SET(DL dl) ELSE(NOT WIN32) IF(NOT MSVC) +diff --git a/cmake/admFFmpegBuild.cmake.original b/cmake/admFFmpegBuild.cmake.original +index 43a135c..99da224 100644 +--- a/cmake/admFFmpegBuild.cmake.original ++++ b/cmake/admFFmpegBuild.cmake.original +@@ -30,7 +30,7 @@ set(FFMPEG_PARSERS ac3 h263 h264 hevc mpeg4video) + set(FFMPEG_PROTOCOLS file) + set(FFMPEG_BSFS h264_mp4toannexb aac_adtstoasc) + xadd("--enable-shared --disable-static --disable-everything --disable-avfilter --enable-hwaccels --enable-postproc --enable-gpl") +-xadd("--enable-runtime-cpudetect --disable-network ") ++xadd("--disable-runtime-cpudetect --disable-asm --disable-network") + xadd("--enable-swscale --disable-swresample") + xadd("--disable-doc --disable-programs") + +@@ -286,7 +286,7 @@ if (FFMPEG_PERFORM_BUILD) + + MESSAGE(STATUS "Configuring done, processing") + +- if (ADM_CPU_X86) ++ if (ADM_CPU_X86 AND NOT HAIKU) + file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H) + 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 ee5354c..4ae0269 100644 +--- a/cmake/admFFmpegBuild_helpers.cmake ++++ b/cmake/admFFmpegBuild_helpers.cmake +@@ -44,7 +44,7 @@ set(FFMPEG_BSFS h264_mp4toannexb aac_adtstoasc) + # + MACRO(ADM_FF_SET_DEFAULT) + xadd("--enable-shared --disable-static --disable-everything --disable-avfilter --enable-hwaccels --enable-postproc --enable-gpl") +- xadd("--enable-runtime-cpudetect --disable-network ") ++ xadd("--disable-runtime-cpudetect --disable-asm --disable-network ") + xadd("--enable-swscale --disable-swresample") + xadd("--disable-doc --disable-programs") + +@@ -286,7 +286,7 @@ MACRO(ADM_FF_BUILD_UNIX_STYLE) + + MESSAGE(STATUS "Configuring done, processing") + +- if (ADM_CPU_X86) ++ if (ADM_CPU_X86 AND NOT HAIKU) + file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H) + 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 a26a465..3733ce4 100644 +--- a/cmake/admFFmpegBuild_native.cmake ++++ b/cmake/admFFmpegBuild_native.cmake +@@ -43,6 +43,11 @@ if (APPLE AND "$ENV{MACOSX_DEPLOYMENT_TARGET}" VERSION_EQUAL "10.15") + xadd(--extra-cflags="-fno-stack-check") # see https://trac.ffmpeg.org/ticket/8073 + endif (APPLE AND "$ENV{MACOSX_DEPLOYMENT_TARGET}" VERSION_EQUAL "10.15") + ++if (HAIKU) ++ xadd(--disable-runtime-cpudetect) ++ xadd(--disable-asm) ++endif (HAIKU) ++ + #@@ + ADM_FF_ADD_OPTIONS() + diff --git a/cmake/cmake_compile_check/execinfo.cpp b/cmake/cmake_compile_check/execinfo.cpp index 00304cf..07077fa 100644 --- a/cmake/cmake_compile_check/execinfo.cpp @@ -849,75 +892,5 @@ index 00304cf..07077fa 100644 return 0; } -- -2.24.1 - - -From b98aa78389f1a85395613400481a93ed52f514cd Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 14 Jan 2020 22:46:29 +1000 -Subject: Disable asm for ffmpeg - - -diff --git a/cmake/admFFmpegBuild.cmake.original b/cmake/admFFmpegBuild.cmake.original -index 43a135c..99da224 100644 ---- a/cmake/admFFmpegBuild.cmake.original -+++ b/cmake/admFFmpegBuild.cmake.original -@@ -30,7 +30,7 @@ set(FFMPEG_PARSERS ac3 h263 h264 hevc mpeg4video) - set(FFMPEG_PROTOCOLS file) - set(FFMPEG_BSFS h264_mp4toannexb aac_adtstoasc) - xadd("--enable-shared --disable-static --disable-everything --disable-avfilter --enable-hwaccels --enable-postproc --enable-gpl") --xadd("--enable-runtime-cpudetect --disable-network ") -+xadd("--disable-runtime-cpudetect --disable-asm --disable-network") - xadd("--enable-swscale --disable-swresample") - xadd("--disable-doc --disable-programs") - -@@ -286,7 +286,7 @@ if (FFMPEG_PERFORM_BUILD) - - MESSAGE(STATUS "Configuring done, processing") - -- if (ADM_CPU_X86) -+ if (ADM_CPU_X86 AND NOT HAIKU) - file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H) - 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 2c984cb..5851f0f 100644 ---- a/cmake/admFFmpegBuild_helpers.cmake -+++ b/cmake/admFFmpegBuild_helpers.cmake -@@ -36,7 +36,7 @@ set(FFMPEG_BSFS h264_mp4toannexb aac_adtstoasc) - # - MACRO(ADM_FF_SET_DEFAULT) - xadd("--enable-shared --disable-static --disable-everything --disable-avfilter --enable-hwaccels --enable-postproc --enable-gpl") -- xadd("--enable-runtime-cpudetect --disable-network ") -+ xadd("--disable-runtime-cpudetect --disable-asm --disable-network ") - xadd("--enable-swscale --disable-swresample") - xadd("--disable-doc --disable-programs") - -@@ -278,7 +278,7 @@ MACRO(ADM_FF_BUILD_UNIX_STYLE) - - MESSAGE(STATUS "Configuring done, processing") - -- if (ADM_CPU_X86) -+ if (ADM_CPU_X86 AND NOT HAIKU) - file(READ ${FFMPEG_BINARY_DIR}/config.h FF_CONFIG_H) - 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 77848ca..708bba2 100644 ---- a/cmake/admFFmpegBuild_native.cmake -+++ b/cmake/admFFmpegBuild_native.cmake -@@ -40,6 +40,11 @@ if (USE_VIDEOTOOLBOX) - set(FFMPEG_ENCODERS ${FFMPEG_ENCODERS} h264_videotoolbox) - endif (USE_VIDEOTOOLBOX) - -+if (HAIKU) -+ xadd(--disable-runtime-cpudetect) -+ xadd(--disable-asm) -+endif (HAIKU) -+ - #@@ - ADM_FF_ADD_OPTIONS() - --- -2.24.1 +2.28.0