diff --git a/media-video/avidemux/avidemux-2.7.1.recipe b/media-video/avidemux/avidemux-2.7.1.recipe index 6c60ba139..52718fde7 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="2" +REVISION="3" 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 88905b700..100a9d52a 100644 --- a/media-video/avidemux/patches/avidemux-2.7.1.patchset +++ b/media-video/avidemux/patches/avidemux-2.7.1.patchset @@ -1,4 +1,4 @@ -From 4917eb9bb1aff46411495834169fe4bcd9128636 Mon Sep 17 00:00:00 2001 +From cc8eb7995a1bef28e56f887341e8d6b35dd06d38 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 11 Jul 2018 22:46:06 +1000 Subject: Fix build for Haiku @@ -106,7 +106,7 @@ index 00304cf..07077fa 100644 2.16.4 -From 34e3741c54d6b8941849ed96833ea8b058408397 Mon Sep 17 00:00:00 2001 +From b272d14cc276dbc77f64ad20ede86ab47e7171a3 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 12 Jul 2018 00:09:37 +1000 Subject: Fix build 2 @@ -308,7 +308,7 @@ index b00ea2d..1fea9d6 100644 2.16.4 -From 4a36c099d15741b6fe33d68f516ac0fe955500ab Mon Sep 17 00:00:00 2001 +From b43d9684d9bb59304dc98fb478d661c12cc78a22 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 12 Jul 2018 00:31:10 +1000 Subject: Fix build plugins @@ -332,7 +332,7 @@ index 91aab7d..8235f0e 100644 2.16.4 -From 080395773ecb45e2ae546042e6b64db75229868d Mon Sep 17 00:00:00 2001 +From 19b03c98b0cf4b50461db36d72f9e3f7802f9538 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 12 Jul 2018 12:02:26 +1000 Subject: Disable OpenGL @@ -376,7 +376,7 @@ index 62fa6ef..c5dbd26 100644 2.16.4 -From e696c749b902a056aca808dfdbe41e6a786e8f17 Mon Sep 17 00:00:00 2001 +From e08c5a109ed9f2edc1d3a3abb86449780a886110 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 12 Jul 2018 14:44:47 +1000 Subject: Fix detect x264 @@ -399,7 +399,7 @@ index 2e3f4d9..f9a91e5 100644 2.16.4 -From 688a4d827a121bb46392c5035a45c5e912baf897 Mon Sep 17 00:00:00 2001 +From 6e7451e6300bdb3fbb718364f1c778e5e6b2ee76 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 12 Jul 2018 21:36:53 +1000 Subject: Add MediaKit audio driver @@ -880,7 +880,7 @@ index 0000000..6a6efde 2.16.4 -From 61a661adc6567d47bf4f0839755718622429164e Mon Sep 17 00:00:00 2001 +From d097dc1e40e63bf946ad2f3804e2e5b6ab6f7e96 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 12 Jul 2018 21:37:17 +1000 Subject: Fix path for settings dir @@ -907,3 +907,49 @@ index 3625d55..ee6838a 100644 -- 2.16.4 + +From 4b7053c6e42ff99c57b7c1baedb58b6d20d3d40a Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Thu, 12 Jul 2018 23:37:20 +1000 +Subject: Fix settings dir + + +diff --git a/avidemux_core/ADM_core/src/ADM_folder_linux.cpp b/avidemux_core/ADM_core/src/ADM_folder_linux.cpp +index ee6838a..3962cea 100644 +--- a/avidemux_core/ADM_core/src/ADM_folder_linux.cpp ++++ b/avidemux_core/ADM_core/src/ADM_folder_linux.cpp +@@ -147,7 +147,7 @@ void ADM_initBaseDir(int argc, char *argv[]) + strcpy(ADM_basedir, homeEnv); + AddSeparator(ADM_basedir); + #ifdef __HAIKU__ +- const char *ADM_DIR_NAME = "config/settings/avidemux6"; ++ const char *ADM_DIR_NAME = "config/settings/Avidemux"; + #else + const char *ADM_DIR_NAME = ".avidemux6"; + #endif +-- +2.16.4 + + +From 0cc6e4a41df502788159dfc6e80a3057ce534ca5 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sun, 9 Sep 2018 19:48:03 +1000 +Subject: Set Haiku audio output module by default + + +diff --git a/avidemux_core/ADM_coreUtils/src/prefs2_pref.h b/avidemux_core/ADM_coreUtils/src/prefs2_pref.h +index d527fc9..8be7cb8 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[]={ + { 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}, +-{ AUDIO_DEVICE_AUDIODEVICE,"audio_device.audiodevice" ,ADM_param_stdstring ,"ALSA", 0, 0}, ++{ AUDIO_DEVICE_AUDIODEVICE,"audio_device.audiodevice" ,ADM_param_stdstring ,"Haiku", 0, 0}, + { 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}, +-- +2.16.4 +