diff --git a/media-libs/mlt/mlt-7.30.0.recipe b/media-libs/mlt/mlt-7.32.0.recipe similarity index 96% rename from media-libs/mlt/mlt-7.30.0.recipe rename to media-libs/mlt/mlt-7.32.0.recipe index 1b6d82dae..3015b39c2 100644 --- a/media-libs/mlt/mlt-7.30.0.recipe +++ b/media-libs/mlt/mlt-7.32.0.recipe @@ -7,7 +7,7 @@ LICENSE="GNU LGPL v2.1 GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/mltframework/mlt/releases/download/v$portVersion/mlt-$portVersion.tar.gz" -CHECKSUM_SHA256="c802a5fdc16324f6c69273d0bb9718d30c2f635422e171ee01c0e7745e0e793c" +CHECKSUM_SHA256="1ca5aadfe27995c879b9253b3a48d1dcc3b1247ea0b5620b087d58f5521be028" PATCHES="mlt-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -115,6 +115,7 @@ BUILD_REQUIRES=" devel:libxml2$secondaryArchSuffix " BUILD_PREREQUIRES=" +# cmd:clang_format >= 20 cmd:cmake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -129,10 +130,10 @@ BUILD() $cmakeDirArgs \ -DCMAKE_INSTALL_BINDIR=$commandBinDir \ -DMOD_QT6=ON \ - -DMOD_DECKLINK=OFF \ -DMOD_OPENCV=OFF \ -DMOD_RTAUDIO=OFF \ - -DMOD_GLAXNIMATE_QT6=ON + -DMOD_GLAXNIMATE_QT6=ON \ + -DCMAKE_SKIP_RPATH=YES make -C build $jobArgs } diff --git a/media-libs/mlt/patches/mlt-7.30.0.patchset b/media-libs/mlt/patches/mlt-7.32.0.patchset similarity index 78% rename from media-libs/mlt/patches/mlt-7.30.0.patchset rename to media-libs/mlt/patches/mlt-7.32.0.patchset index f89ce6639..4c4e06bfc 100644 --- a/media-libs/mlt/patches/mlt-7.30.0.patchset +++ b/media-libs/mlt/patches/mlt-7.32.0.patchset @@ -1,37 +1,23 @@ -From a04a6c57a0dd61dbba9df445bf6976fb4ae40e10 Mon Sep 17 00:00:00 2001 -From: TURX -Date: Sun, 19 Jan 2020 22:57:40 +0800 -Subject: fix Haiku support +From 142a6537629901ba3dddafdc53cf4b5cf128ca2b Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Fri, 9 May 2025 09:19:52 +0200 +Subject: Haiku build fixes +Co-authored-by: TURX -diff --git a/src/modules/decklink/consumer_decklink.cpp b/src/modules/decklink/consumer_decklink.cpp -index d04024d..f69365c 100644 ---- a/src/modules/decklink/consumer_decklink.cpp -+++ b/src/modules/decklink/consumer_decklink.cpp -@@ -651,7 +651,9 @@ protected: - return; - - pthread_attr_init(&tattr); -+#ifndef __HAIKU__ - pthread_attr_setschedpolicy(&tattr, SCHED_FIFO); -+#endif - - if (!strcmp("max", mlt_properties_get(properties, "priority"))) - param.sched_priority = sched_get_priority_max(SCHED_FIFO) - 1; -diff --git a/src/modules/decklink/producer_decklink.cpp b/src/modules/decklink/producer_decklink.cpp -index 22be72e..8134e27 100644 ---- a/src/modules/decklink/producer_decklink.cpp -+++ b/src/modules/decklink/producer_decklink.cpp -@@ -470,7 +470,9 @@ public: - struct sched_param param; - - pthread_attr_init(&tattr); -+#ifndef __HAIKU__ - pthread_attr_setschedpolicy(&tattr, SCHED_FIFO); -+#endif - - if (!strcmp("max", mlt_properties_get(properties, "priority"))) - param.sched_priority = sched_get_priority_max(SCHED_FIFO) - 1; +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8aa40a0..c7a239c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -293,7 +293,7 @@ if(MOD_MOVIT) + pkg_check_modules(movit IMPORTED_TARGET movit) + find_package(OpenGL) + if(TARGET PkgConfig::movit AND TARGET OpenGL::GL) +- if(UNIX AND NOT APPLE) ++ if(UNIX AND NOT APPLE AND NOT HAIKU) + find_package(X11 REQUIRED) + endif() + list(APPEND MLT_SUPPORTED_COMPONENTS movit) diff --git a/src/modules/plusgpl/CMakeLists.txt b/src/modules/plusgpl/CMakeLists.txt index bc677af..c9753d2 100644 --- a/src/modules/plusgpl/CMakeLists.txt @@ -45,16 +31,28 @@ index bc677af..c9753d2 100644 target_link_libraries(mltplusgpl PRIVATE rt) endif() --- -2.45.2 - - -From a107996ab16fa2527c1d4335b2b9bf9ad8e1b5f2 Mon Sep 17 00:00:00 2001 -From: Begasus -Date: Sat, 11 Nov 2023 17:22:08 +0100 -Subject: Fix SDL module - - +diff --git a/src/modules/qt/common.cpp b/src/modules/qt/common.cpp +index 59cb304..e858caa 100644 +--- a/src/modules/qt/common.cpp ++++ b/src/modules/qt/common.cpp +@@ -21,7 +21,7 @@ + #include + #include + +-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) ++#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) && !defined(Q_OS_HAIKU) + #include + #include + #endif +@@ -35,7 +35,7 @@ bool createQApplicationIfNeeded(mlt_service service) + QCoreApplication::addLibraryPath(QString(mlt_environment("MLT_APPDIR")) + + QStringLiteral("/plugins")); + #endif +-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) ++#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) && !defined(Q_OS_HAIKU) + if (getenv("DISPLAY") == 0 && getenv("WAYLAND_DISPLAY") == 0) { + const char *qt_qpa = getenv("QT_QPA_PLATFORM"); + if (!qt_qpa || strcmp(qt_qpa, "offscreen")) { diff --git a/src/modules/sdl/CMakeLists.txt b/src/modules/sdl/CMakeLists.txt index 6128184..769591b 100644 --- a/src/modules/sdl/CMakeLists.txt @@ -95,14 +93,15 @@ index 629c75b..0414b18 100644 if (wm.subsystem == SDL_SYSWM_X11) { // Get the SDL window -- -2.45.2 +2.48.1 -From 6b0f3e5abc390dfeb73efc159c02334fbe4da500 Mon Sep 17 00:00:00 2001 -From: TURX -Date: Sun, 19 Jan 2020 22:57:40 +0800 -Subject: More Haiku fixes +From 88a896b40960d5f5709f47d5a2306584b6b70257 Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Fri, 9 May 2025 09:34:15 +0200 +Subject: Haiku doesn't have pthread_attr_setinheritsched +Co-authored-by: TURX diff --git a/src/framework/mlt_consumer.c b/src/framework/mlt_consumer.c index a65d7c8..cca843d 100644 @@ -148,6 +147,34 @@ index 3f5b321..b036d71 100644 param.sched_priority = priority; pthread_attr_setschedparam(&tattr, ¶m); +diff --git a/src/modules/decklink/consumer_decklink.cpp b/src/modules/decklink/consumer_decklink.cpp +index f8f1f6a..fd8a490 100644 +--- a/src/modules/decklink/consumer_decklink.cpp ++++ b/src/modules/decklink/consumer_decklink.cpp +@@ -748,7 +748,9 @@ protected: + return; + + pthread_attr_init(&tattr); ++#ifndef __HAIKU__ + pthread_attr_setschedpolicy(&tattr, SCHED_FIFO); ++#endif + + if (!strcmp("max", mlt_properties_get(properties, "priority"))) + param.sched_priority = sched_get_priority_max(SCHED_FIFO) - 1; +diff --git a/src/modules/decklink/producer_decklink.cpp b/src/modules/decklink/producer_decklink.cpp +index 14a92dc..cd04a2d 100644 +--- a/src/modules/decklink/producer_decklink.cpp ++++ b/src/modules/decklink/producer_decklink.cpp +@@ -471,7 +471,9 @@ public: + struct sched_param param; + + pthread_attr_init(&tattr); ++#ifndef __HAIKU__ + pthread_attr_setschedpolicy(&tattr, SCHED_FIFO); ++#endif + + if (!strcmp("max", mlt_properties_get(properties, "priority"))) + param.sched_priority = sched_get_priority_max(SCHED_FIFO) - 1; diff --git a/src/modules/plusgpl/consumer_cbrts.c b/src/modules/plusgpl/consumer_cbrts.c index 7cc8b88..0dc6787 100644 --- a/src/modules/plusgpl/consumer_cbrts.c @@ -166,37 +193,28 @@ index 7cc8b88..0dc6787 100644 #endif pthread_attr_setscope(&thread_attributes, PTHREAD_SCOPE_SYSTEM); -- -2.45.2 +2.48.1 -From e7f49820427b9bd70bde1869707195bd35fb180f Mon Sep 17 00:00:00 2001 -From: Schrijvers Luc -Date: Sat, 28 Dec 2024 10:26:31 +0100 -Subject: Disable X11 +From 3323e91a66c0af346c2d8ae04fb2d44b34540a7a Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Fri, 9 May 2025 10:34:36 +0200 +Subject: Set clang-format version to 20 -diff --git a/src/modules/qt/common.cpp b/src/modules/qt/common.cpp -index a8aad00..b58cfc0 100644 ---- a/src/modules/qt/common.cpp -+++ b/src/modules/qt/common.cpp -@@ -21,7 +21,7 @@ - #include - #include - --#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) -+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) && !defined(Q_OS_HAIKU) - #include - #include - #endif -@@ -35,7 +35,7 @@ bool createQApplicationIfNeeded(mlt_service service) - QCoreApplication::addLibraryPath(QString(mlt_environment("MLT_APPDIR")) - + QStringLiteral("/plugins")); - #endif --#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) -+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) && !defined(Q_OS_HAIKU) - if (getenv("DISPLAY") == 0 && getenv("WAYLAND_DISPLAY") == 0) { - mlt_log_error(service, - "The MLT Qt module requires a X11 or Wayland environment.\n" +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7a239c..861c2e1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -526,7 +526,7 @@ if(CLANG_FORMAT) + # Formatting may change with different versions of clang-format. + # Test new versions before changing the allowed version here to avoid + # accidental broad changes to formatting. +- find_package(ClangFormat 14 EXACT) ++ find_package(ClangFormat 20 EXACT) + if(CLANGFORMAT_FOUND) + file(GLOB_RECURSE FORMAT_FILES "src/*.h" "src/*.c" "src/*.cpp") + # exclude 3rd party source from format checking -- -2.45.2 +2.48.1