CVS commit: pkgsrc/multimedia/mlt

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Dec  2 20:32:27 UTC 2025

Modified Files:
        pkgsrc/multimedia/mlt: Makefile.common distinfo
Added Files:
        pkgsrc/multimedia/mlt/patches: patch-src_modules_qt_CMakeLists.txt

Log Message:
mlt*: use installed mlt when building qt modules


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/mlt/Makefile.common
cvs rdiff -u -r1.19 -r1.20 pkgsrc/multimedia/mlt/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/mlt/patches/patch-src_modules_qt_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/mlt/Makefile.common
diff -u pkgsrc/multimedia/mlt/Makefile.common:1.2 pkgsrc/multimedia/mlt/Makefile.common:1.3
--- pkgsrc/multimedia/mlt/Makefile.common:1.2   Tue Dec  2 08:02:58 2025
+++ pkgsrc/multimedia/mlt/Makefile.common       Tue Dec  2 20:32:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2025/12/02 08:02:58 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2025/12/02 20:32:27 markd Exp $
 
 # used by multimedia/mlt/Makefile
 # used by multimedia/mlt-qt5/Makefile
@@ -22,3 +22,8 @@ PATCHDIR=     ${.CURDIR}/../../multimedia/ml
 WRKSRC=                ${WRKDIR}/${DISTNAME}
 
 CFLAGS.NetBSD+=                -DHAVE_LOCALE_H -DHAVE_STRTOD_L -D__SETLOCALE_SOURCE__
+
+SUBST_CLASSES+=                mlt
+SUBST_STAGE.mlt=       pre-configure
+SUBST_FILES.mlt=       src/modules/qt/CMakeLists.txt 
+SUBST_VARS.mlt=                PREFIX

Index: pkgsrc/multimedia/mlt/distinfo
diff -u pkgsrc/multimedia/mlt/distinfo:1.19 pkgsrc/multimedia/mlt/distinfo:1.20
--- pkgsrc/multimedia/mlt/distinfo:1.19 Sun Nov 30 10:10:03 2025
+++ pkgsrc/multimedia/mlt/distinfo      Tue Dec  2 20:32:27 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2025/11/30 10:10:03 markd Exp $
+$NetBSD: distinfo,v 1.20 2025/12/02 20:32:27 markd Exp $
 
 BLAKE2s (mlt-7.34.1.tar.gz) = 7751ed62346f078fa3e57faf60b74959ddf6386cd0398158b2d25cebf80301a7
 SHA512 (mlt-7.34.1.tar.gz) = d14145c033274c669f7437cad39f479e108509f7292a32f469acc146440d8c9b689b78b6cad4ad6da7c74f9e2e3f9041626d7513376943d91f1c85fcfb634f44
@@ -6,3 +6,4 @@ Size (mlt-7.34.1.tar.gz) = 1511970 bytes
 SHA1 (patch-cmake_FindFFmpeg.cmake) = 493c8fb35a15a6079735e4cd8cf02272af7aa539
 SHA1 (patch-src_framework_mlt__properties.c) = 387866d6ad5ffb5888a5f12c970c1f3b40dac202
 SHA1 (patch-src_framework_mlt__property.c) = 288d6f128094b281b2037d5ac6403f7ef83d585a
+SHA1 (patch-src_modules_qt_CMakeLists.txt) = 42fbe0531f299a68c341b3259e718dac2ec5593d

Added files:

Index: pkgsrc/multimedia/mlt/patches/patch-src_modules_qt_CMakeLists.txt
diff -u /dev/null pkgsrc/multimedia/mlt/patches/patch-src_modules_qt_CMakeLists.txt:1.1
--- /dev/null   Tue Dec  2 20:32:27 2025
+++ pkgsrc/multimedia/mlt/patches/patch-src_modules_qt_CMakeLists.txt   Tue Dec  2 20:32:27 2025
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_modules_qt_CMakeLists.txt,v 1.1 2025/12/02 20:32:27 markd Exp $
+
+Build with installed version of mlt
+
+--- src/modules/qt/CMakeLists.txt.orig 2025-11-05 15:41:13.000000000 +0000
++++ src/modules/qt/CMakeLists.txt
+@@ -48,11 +48,11 @@ function(mlt_add_qt_module ARG_TARGET)
+ 
+ 
+     generate_export_header(${ARG_TARGET})
+-    target_compile_options(${ARG_TARGET} PRIVATE ${MLT_COMPILE_OPTIONS})
++    target_compile_options(${ARG_TARGET} PRIVATE -I@PREFIX@/include/mlt-7 -I@PREFIX@/include/mlt-7/mlt++ ${MLT_COMPILE_OPTIONS})
+ 
+     target_link_libraries(${ARG_TARGET} PRIVATE
+-      mlt++
+-      mlt
++      -lmlt++-7
++      -lmlt-7
+       Threads::Threads
+       Qt${ARG_QT_VERSION}::Core
+       Qt${ARG_QT_VERSION}::Gui