diff --git a/media-video/avidemux/avidemux-2.7.3.recipe b/media-video/avidemux/avidemux-2.7.4.recipe similarity index 95% rename from media-video/avidemux/avidemux-2.7.3.recipe rename to media-video/avidemux/avidemux-2.7.4.recipe index ab8d3907d..95d3c6247 100644 --- a/media-video/avidemux/avidemux-2.7.3.recipe +++ b/media-video/avidemux/avidemux-2.7.4.recipe @@ -6,9 +6,9 @@ can be automated using projects, job queue and powerful scripting capabilities." HOMEPAGE="http://fixounet.free.fr/avidemux/" COPYRIGHT="2001–2019 Mean" LICENSE="GNU GPL v3" -REVISION="3" +REVISION="1" SOURCE_URI="https://sourceforge.net/projects/avidemux/files/avidemux/$portVersion/avidemux_$portVersion.tar.gz" -CHECKSUM_SHA256="8d768e09cb646e4aa954d3332417fc565261590fb4944bccb917c192adada29f" +CHECKSUM_SHA256="7db0ac01c8255279a2c360ecb2725c27ea8a2c5bd1f38aeafabfed33ea588da9" SOURCE_DIR="avidemux_$portVersion" PATCHES="avidemux-$portVersion.patchset" ADDITIONAL_FILES=" @@ -30,7 +30,7 @@ REQUIRES=" lib:libcddb$secondaryArchSuffix lib:libexecinfo$secondaryArchSuffix lib:libfaac$secondaryArchSuffix -# lib:libfaad$secondaryArchSuffix + lib:libfaad$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libGLU$secondaryArchSuffix lib:libiconv$secondaryArchSuffix @@ -59,7 +59,7 @@ BUILD_REQUIRES=" devel:libcddb$secondaryArchSuffix devel:libexecinfo$secondaryArchSuffix devel:libfaac$secondaryArchSuffix -# devel:libfaad$secondaryArchSuffix + devel:libfaad$secondaryArchSuffix devel:libgl$secondaryArchSuffix devel:libglu$secondaryArchSuffix devel:libiconv$secondaryArchSuffix @@ -104,7 +104,7 @@ BUILD() --with-qt \ --with-system-libass \ --with-system-liba52 \ - --with-system-libmad + --with-system-libmad } INSTALL() diff --git a/media-video/avidemux/patches/avidemux-2.7.3.patchset b/media-video/avidemux/patches/avidemux-2.7.4.patchset similarity index 96% rename from media-video/avidemux/patches/avidemux-2.7.3.patchset rename to media-video/avidemux/patches/avidemux-2.7.4.patchset index 855d8e068..75d9b6cf4 100644 --- a/media-video/avidemux/patches/avidemux-2.7.3.patchset +++ b/media-video/avidemux/patches/avidemux-2.7.4.patchset @@ -1,17 +1,17 @@ -From f2c074b9b5911b032f42810a9477c7af2259d52d Mon Sep 17 00:00:00 2001 +From ecab6d95f989b236bbc58c2479028228c15a1f72 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 24 Mar 2019 23:33:57 +1000 +Date: Sun, 13 Oct 2019 11:22:36 +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 cb2b34b..80cfaa0 +index 0541664..aab7f84 --- a/avidemux/common/main.cpp +++ b/avidemux/common/main.cpp -@@ -60,7 +60,9 @@ int main(int _argc, char *_argv[]) - redirectStdoutToFile(); +@@ -61,7 +61,9 @@ int main(int _argc, char *_argv[]) + redirectStdoutToFile("admlog.txt"); #endif +#ifndef __HAIKU__ @@ -20,7 +20,7 @@ index cb2b34b..80cfaa0 char **argv; int argc; -@@ -82,9 +84,9 @@ int main(int _argc, char *_argv[]) +@@ -83,9 +85,9 @@ int main(int _argc, char *_argv[]) #ifdef _WIN32 freeUtf8CommandLine(argc, argv); #endif @@ -33,10 +33,10 @@ index cb2b34b..80cfaa0 } /** diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp -index f1ffa2f..a1018e8 100644 +index cfb29a9..c64e971 100644 --- a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp +++ b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp -@@ -44,9 +44,9 @@ int main(int argc, char *argv[]) +@@ -46,9 +46,9 @@ int main(int argc, char *argv[]) #if !defined(NDEBUG) && defined(FIND_LEAKS) new_progname = argv[0]; #endif @@ -48,7 +48,7 @@ index f1ffa2f..a1018e8 100644 #define STR(x) #x #define MKSTRING(x) STR(x) -@@ -75,6 +75,8 @@ int main(int argc, char *argv[]) +@@ -77,6 +77,8 @@ int main(int argc, char *argv[]) printf("Microsoft Windows"); #elif defined(__APPLE__) printf("Apple"); @@ -146,6 +146,26 @@ index 0000000..8f25071 +MACRO(ADM_POSTBUILD) + ADM_INSTALL_BIN(avidemux3_${QT_EXTENSION}) +ENDMACRO(ADM_POSTBUILD) +diff --git a/avidemux_core/ADM_core/include/ADM_crashdump_other.h b/avidemux_core/ADM_core/include/ADM_crashdump_other.h +index 1d636ef..a75c16d 100644 +--- a/avidemux_core/ADM_core/include/ADM_crashdump_other.h ++++ b/avidemux_core/ADM_core/include/ADM_crashdump_other.h +@@ -1,4 +1,4 @@ +-#if !defined(__APPLE__) && !defined(__unix__) && !defined(__MINGW32__) && !defined ADM_CRASHDUMP_OTHER_H &&!defined _MSC_VER ++#if !defined(__APPLE__) && !defined(__unix__) && !defined(__HAIKU__) && !defined(__MINGW32__) && !defined ADM_CRASHDUMP_OTHER_H &&!defined _MSC_VER + #define ADM_CRASHDUMP_OTHER_H + + #define installSigHandler(...) {} +diff --git a/avidemux_core/ADM_core/include/ADM_crashdump_unix.h b/avidemux_core/ADM_core/include/ADM_crashdump_unix.h +index 7067e06..e75a323 100644 +--- a/avidemux_core/ADM_core/include/ADM_crashdump_unix.h ++++ b/avidemux_core/ADM_core/include/ADM_crashdump_unix.h +@@ -1,4 +1,4 @@ +-#if defined(__unix__) && !defined ADM_CRASHDUMP_UNIX_H ++#if defined(__unix__) || defined(__HAIKU__) && !defined ADM_CRASHDUMP_UNIX_H + #define ADM_CRASHDUMP_UNIX_H + + ADM_CORE6_EXPORT void installSigHandler(void); diff --git a/avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp b/avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp index a2f1375..b4b6fd2 100644 --- a/avidemux_core/ADM_core/src/ADM_crashdump_unix.cpp @@ -178,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 686e85a..3962cea 100644 +index 79551ed..95b4451 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; @@ -193,7 +213,7 @@ index 686e85a..3962cea 100644 if(simple2) { out=std::string(simple2)+std::string("/"); -@@ -142,9 +146,11 @@ void ADM_initBaseDir(int argc, char *argv[]) +@@ -141,9 +145,11 @@ void ADM_initBaseDir(int argc, char *argv[]) } strcpy(ADM_basedir, homeEnv); AddSeparator(ADM_basedir); @@ -251,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 d527fc9..8be7cb8 100644 +index 0102c8a..3e4e4ac 100644 --- a/avidemux_core/ADM_coreUtils/src/prefs2_pref.h +++ b/avidemux_core/ADM_coreUtils/src/prefs2_pref.h -@@ -56,7 +56,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}, @@ -829,35 +849,5 @@ index 00304cf..07077fa 100644 return 0; } -- -2.19.1 - - -From 2c2723ec73026c40480cce2d49563fd0d4582eb9 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 24 Mar 2019 23:52:40 +1000 -Subject: Use unix crashdump - - -diff --git a/avidemux_core/ADM_core/include/ADM_crashdump_other.h b/avidemux_core/ADM_core/include/ADM_crashdump_other.h -index 1d636ef..a75c16d 100644 ---- a/avidemux_core/ADM_core/include/ADM_crashdump_other.h -+++ b/avidemux_core/ADM_core/include/ADM_crashdump_other.h -@@ -1,4 +1,4 @@ --#if !defined(__APPLE__) && !defined(__unix__) && !defined(__MINGW32__) && !defined ADM_CRASHDUMP_OTHER_H &&!defined _MSC_VER -+#if !defined(__APPLE__) && !defined(__unix__) && !defined(__HAIKU__) && !defined(__MINGW32__) && !defined ADM_CRASHDUMP_OTHER_H &&!defined _MSC_VER - #define ADM_CRASHDUMP_OTHER_H - - #define installSigHandler(...) {} -diff --git a/avidemux_core/ADM_core/include/ADM_crashdump_unix.h b/avidemux_core/ADM_core/include/ADM_crashdump_unix.h -index 7067e06..e75a323 100644 ---- a/avidemux_core/ADM_core/include/ADM_crashdump_unix.h -+++ b/avidemux_core/ADM_core/include/ADM_crashdump_unix.h -@@ -1,4 +1,4 @@ --#if defined(__unix__) && !defined ADM_CRASHDUMP_UNIX_H -+#if defined(__unix__) || defined(__HAIKU__) && !defined ADM_CRASHDUMP_UNIX_H - #define ADM_CRASHDUMP_UNIX_H - - ADM_CORE6_EXPORT void installSigHandler(void); --- -2.19.1 +2.23.0