diff --git a/media-video/avidemux/avidemux-2.7.1.recipe b/media-video/avidemux/avidemux-2.7.1.recipe index 88cb48ece..bee5140b7 100644 --- a/media-video/avidemux/avidemux-2.7.1.recipe +++ b/media-video/avidemux/avidemux-2.7.1.recipe @@ -6,7 +6,7 @@ can be automated using projects, job queue and powerful scripting capabilities." HOMEPAGE="http://fixounet.free.fr/avidemux/" COPYRIGHT="2001–2018 Mean" LICENSE="GNU GPL v3" -REVISION="4" +REVISION="5" SOURCE_URI="https://sourceforge.net/projects/avidemux/files/avidemux/$portVersion/avidemux_$portVersion.tar.gz" CHECKSUM_SHA256="3ccd784a329c8957c6741923549fdfb70f3b96d087aeb514f3d52e1cd281e995" SOURCE_DIR="avidemux_$portVersion" diff --git a/media-video/avidemux/patches/avidemux-2.7.1.patchset b/media-video/avidemux/patches/avidemux-2.7.1.patchset index 100a9d52a..cdc07f964 100644 --- a/media-video/avidemux/patches/avidemux-2.7.1.patchset +++ b/media-video/avidemux/patches/avidemux-2.7.1.patchset @@ -103,7 +103,7 @@ index 00304cf..07077fa 100644 return 0; } -- -2.16.4 +2.19.1 From b272d14cc276dbc77f64ad20ede86ab47e7171a3 Mon Sep 17 00:00:00 2001 @@ -305,7 +305,7 @@ index b00ea2d..1fea9d6 100644 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) -- -2.16.4 +2.19.1 From b43d9684d9bb59304dc98fb478d661c12cc78a22 Mon Sep 17 00:00:00 2001 @@ -329,7 +329,7 @@ index 91aab7d..8235f0e 100644 INSTALL_DEMUXER(ADM_dm_avsproxy) -- -2.16.4 +2.19.1 From 19b03c98b0cf4b50461db36d72f9e3f7802f9538 Mon Sep 17 00:00:00 2001 @@ -373,7 +373,7 @@ index 62fa6ef..c5dbd26 100644 #if defined(ADM_CPU_X86_64) xinfo->display = (void*)videoWindow->winId(); -- -2.16.4 +2.19.1 From e08c5a109ed9f2edc1d3a3abb86449780a886110 Mon Sep 17 00:00:00 2001 @@ -396,7 +396,7 @@ index 2e3f4d9..f9a91e5 100644 ELSE(NOT WIN32) IF(NOT MSVC) -- -2.16.4 +2.19.1 From 6e7451e6300bdb3fbb718364f1c778e5e6b2ee76 Mon Sep 17 00:00:00 2001 @@ -877,7 +877,7 @@ index 0000000..6a6efde + +#endif -- -2.16.4 +2.19.1 From d097dc1e40e63bf946ad2f3804e2e5b6ab6f7e96 Mon Sep 17 00:00:00 2001 @@ -905,7 +905,7 @@ index 3625d55..ee6838a 100644 strcat(ADM_basedir, ADM_SEPARATOR); -- -2.16.4 +2.19.1 From 4b7053c6e42ff99c57b7c1baedb58b6d20d3d40a Mon Sep 17 00:00:00 2001 @@ -928,7 +928,7 @@ index ee6838a..3962cea 100644 const char *ADM_DIR_NAME = ".avidemux6"; #endif -- -2.16.4 +2.19.1 From 0cc6e4a41df502788159dfc6e80a3057ce534ca5 Mon Sep 17 00:00:00 2001 @@ -951,5 +951,59 @@ index d527fc9..8be7cb8 100644 { VIDEODEVICE,"videodevice" ,ADM_param_uint32_t ,"0", 0, 10}, { PRIORITY_ENCODING,"priority.encoding" ,ADM_param_uint32_t ,"3", 0, 4}, -- -2.16.4 +2.19.1 + + +From e80e474f653febe051e85798e78066727f22ac5a Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Fri, 4 Jan 2019 15:12:17 +1000 +Subject: Fix crash on exit + + +diff --git a/avidemux_core/ADM_core/src/ADM_dynamicLoading.cpp b/avidemux_core/ADM_core/src/ADM_dynamicLoading.cpp +index 5066122..f0cc2e0 100644 +--- a/avidemux_core/ADM_core/src/ADM_dynamicLoading.cpp ++++ b/avidemux_core/ADM_core/src/ADM_dynamicLoading.cpp +@@ -51,6 +51,8 @@ ADM_LibWrapper::~ADM_LibWrapper() + + #ifdef _WIN32 + FreeLibrary((HINSTANCE) hinstLib); ++ #elif defined(__HAIKU__) ++ aprintf("HAIKU: not implemented!\n"); + #else + dlclose(hinstLib); + #endif +diff --git a/avidemux_plugins/ADM_audioDevices/Haiku/ADM_deviceHaiku.cpp b/avidemux_plugins/ADM_audioDevices/Haiku/ADM_deviceHaiku.cpp +index aadca18..6035856 100644 +--- a/avidemux_plugins/ADM_audioDevices/Haiku/ADM_deviceHaiku.cpp ++++ b/avidemux_plugins/ADM_audioDevices/Haiku/ADM_deviceHaiku.cpp +@@ -14,6 +14,14 @@ haikuAudioDevice::haikuAudioDevice() + active=false; + } + ++haikuAudioDevice::~haikuAudioDevice() ++{ ++ if (active) { ++ active=false; ++ player.stop(); ++ } ++} ++ + bool + haikuAudioDevice::localStop(void) + { +diff --git a/avidemux_plugins/ADM_audioDevices/Haiku/ADM_deviceHaiku.h b/avidemux_plugins/ADM_audioDevices/Haiku/ADM_deviceHaiku.h +index ce4cb64..2b37e1f 100644 +--- a/avidemux_plugins/ADM_audioDevices/Haiku/ADM_deviceHaiku.h ++++ b/avidemux_plugins/ADM_audioDevices/Haiku/ADM_deviceHaiku.h +@@ -17,6 +17,7 @@ class haikuAudioDevice : public audioDeviceThreaded + virtual const CHANNEL_TYPE *getWantedChannelMapping(uint32_t channels); + public: + haikuAudioDevice(); ++ virtual ~haikuAudioDevice(); + }; + + #endif +-- +2.19.1