From c26f6aa8ab625c7036d3abc0e4bd99c41343f65f Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 30 Dec 2024 10:01:30 +0100 Subject: [PATCH] mlt, revbump, disable decklink, enable glaxnimate (#11551) --- media-libs/mlt/mlt-7.28.0.recipe | 5 +++-- media-libs/mlt/patches/mlt-7.28.0.patchset | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/media-libs/mlt/mlt-7.28.0.recipe b/media-libs/mlt/mlt-7.28.0.recipe index c24094198..1325153de 100644 --- a/media-libs/mlt/mlt-7.28.0.recipe +++ b/media-libs/mlt/mlt-7.28.0.recipe @@ -113,7 +113,6 @@ BUILD_REQUIRES=" devel:libvorbis$secondaryArchSuffix devel:libvorbisfile$secondaryArchSuffix devel:libxml2$secondaryArchSuffix - devel:libX11$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake @@ -130,8 +129,10 @@ BUILD() $cmakeDirArgs \ -DCMAKE_INSTALL_BINDIR=$commandBinDir \ -DMOD_QT6=ON \ + -DMOD_DECKLINK=OFF \ -DMOD_OPENCV=OFF \ - -DMOD_RTAUDIO=OFF + -DMOD_RTAUDIO=OFF \ + -DMOD_GLAXNIMATE_QT6=ON make -C build $jobArgs } diff --git a/media-libs/mlt/patches/mlt-7.28.0.patchset b/media-libs/mlt/patches/mlt-7.28.0.patchset index e248191fd..05f10030c 100644 --- a/media-libs/mlt/patches/mlt-7.28.0.patchset +++ b/media-libs/mlt/patches/mlt-7.28.0.patchset @@ -1,7 +1,7 @@ -From 0cce28dcf023720c6ca3a2140d0a7c504a56fa5a Mon Sep 17 00:00:00 2001 -From: Begasus -Date: Sat, 11 Nov 2023 17:02:02 +0100 -Subject: Fix Haiku support +From 086d749cbc4c08c821797fdaf61d19149fbf39e5 Mon Sep 17 00:00:00 2001 +From: TURX +Date: Sun, 19 Jan 2020 22:57:40 +0800 +Subject: fix Haiku support diff --git a/src/modules/decklink/consumer_decklink.cpp b/src/modules/decklink/consumer_decklink.cpp @@ -33,7 +33,7 @@ index 22be72e..8134e27 100644 if (!strcmp("max", mlt_properties_get(properties, "priority"))) param.sched_priority = sched_get_priority_max(SCHED_FIFO) - 1; diff --git a/src/modules/plusgpl/CMakeLists.txt b/src/modules/plusgpl/CMakeLists.txt -index bc677af..f422b05 100644 +index bc677af..c9753d2 100644 --- a/src/modules/plusgpl/CMakeLists.txt +++ b/src/modules/plusgpl/CMakeLists.txt @@ -21,7 +21,7 @@ target_link_libraries(mltplusgpl PRIVATE mlt m Threads::Threads) @@ -49,7 +49,7 @@ index bc677af..f422b05 100644 2.45.2 -From bf226d7ca95ddade14d7f1072d571196a66b6c36 Mon Sep 17 00:00:00 2001 +From dbe76119c987b0a2960ac85af24cb64404891705 Mon Sep 17 00:00:00 2001 From: Begasus Date: Sat, 11 Nov 2023 17:22:08 +0100 Subject: Fix SDL module @@ -98,9 +98,9 @@ index 629c75b..0414b18 100644 2.45.2 -From 59b7546924d6e2fb6daa1fdc79c11c71ffcf5942 Mon Sep 17 00:00:00 2001 -From: Begasus -Date: Sun, 12 Nov 2023 08:05:00 +0100 +From 53bbeb5ecea53b071eaad2794c5a064e6d1f7913 Mon Sep 17 00:00:00 2001 +From: TURX +Date: Sun, 19 Jan 2020 22:57:40 +0800 Subject: More Haiku fixes @@ -169,7 +169,7 @@ index 7cc8b88..0dc6787 100644 2.45.2 -From da1de7eb72c62fe96022aa4cbfe31c330f11f7fe Mon Sep 17 00:00:00 2001 +From 193ead5e5ac1375fe22f7bbad0279568ee5c4690 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 28 Dec 2024 10:26:31 +0100 Subject: Disable X11