Date: Thu, 08 Jan 2026 22:41:57 +0000 Message-ID: <696032b5.3122e.535ff4c3@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=eeaf1af2560a6ae588096d0f3b4064f51d9c6d58 commit eeaf1af2560a6ae588096d0f3b4064f51d9c6d58 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2026-01-08 22:15:20 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2026-01-08 22:41:34 +0000 multimedia/mlt7*: Update to 7.36.1 Remove DECKLINK option. This plugin requires libDeckLinkAPI.so from the Blackmagic Design SDK, which we don't have, at runtime. Unflavorize the glaxnimate and qt mods. Qt5 support has been dropped by upstream in 7.36.0. Decruft and try to satisfy portclippy(1) as much as possible. https://github.com/mltframework/mlt/releases/tag/v7.36.0 https://github.com/mltframework/mlt/releases/tag/v7.36.1 --- MOVED | 4 ++ Mk/Uses/mlt.mk | 2 +- multimedia/mlt7-glaxnimate/Makefile | 60 ++++++++------------ multimedia/mlt7-glaxnimate/pkg-plist | 4 +- multimedia/mlt7-qt/Makefile | 44 +++++---------- multimedia/mlt7-qt/pkg-plist | 36 ++++++------ multimedia/mlt7/Makefile | 64 +++++++--------------- multimedia/mlt7/distinfo | 6 +- multimedia/mlt7/files/patch-CMakeLists.txt | 4 +- .../mlt7/files/patch-src_melt_CMakeLists.txt | 4 +- ...patch-src_modules_avformat_producer__avformat.c | 54 ------------------ .../files/patch-src_modules_rtaudio_CMakeLists.txt | 8 +-- multimedia/mlt7/pkg-plist | 7 ++- 13 files changed, 94 insertions(+), 203 deletions(-) diff --git a/MOVED b/MOVED index ad57de9aeb6e..24d1e2e7e610 100644 --- a/MOVED +++ b/MOVED @@ -5067,3 +5067,7 @@ sysutils/beats7|sysutils/beats8|2026-01-02|Has expired: Only works with expired devel/gwenhywfar-fox16||2026-01-03|Leaf library not used in the ports tree devel/gwenhywfar-gtk2||2026-01-03|Leaf library not used in the ports tree devel/gwenhywfar-qt5||2026-01-03|Leaf library not used in the ports tree +multimedia/mlt7-glaxnimate@qt5||2026-01-08|Qt5 support has been dropped by upstream +multimedia/mlt7-glaxnimate@qt6|multimedia/mlt7-glaxnimate|2026-01-08|Unflavorize; only Qt6 is supported +multimedia/mlt7-qt@qt5||2026-01-08|Qt5 support has been dropped by upstream +multimedia/mlt7-qt@qt6|multimedia/mlt7-qt|2026-01-08|Unflavorize; only Qt6 is supported diff --git a/Mk/Uses/mlt.mk b/Mk/Uses/mlt.mk index 4647b9f91a6e..47c144dc9c6b 100644 --- a/Mk/Uses/mlt.mk +++ b/Mk/Uses/mlt.mk @@ -37,7 +37,7 @@ _MLT_NODEPEND= yes . endif # Library dependencies -_MLT7_VERSION= 7.34.1 +_MLT7_VERSION= 7.36.1 _MLT7_PORTNAME= mlt7 _MLT7_LIB= libmlt-7.so _MLT7_MELT= ${LOCALBASE}/bin/melt-7 diff --git a/multimedia/mlt7-glaxnimate/Makefile b/multimedia/mlt7-glaxnimate/Makefile index 33127a56014e..609f7618652a 100644 --- a/multimedia/mlt7-glaxnimate/Makefile +++ b/multimedia/mlt7-glaxnimate/Makefile @@ -1,52 +1,36 @@ -MASTERDIR= ${.CURDIR:H}/mlt7 -SLAVEPORT= glaxnimate - PORTREVISION= 0 -PKGNAMESUFFIX= -glaxnimate-${FLAVOR} +CATEGORIES= multimedia kde +PKGNAMESUFFIX= -glaxnimate-qt6 COMMENT= 2D animations plugin for the MLT multimedia framework -CATEGORIES= multimedia kde LICENSE= GPLv2 GPLv3 LICENSE_COMB= multi -FLAVORS= qt5 qt6 -FLAVOR?= qt5 - -USES= gl qt:${FLAVOR:S/qt//} libarchive xorg -USE_GL= ${_USE_GL_${FLAVOR}} -USE_QT= ${_USE_QT_${FLAVOR}} +USES= compiler:c++17-lang gl libarchive mlt:7 qt:6 xorg +USE_GL= opengl +USE_QT= base USE_XORG= x11 -# Flavor handling -_USE_GL_qt6= opengl -_USE_QT_qt5= core gui network widgets xml \ - buildtools:build qmake:build -_USE_QT_qt6= base -_CMAKE_ON_qt5= MOD_GLAXNIMATE -_CMAKE_ON_qt6= MOD_GLAXNIMATE_QT6 -_CMAKE_OFF_qt5= MOD_GLAXNIMATE_QT6 -_CMAKE_OFF_qt6= MOD_GLAXNIMATE -_PLIST_SUB_qt5= QT_VERSION_SUFFIX= -_PLIST_SUB_qt6= QT_VERSION_SUFFIX="-qt6" - -# Only enable Qt binding, and disable everything else -CMAKE_ON= ${_CMAKE_ON_${FLAVOR}} -CMAKE_OFF= MOD_AVFORMAT MOD_DECKLINK MOD_FEEDS MOD_FREI0R MOD_GDK MOD_GTK2 \ - MOD_JACKRACK MOD_KDENLIVE MOD_LUMAS MOD_MOTION_EST MOD_NORMALIZE \ - MOD_OLDFILM MOD_OPENCV MOD_OPENGL MOD_PLUSGPL MOD_PLUS MOD_QT \ - MOD_QT6 MOD_RESAMPLE MOD_RTAUDIO MOD_RUBBERBAND MOD_SDL2 MOD_SOX \ - MOD_VIDSTAB MOD_VMFX MOD_VORBIS MOD_XINE MOD_XML \ - SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \ - SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL \ - ${_CMAKE_OFF_${FLAVOR}} - -PLIST_SUB+= ${_PLIST_SUB_${FLAVOR}} +# Only enable Glaxnimate plugin and disable everything else +CMAKE_ON= MOD_GLAXNIMATE_QT6 +CMAKE_OFF= MOD_AVFORMAT MOD_DECKLINK MOD_FREI0R MOD_GDK MOD_JACKRACK \ + MOD_KDENLIVE MOD_MOVIT MOD_NORMALIZE MOD_OLDFILM MOD_OPENCV \ + MOD_PLUSGPL MOD_PLUS MOD_QT6 MOD_RESAMPLE MOD_RTAUDIO \ + MOD_RUBBERBAND MOD_SDL2 MOD_SOX MOD_VIDSTAB MOD_VORBIS \ + MOD_XINE MOD_XML \ + SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS \ + SWIG_PERL SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL \ + USE_LV2 USE_VST2 + +MASTERDIR= ${.CURDIR:H}/mlt7 +PORTSCOUT= ignore:1 BUILD_WRKSRC= ${WRKDIR}/.build/src/modules/glaxnimate +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +PLIST= ${.CURDIR}/pkg-plist -# Dummy placeholder target. -common-post-install: - @${TRUE} +_MLT_EXTRA_MOD= glaxnimate .include "${MASTERDIR}/Makefile" diff --git a/multimedia/mlt7-glaxnimate/pkg-plist b/multimedia/mlt7-glaxnimate/pkg-plist index d6b0940e7281..5e8a2f078e0c 100644 --- a/multimedia/mlt7-glaxnimate/pkg-plist +++ b/multimedia/mlt7-glaxnimate/pkg-plist @@ -1,2 +1,2 @@ -lib/mlt-7/libmltglaxnimate%%QT_VERSION_SUFFIX%%.so -%%DATADIR%%/glaxnimate%%QT_VERSION_SUFFIX%%/producer_glaxnimate.yml +lib/mlt-7/libmltglaxnimate-qt6.so +%%DATADIR%%/glaxnimate-qt6/producer_glaxnimate.yml diff --git a/multimedia/mlt7-qt/Makefile b/multimedia/mlt7-qt/Makefile index a8d1d75df6b4..2e4cae9d5872 100644 --- a/multimedia/mlt7-qt/Makefile +++ b/multimedia/mlt7-qt/Makefile @@ -1,11 +1,8 @@ -MASTERDIR= ${.CURDIR:H}/mlt7 -SLAVEPORT= qt - PORTREVISION= 0 -PKGNAMESUFFIX= -${FLAVOR} +CATEGORIES= multimedia kde +PKGNAMESUFFIX= -qt6 COMMENT= Qt plugin for the MLT multimedia framework -CATEGORIES= multimedia kde LICENSE= GPLv2 GPLv3 LICENSE_COMB= multi @@ -13,43 +10,30 @@ LICENSE_COMB= multi LIB_DEPENDS= libexif.so:graphics/libexif \ libfftw3.so:math/fftw3 -FLAVORS= qt5 qt6 -FLAVOR?= qt5 - -USES= gl qt:${FLAVOR:S/qt//} xorg -USE_GL= ${_USE_GL_${FLAVOR}} -USE_QT= ${_USE_QT_${FLAVOR}} +USES= compiler:c++17-lang gl mlt:7 qt:6 xorg +USE_GL= opengl +USE_QT= 5compat base svg USE_XORG= x11 -# Flavor handling -_USE_GL_qt6= opengl -_USE_QT_qt5= core gui svg widgets xml \ - buildtools:build qmake:build -_USE_QT_qt6= 5compat base svg -_CMAKE_ON_qt5= MOD_QT -_CMAKE_ON_qt6= MOD_QT6 -_CMAKE_OFF_qt5= MOD_QT6 -_CMAKE_OFF_qt6= MOD_QT -_PLIST_SUB_qt5= QT_VERSION_SUFFIX= -_PLIST_SUB_qt6= QT_VERSION_SUFFIX=6 - # Only enable Qt binding, and disable everything else -CMAKE_ON= ${_CMAKE_ON_${FLAVOR}} +CMAKE_ON= MOD_QT6 CMAKE_OFF= MOD_AVFORMAT MOD_DECKLINK MOD_FEEDS MOD_FREI0R MOD_GDK MOD_GTK2 \ - MOD_JACKRACK MOD_KDENLIVE MOD_LUMAS MOD_MOTION_EST MOD_NORMALIZE \ + MOD_JACKRACK MOD_KDENLIVE MOD_LUMAS MOD_MOTION_EST MOD_MOVIT MOD_NORMALIZE \ MOD_OLDFILM MOD_OPENCV MOD_OPENGL MOD_PLUSGPL MOD_PLUS MOD_RESAMPLE \ MOD_RTAUDIO MOD_RUBBERBAND MOD_SDL2 MOD_SOX MOD_VIDSTAB MOD_VMFX \ MOD_VORBIS MOD_XINE MOD_XML \ SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \ SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL \ - ${_CMAKE_OFF_${FLAVOR}} + USE_LV2 USE_VST2 -PLIST_SUB+= ${_PLIST_SUB_${FLAVOR}} +MASTERDIR= ${.CURDIR:H}/mlt7 +PORTSCOUT= ignore:1 BUILD_WRKSRC= ${WRKDIR}/.build/src/modules/qt +INSTALL_WRKSRC= ${BUILD_WRKSRC} + +PLIST= ${.CURDIR}/pkg-plist -# Dummy placeholder target. -common-post-install: - @${TRUE} +_MLT_EXTRA_MOD= qt .include "${MASTERDIR}/Makefile" diff --git a/multimedia/mlt7-qt/pkg-plist b/multimedia/mlt7-qt/pkg-plist index 3a36e6b8e717..63ce9e94a3ce 100644 --- a/multimedia/mlt7-qt/pkg-plist +++ b/multimedia/mlt7-qt/pkg-plist @@ -1,18 +1,18 @@ -lib/mlt-7/libmltqt%%QT_VERSION_SUFFIX%%.so -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_audiolevelgraph.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_audiospectrum.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_audiowaveform.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_dropshadow.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_gpsgraphic.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_gpstext.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_lightshow.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_qtblend.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_qtblend_mode.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_qtcrop.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_qtext.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/filter_typewriter.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/producer_kdenlivetitle.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/producer_qimage.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/producer_qtext.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/transition_qtblend.yml -%%DATADIR%%/qt%%QT_VERSION_SUFFIX%%/transition_vqm.yml +lib/mlt-7/libmltqt6.so +%%DATADIR%%/qt6/filter_audiolevelgraph.yml +%%DATADIR%%/qt6/filter_audiospectrum.yml +%%DATADIR%%/qt6/filter_audiowaveform.yml +%%DATADIR%%/qt6/filter_dropshadow.yml +%%DATADIR%%/qt6/filter_gpsgraphic.yml +%%DATADIR%%/qt6/filter_gpstext.yml +%%DATADIR%%/qt6/filter_lightshow.yml +%%DATADIR%%/qt6/filter_qtblend.yml +%%DATADIR%%/qt6/filter_qtblend_mode.yml +%%DATADIR%%/qt6/filter_qtcrop.yml +%%DATADIR%%/qt6/filter_qtext.yml +%%DATADIR%%/qt6/filter_typewriter.yml +%%DATADIR%%/qt6/producer_kdenlivetitle.yml +%%DATADIR%%/qt6/producer_qimage.yml +%%DATADIR%%/qt6/producer_qtext.yml +%%DATADIR%%/qt6/transition_qtblend.yml +%%DATADIR%%/qt6/transition_vqm.yml diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile index a2eda9d497e2..89db67b3a129 100644 --- a/multimedia/mlt7/Makefile +++ b/multimedia/mlt7/Makefile @@ -1,6 +1,6 @@ PORTNAME= ${_MLT_PORTNAME} DISTVERSION= ${_MLT_VERSION} -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES?= multimedia MASTER_SITES= https://github.com/mltframework/mlt/releases/download/v${DISTVERSION}/ DISTFILES= mlt-${DISTVERSION}${EXTRACT_SUFX} @@ -12,8 +12,7 @@ WWW= https://www.mltframework.org/ LICENSE?= GPLv2 GPLv3 LGPL21 LICENSE_COMB?= multi -USES+= cmake compiler:c++11-lang eigen:3 localbase \ - pathfix pkgconfig +USES+= cmake localbase pathfix pkgconfig USE_LDCONFIG= yes # Suppress errors with lld >= 17 due to undefined symbols. @@ -23,17 +22,16 @@ DATADIR= ${PREFIX}/share/mlt-7 WRKSRC= ${WRKDIR}/mlt-${DISTVERSION} -.ifndef(SLAVEPORT) # Master port. -USES+= gnome mlt:7,nodepend +.ifndef(_MLT_EXTRA_MOD) # Main port +USES+= compiler:c++11-lang gnome mlt:7,nodepend USE_GNOME= libxml2 CMAKE_ON= MOD_XML -# Explicitly disabled modules that are ouddated, unnecessary, or have +# Explicitly disabled modules that are outdated, unnecessary, or have # their own port. CMAKE_OFF= CLANG_FORMAT CMAKE_CXX_SCAN_FOR_MODULES \ - MOD_GLAXNIMATE MOD_GLAXNIMATE_QT6 MOD_SDL1 MOD_QT \ - MOD_QT6 MOD_NDI \ + MOD_DECKLINK MOD_GLAXNIMATE_QT6 MOD_SDL1 MOD_QT6 MOD_NDI \ SWIG_CSHARP SWIG_JAVA SWIG_LUA SWIG_NODEJS SWIG_PERL \ SWIG_PHP SWIG_PYTHON SWIG_RUBY SWIG_TCL @@ -41,22 +39,19 @@ PORTDOCS= AUTHORS NEWS PORTEXAMPLES= demo OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONS_DEFAULT= AVFORMAT FREI0R GDK MOVIT KDENLIVE NORMALIZE PLUS PLUSGPL RESAMPLE SDL2 SOX \ - VIDSTAB VORBIS +OPTIONS_DEFAULT= AVFORMAT FREI0R GDK MOVIT KDENLIVE NORMALIZE PLUS \ + PLUSGPL RESAMPLE SDL2 SOX VIDSTAB VORBIS OPTIONS_GROUP= MODULES -OPTIONS_GROUP_MODULES= AVFORMAT DECKLINK FREI0R GDK JACKRACK KDENLIVE MOVIT NORMALIZE \ - OLDFILM OPENCV PLUS PLUSGPL RESAMPLE RTAUDIO RUBBERBAND SDL2 \ - SOX VIDSTAB VORBIS XINE +OPTIONS_GROUP_MODULES= AVFORMAT FREI0R GDK JACKRACK KDENLIVE MOVIT NORMALIZE \ + OLDFILM OPENCV PLUS PLUSGPL RESAMPLE RTAUDIO RUBBERBAND \ + SDL2 SOX VIDSTAB VORBIS XINE OPTIONS_SUB= yes AVFORMAT_DESC= Enable avformat module AVFORMAT_LIB_DEPENDS= libavformat.so:multimedia/ffmpeg AVFORMAT_CMAKE_BOOL= MOD_AVFORMAT -DECKLINK_DESC= Enable decklink module -DECKLINK_CMAKE_BOOL= MOD_DECKLINK - FREI0R_DESC= Enable frei0r module FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:graphics/frei0r FREI0R_CMAKE_BOOL= MOD_FREI0R @@ -74,16 +69,16 @@ JACKRACK_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa JACKRACK_LIB_DEPENDS= libjack.so:audio/jack \ liblilv-0.so:audio/lilv JACKRACK_USE= gnome=glib20 -JACKRACK_CMAKE_BOOL= MOD_JACKRACK +JACKRACK_CMAKE_BOOL= MOD_JACKRACK USE_LV2 USE_VST2 KDENLIVE_DESC= Enable kdenlive module KDENLIVE_CMAKE_BOOL= MOD_KDENLIVE MOVIT_DESC= Enable Movit module -MOVIT_USES= gl xorg -MOVIT_USE= gl=opengl xorg=x11 MOVIT_LIB_DEPENDS= libmovit.so:graphics/movit \ libepoxy.so:graphics/libepoxy +MOVIT_USES= gl xorg +MOVIT_USE= gl=opengl xorg=x11 MOVIT_CMAKE_BOOL= MOD_MOVIT NORMALIZE_DESC= Enable normalize module @@ -100,8 +95,8 @@ PLUSGPL_DESC= Enable plus GPL module PLUSGPL_CMAKE_BOOL= MOD_PLUSGPL PLUS_DESC= Enable plus module -PLUS_USES= ebur128 PLUS_LIB_DEPENDS= libfftw3.so:math/fftw3 +PLUS_USES= ebur128 PLUS_CMAKE_BOOL= MOD_PLUS RESAMPLE_DESC= Enable resample module @@ -136,36 +131,15 @@ VORBIS_CMAKE_BOOL= MOD_VORBIS XINE_DESC= Enable xine module XINE_CMAKE_BOOL= MOD_XINE -pre-configure: - ${RM} ${STAGEDIR}${PREFIX}/man/man1/melt.1 - -common-post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/melt-7 - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmlt-7.so.${PORTVERSION} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmlt++-7.so.${PORTVERSION} - post-install-DOCS-on: -.for f in ${PORTDOCS} +. for f in ${PORTDOCS} cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${DOCSDIR} -.endfor +. endfor post-install-EXAMPLES-on: -.for f in ${PORTEXAMPLES} +. for f in ${PORTEXAMPLES} cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${EXAMPLESDIR} -.endfor - -.else # Slave port. -PORTSCOUT= ignore:1 - -# Depend on multimedia/mlt7 for child ports -USES+= mlt:7 -PLIST?= ${.CURDIR}/pkg-plist - -INSTALL_WRKSRC?= ${BUILD_WRKSRC} +. endfor .endif -post-install: common-post-install - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/* 2>/dev/null || ${TRUE} - @${RMDIR} -p ${STAGEDIR}${PREFIX}/lib/${PORTNAME} 2>/dev/null || ${TRUE} - .include <bsd.port.mk> diff --git a/multimedia/mlt7/distinfo b/multimedia/mlt7/distinfo index 39fb5cbf5d9d..0b111cef919b 100644 --- a/multimedia/mlt7/distinfo +++ b/multimedia/mlt7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1763046667 -SHA256 (mlt-7.34.1.tar.gz) = 4104b87db3e14389f81666938c131f723564773fec9aa18b6bff008761cc838b -SIZE (mlt-7.34.1.tar.gz) = 1817867 +TIMESTAMP = 1767607668 +SHA256 (mlt-7.36.1.tar.gz) = 0d2b956864ba2ff58bb4e2b2779aa36870bd2a3a835e2dbfda33faa5fc6f4d3a +SIZE (mlt-7.36.1.tar.gz) = 1832413 diff --git a/multimedia/mlt7/files/patch-CMakeLists.txt b/multimedia/mlt7/files/patch-CMakeLists.txt index 372e5cd2de3b..3f36d3c80d6e 100644 --- a/multimedia/mlt7/files/patch-CMakeLists.txt +++ b/multimedia/mlt7/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2023-12-06 23:26:22 UTC +--- CMakeLists.txt.orig 2026-01-07 06:47:08 UTC +++ CMakeLists.txt -@@ -547,9 +547,6 @@ if(UNIX AND NOT APPLE) +@@ -506,9 +506,6 @@ if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE) install(FILES docs/melt.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 RENAME melt-${MLT_VERSION_MAJOR}.1) diff --git a/multimedia/mlt7/files/patch-src_melt_CMakeLists.txt b/multimedia/mlt7/files/patch-src_melt_CMakeLists.txt index f67476d2a4ba..14d9ac14222d 100644 --- a/multimedia/mlt7/files/patch-src_melt_CMakeLists.txt +++ b/multimedia/mlt7/files/patch-src_melt_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/melt/CMakeLists.txt.orig 2022-07-29 16:08:23 UTC +--- src/melt/CMakeLists.txt.orig 2026-01-07 06:47:08 UTC +++ src/melt/CMakeLists.txt -@@ -24,13 +24,5 @@ endif() +@@ -30,13 +30,5 @@ endif() ) endif() diff --git a/multimedia/mlt7/files/patch-src_modules_avformat_producer__avformat.c b/multimedia/mlt7/files/patch-src_modules_avformat_producer__avformat.c deleted file mode 100644 index c5a04d3b9915..000000000000 --- a/multimedia/mlt7/files/patch-src_modules_avformat_producer__avformat.c +++ /dev/null @@ -1,54 +0,0 @@ -From 20b9bc778542b105039471e25e192e51fe9fd61f Mon Sep 17 00:00:00 2001 -From: Brian Matherly <brian.matherly@yahoo.com> -Date: Mon, 11 Sep 2023 20:41:59 -0500 -Subject: [PATCH] Fix crash dereferencing freed pointer - -If the producer is deleted by the application before the avformat_producer -is freed from the cache, then the avformat_producer destructor might -try to access the freed producer. - -Hold a reference to the producer until the avformat_producer is also -closed. - --- - -See also the seemingly FreeBSD-specific issue filed by jhale@: -https://github.com/mltframework/mlt/issues/959 -multimedia/shotcut (even more recent Qt6-based versions) reproducibly crashes -when using the undo operation without this patch. multimedia/kdenlive does not -seem to be affected. This port builds with and without this patch, so please -check multimedia/shotcut runtime before removing. - ---- src/modules/avformat/producer_avformat.c.orig 2023-11-29 04:03:52 UTC -+++ src/modules/avformat/producer_avformat.c -@@ -220,11 +220,12 @@ mlt_producer producer_avformat_init(mlt_profile profil - - // Initialise it - if (mlt_producer_init(producer, self) == 0) { -- self->parent = producer; -- - // Get the properties - mlt_properties properties = MLT_PRODUCER_PROPERTIES(producer); - -+ self->parent = producer; -+ mlt_properties_inc_ref(properties); -+ - // Set the resource property (required for all producers) - mlt_properties_set(properties, "resource", file); - -@@ -3739,6 +3740,7 @@ static int producer_get_frame(mlt_producer producer, m - if (!self) { - self = calloc(1, sizeof(struct producer_avformat_s)); - self->parent = producer; -+ mlt_properties_inc_ref(MLT_PRODUCER_PROPERTIES(producer)); - mlt_service_cache_put(service, - "producer_avformat", - self, -@@ -3928,6 +3930,7 @@ static void producer_avformat_close(producer_avformat - self->vpackets = NULL; - } - -+ mlt_properties_dec_ref(MLT_PRODUCER_PROPERTIES(self->parent)); - free(self); - } - diff --git a/multimedia/mlt7/files/patch-src_modules_rtaudio_CMakeLists.txt b/multimedia/mlt7/files/patch-src_modules_rtaudio_CMakeLists.txt index af5498ce5056..2f34b82e0da1 100644 --- a/multimedia/mlt7/files/patch-src_modules_rtaudio_CMakeLists.txt +++ b/multimedia/mlt7/files/patch-src_modules_rtaudio_CMakeLists.txt @@ -1,13 +1,11 @@ ---- src/modules/rtaudio/CMakeLists.txt.orig 2023-12-06 23:26:22 UTC +--- src/modules/rtaudio/CMakeLists.txt.orig 2026-01-07 06:47:08 UTC +++ src/modules/rtaudio/CMakeLists.txt -@@ -32,7 +32,11 @@ else() +@@ -37,7 +37,9 @@ else() target_compile_definitions(mltrtaudio PRIVATE __LINUX_PULSE__) endif() if(NOT (TARGET PkgConfig::alsa OR TARGET PkgConfig::libpulse-simple)) - target_link_libraries(mltrtaudio PRIVATE ossaudio) -+ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") -+ # Nothing to do for OSS! -+ else() ++ if(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + target_link_libraries(mltrtaudio PRIVATE ossaudio) + endif() target_compile_definitions(mltrtaudio PRIVATE __LINUX_OSS__) diff --git a/multimedia/mlt7/pkg-plist b/multimedia/mlt7/pkg-plist index dc8dc02b2d08..02917bbafaa9 100644 --- a/multimedia/mlt7/pkg-plist +++ b/multimedia/mlt7/pkg-plist @@ -72,11 +72,11 @@ lib/libmlt-7.so.7 lib/libmlt-7.so.%%MLT_VERSION%% %%AVFORMAT%%lib/mlt-7/libmltavformat.so lib/mlt-7/libmltcore.so -%%DECKLINK%%lib/mlt-7/libmltdecklink.so %%FREI0R%%lib/mlt-7/libmltfrei0r.so %%GDK%%lib/mlt-7/libmltgdk.so %%JACKRACK%%lib/mlt-7/libmltjackrack.so %%KDENLIVE%%lib/mlt-7/libmltkdenlive.so +%%JACKRACK%%lib/mlt-7/libmltladspa.so %%MOVIT%%lib/mlt-7/libmltmovit.so %%NORMALIZE%%lib/mlt-7/libmltnormalize.so %%OLDFILM%%lib/mlt-7/libmltoldfilm.so @@ -100,6 +100,7 @@ share/man/man1/melt-7.1.gz %%AVFORMAT%%%%DATADIR%%/avformat/filter_avcolour_space.yml %%AVFORMAT%%%%DATADIR%%/avformat/filter_avdeinterlace.yml %%AVFORMAT%%%%DATADIR%%/avformat/filter_swresample.yml +%%AVFORMAT%%%%DATADIR%%/avformat/filter_sws_colortransform.yml %%AVFORMAT%%%%DATADIR%%/avformat/filter_swscale.yml %%AVFORMAT%%%%DATADIR%%/avformat/link_avdeinterlace.yml %%AVFORMAT%%%%DATADIR%%/avformat/link_swresample.yml @@ -119,6 +120,7 @@ share/man/man1/melt-7.1.gz %%DATADIR%%/core/filter_brightness.yml %%DATADIR%%/core/filter_channelcopy.yml %%DATADIR%%/core/filter_choppy.yml +%%DATADIR%%/core/filter_color_transform.yml %%DATADIR%%/core/filter_crop.yml %%DATADIR%%/core/filter_fieldorder.yml %%DATADIR%%/core/filter_gamma.yml @@ -155,9 +157,8 @@ share/man/man1/melt-7.1.gz %%DATADIR%%/core/transition_luma.yml %%DATADIR%%/core/transition_matte.yml %%DATADIR%%/core/transition_mix.yml -%%DECKLINK%%%%DATADIR%%/decklink/consumer_decklink.yml -%%DECKLINK%%%%DATADIR%%/decklink/producer_decklink.yml %%FREI0R%%%%DATADIR%%/frei0r/aliases.yaml +%%FREI0R%%%%DATADIR%%/frei0r/alpha_only.txt %%FREI0R%%%%DATADIR%%/frei0r/blacklist.txt %%FREI0R%%%%DATADIR%%/frei0r/filter_cairoblend_mode.yml %%FREI0R%%%%DATADIR%%/frei0r/not_thread_safe.txthome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?696032b5.3122e.535ff4c3>