From cefa60db2f5d34597a91d98647078c3540097566 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 28 Jun 2021 21:56:15 +1000 Subject: [PATCH] Avidemux: bump version --- ...mux-2.7.6.recipe => avidemux-2.7.8.recipe} | 6 +- ...2.7.6.patchset => avidemux-2.7.8.patchset} | 105 +++++++++++------- 2 files changed, 69 insertions(+), 42 deletions(-) rename media-video/avidemux/{avidemux-2.7.6.recipe => avidemux-2.7.8.recipe} (97%) rename media-video/avidemux/patches/{avidemux-2.7.6.patchset => avidemux-2.7.8.patchset} (91%) diff --git a/media-video/avidemux/avidemux-2.7.6.recipe b/media-video/avidemux/avidemux-2.7.8.recipe similarity index 97% rename from media-video/avidemux/avidemux-2.7.6.recipe rename to media-video/avidemux/avidemux-2.7.8.recipe index 2dcbd3989..6cd5a3628 100644 --- a/media-video/avidemux/avidemux-2.7.6.recipe +++ b/media-video/avidemux/avidemux-2.7.8.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–2020 Mean" +COPYRIGHT="2001–2021 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="9a88741f3535443d4bde35d4207ca2ff96d3b136db2e7232cb50dd6b4eb293cf" +CHECKSUM_SHA256="628a404f521ff2812760700ae3e2aa78e5816b0ff3fb6fd05ac3e75248d97401" SOURCE_DIR="avidemux_$portVersion" PATCHES="avidemux-$portVersion.patchset" ADDITIONAL_FILES=" diff --git a/media-video/avidemux/patches/avidemux-2.7.6.patchset b/media-video/avidemux/patches/avidemux-2.7.8.patchset similarity index 91% rename from media-video/avidemux/patches/avidemux-2.7.6.patchset rename to media-video/avidemux/patches/avidemux-2.7.8.patchset index 6707014c8..cfc2e694a 100644 --- a/media-video/avidemux/patches/avidemux-2.7.6.patchset +++ b/media-video/avidemux/patches/avidemux-2.7.8.patchset @@ -1,17 +1,17 @@ -From 6142ea29a864060eb332c96f43cf7ffc9016844b Mon Sep 17 00:00:00 2001 +From 20d10f2864f35c6053a0e494367505eebd762493 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 21 Aug 2020 13:23:05 +1000 -Subject: Fix build for Haiku +Date: Mon, 28 Jun 2021 21:36:01 +1000 +Subject: Add Haiku support diff --git a/avidemux/common/main.cpp b/avidemux/common/main.cpp old mode 100755 new mode 100644 -index d0fa9c4..ef42730 +index 4b3306a..99e066d --- a/avidemux/common/main.cpp +++ b/avidemux/common/main.cpp -@@ -61,7 +61,9 @@ int main(int _argc, char *_argv[]) - redirectStdoutToFile("admlog.txt"); +@@ -91,7 +91,9 @@ int main(int _argc, char *_argv[]) + } #endif +#ifndef __HAIKU__ @@ -20,7 +20,7 @@ index d0fa9c4..ef42730 char **argv; int argc; -@@ -83,9 +85,9 @@ int main(int _argc, char *_argv[]) +@@ -113,9 +115,9 @@ int main(int _argc, char *_argv[]) #ifdef _WIN32 freeUtf8CommandLine(argc, argv); #endif @@ -70,10 +70,10 @@ 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 006c386..9b16954 100644 +index 8312320..c241ef6 100644 --- a/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp +++ b/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp -@@ -82,9 +82,6 @@ bool ADM_QPreviewCleanup(void) +@@ -77,9 +77,6 @@ bool ADM_QPreviewCleanup(void) * * @param z */ @@ -83,7 +83,7 @@ index 006c386..9b16954 100644 ADM_Qvideo::ADM_Qvideo(QFrame *z) : QWidget(z) { useExternalRedraw(true); -@@ -104,8 +101,6 @@ ADM_Qvideo::ADM_Qvideo(QFrame *z) : QWidget(z) +@@ -99,8 +96,6 @@ ADM_Qvideo::ADM_Qvideo(QFrame *z) : QWidget(z) hostFrame=z; } //{setAutoFillBackground(false);} @@ -92,23 +92,13 @@ index 006c386..9b16954 100644 ADM_Qvideo::~ADM_Qvideo() { -@@ -215,6 +210,9 @@ void UI_getWindowInfo(void *draw, GUI_WindowInfo *xinfo) - #if defined(_WIN32) - xinfo->display=(void *)videoWindow->winId(); - xinfo->systemWindowId=videoWindow->winId(); -+#elif defined(__HAIKU__) -+ 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 diff --git a/avidemux/qt4/CMakeLists.txt b/avidemux/qt4/CMakeLists.txt old mode 100755 new mode 100644 -index 3d77612..5ebacd1 +index 5d1ab5f..235f718 --- a/avidemux/qt4/CMakeLists.txt +++ b/avidemux/qt4/CMakeLists.txt -@@ -28,7 +28,11 @@ ELSE(WIN32) +@@ -30,7 +30,11 @@ ELSE(WIN32) IF(APPLE) include(adm_osx.cmake) ELSE(APPLE) @@ -198,7 +188,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 1848768..3334d2e 100644 +index 4288c28..bb95b93 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; @@ -212,8 +202,8 @@ index 1848768..3334d2e 100644 +#endif if(simple2) { - out=std::string(simple2)+std::string("/"); -@@ -162,9 +166,11 @@ void ADM_initBaseDir(int argc, char *argv[]) + out=std::string(simple2); +@@ -164,9 +168,11 @@ void ADM_initBaseDir(int argc, char *argv[]) } strcpy(ADM_basedir, homeEnv); AddSeparator(ADM_basedir); @@ -228,10 +218,10 @@ index 1848768..3334d2e 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 7a4a55c..85b29e2 100644 +index 25bf2e3..9914128 100644 --- a/avidemux_core/ADM_core/src/CMakeLists.txt +++ b/avidemux_core/ADM_core/src/CMakeLists.txt -@@ -44,6 +44,8 @@ IF (WIN32) +@@ -43,6 +43,8 @@ IF (WIN32) target_link_libraries(ADM_core6 imagehlp ws2_32) ELSEIF (APPLE) target_link_libraries(ADM_core6 "-framework Carbon") @@ -241,10 +231,10 @@ index 7a4a55c..85b29e2 100644 target_link_libraries(ADM_core6 dl m) ENDIF (WIN32) diff --git a/avidemux_core/ADM_coreSocket/src/CMakeLists.txt b/avidemux_core/ADM_coreSocket/src/CMakeLists.txt -index 82cc397..d3b4a72 100644 +index 2186fb5..4c2512a 100644 --- a/avidemux_core/ADM_coreSocket/src/CMakeLists.txt +++ b/avidemux_core/ADM_coreSocket/src/CMakeLists.txt -@@ -13,4 +13,8 @@ if (WIN32) +@@ -12,4 +12,8 @@ if (WIN32) target_link_libraries(ADM_coreSocket6 wsock32) endif (WIN32) @@ -254,10 +244,10 @@ 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 60f04b2..9c2843e 100644 +index 29054cd..db88952 100644 --- a/avidemux_core/ADM_coreSqlLight3/src/CMakeLists.txt +++ b/avidemux_core/ADM_coreSqlLight3/src/CMakeLists.txt -@@ -12,7 +12,11 @@ IF (APPLE) +@@ -11,7 +11,11 @@ IF (APPLE) TARGET_LINK_LIBRARIES(ADM_coreSqlLight3 -Wl,-read_only_relocs,suppress) ENDIF (APPLE) @@ -271,10 +261,10 @@ index 60f04b2..9c2843e 100644 ENDIF (UNIX) diff --git a/avidemux_core/ADM_coreUtils/src/prefs2_pref.h b/avidemux_core/ADM_coreUtils/src/prefs2_pref.h -index e5d18a2..54cbf5e 100644 +index 3a7e030..d534a14 100644 --- a/avidemux_core/ADM_coreUtils/src/prefs2_pref.h +++ b/avidemux_core/ADM_coreUtils/src/prefs2_pref.h -@@ -57,7 +57,7 @@ static optionDesc myOptions[]={ +@@ -58,7 +58,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}, @@ -813,7 +803,7 @@ 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 ee5354c..4ae0269 100644 +index f4d483a..d22cd25 100644 --- a/cmake/admFFmpegBuild_helpers.cmake +++ b/cmake/admFFmpegBuild_helpers.cmake @@ -44,7 +44,7 @@ set(FFMPEG_BSFS h264_mp4toannexb aac_adtstoasc) @@ -835,12 +825,12 @@ index ee5354c..4ae0269 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 a26a465..3733ce4 100644 +index 6d7c695..5b5d1d2 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") +@@ -47,6 +47,11 @@ if (NOT APPLE) + xadd(--enable-lto) + endif (NOT APPLE) +if (HAIKU) + xadd(--disable-runtime-cpudetect) @@ -892,5 +882,42 @@ index 00304cf..07077fa 100644 return 0; } -- -2.28.0 +2.30.2 + + +From a58e92ab37a57f9601ef91ba436ca48d833e9e73 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Mon, 28 Jun 2021 21:54:17 +1000 +Subject: Fix build + + +diff --git a/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp b/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp +index c241ef6..4c6087a 100644 +--- a/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp ++++ b/avidemux/qt4/ADM_userInterfaces/ADM_gui/T_preview.cpp +@@ -30,10 +30,12 @@ + # if QT_VERSION < QT_VERSION_CHECK(5,0,0) + # include // removed in qt5 + # else ++#ifndef __HAIKU__ + extern "C" + { + extern void *XOpenDisplay( char *name); + } ++#endif + # include + # endif + #endif +@@ -204,6 +206,9 @@ void UI_getWindowInfo(void *draw, GUI_WindowInfo *xinfo) + #if defined(_WIN32) + xinfo->display=(void *)videoWindow->winId(); + xinfo->systemWindowId=videoWindow->winId(); ++#elif defined(__HAIKU__) ++ 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 +-- +2.30.2