git: 74ecba43bb40 - main - multimedia/mlt7: update to 7.4.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Charlie Li <vishwin_at_FreeBSD.org>
Date: Sun, 20 Mar 2022 16:00:19 UTC
The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=74ecba43bb4045bd68bd21dbd5886e051e06936f

commit 74ecba43bb4045bd68bd21dbd5886e051e06936f
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2022-03-19 15:19:56 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2022-03-20 15:57:09 +0000

    multimedia/mlt7: update to 7.4.0
    
    Make the former XML option unconditional, as consumers require it to function properly
    
    Release notes: https://github.com/mltframework/mlt/releases/tag/v7.4.0
    
    Approved by: tcberner (mentor, kde, portmgr)
    Differential Revision: https://reviews.freebsd.org/D34610
---
 Mk/Uses/mlt.mk               |  2 +-
 multimedia/mlt7-qt5/Makefile |  2 +-
 multimedia/mlt7/Makefile     | 22 +++++++++++-----------
 multimedia/mlt7/distinfo     | 10 +++++++---
 multimedia/mlt7/pkg-plist    | 15 +++++++++------
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/Mk/Uses/mlt.mk b/Mk/Uses/mlt.mk
index bb9bc5f1328c..abac94eb9de2 100644
--- a/Mk/Uses/mlt.mk
+++ b/Mk/Uses/mlt.mk
@@ -39,7 +39,7 @@ _MLT_NODEPEND=	yes
 
 # Library dependencies
 _MLT6_VERSION=	6.26.1
-_MLT7_VERSION=	7.0.1
+_MLT7_VERSION=	7.4.0
 _MLT6_PORTNAME=	mlt6
 _MLT7_PORTNAME=	mlt7
 _MLT6_LIB=	libmlt.so
diff --git a/multimedia/mlt7-qt5/Makefile b/multimedia/mlt7-qt5/Makefile
index 0759f053e58b..3a14ba98d0ea 100644
--- a/multimedia/mlt7-qt5/Makefile
+++ b/multimedia/mlt7-qt5/Makefile
@@ -1,7 +1,7 @@
 MASTERDIR=	${.CURDIR:H}/mlt7
 SLAVEPORT=	qt5
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-qt5
 
 COMMENT=	Qt plugin for the MLT multimedia framework
diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile
index d1915fed3ab3..c9ab5816ccf5 100644
--- a/multimedia/mlt7/Makefile
+++ b/multimedia/mlt7/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=		${_MLT_PORTNAME}
 DISTVERSION=		${_MLT_VERSION}
-PORTREVISION?=		1
 CATEGORIES?=		multimedia
 # Don't use GitHub "fake" downloads that are auto-generated from a
 # tag; the project uploads tarballs for each release.
@@ -9,6 +8,10 @@ MASTER_SITES=		https://github.com/mltframework/mlt/releases/download/v${DISTVERS
 DISTFILES=		mlt-${DISTVERSION}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/mlt-${DISTVERSION}
 
+PATCH_SITES=		https://github.com/mltframework/mlt/commit/
+PATCHFILES=		86b922b361c0dbc9a70999abaef7be065e91dd1f.patch:-p1 \
+			41cfefcdd9c490b016cedcdc56186f50ee35bc44.patch:-p1
+
 MAINTAINER=		kde@FreeBSD.org
 COMMENT?=		Multimedia framework for TV broadcasting
 
@@ -16,13 +19,17 @@ LICENSE?=		GPLv2 GPLv3 LGPL21
 LICENSE_COMB?=		multi
 
 USES+=			alias cmake compiler:c++11-lang eigen:3 localbase pkgconfig
+USE_LDCONFIG=		yes
 
 DATADIR=		${PREFIX}/share/mlt-7
 
 .ifndef(SLAVEPORT) # Master port.
 BROKEN_sparc64=		does not compile on sparc64 (invokes i386 asm)
 
-USES+=			mlt:7,nodepend
+USES+=			gnome mlt:7,nodepend
+USE_GNOME=		libxml2
+
+CMAKE_ON=		MOD_XML
 
 # Explicitly disabled modules that are ouddated, unnecessary, or have
 # their own port.
@@ -36,12 +43,12 @@ PORTEXAMPLES=		demo
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_DEFAULT=	AVFORMAT FREI0R GDK MOVIT KDENLIVE PLUS PLUSGPL RESAMPLE SDL2 SOX \
-			VIDSTAB VORBIS XML
+			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 XML
+			SOX VIDSTAB VORBIS XINE
 OPTIONS_SUB=		yes
 
 AVFORMAT_DESC=		Enable avformat module
@@ -60,14 +67,12 @@ GDK_LIB_DEPENDS=	libexif.so:graphics/libexif \
 			libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2 \
 			libharfbuzz.so:print/harfbuzz
-GDK_USES=		gnome
 GDK_USE=		gnome=gdkpixbuf2,pango
 GDK_CMAKE_BOOL=		MOD_GDK
 
 JACKRACK_DESC=		Enable jackrack module
 JACKRACK_BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 JACKRACK_LIB_DEPENDS=	libjack.so:audio/jack
-JACKRACK_USES=		gnome
 JACKRACK_USE=		gnome=glib20
 JACKRACK_CMAKE_BOOL=	MOD_JACKRACK
 
@@ -138,11 +143,6 @@ VORBIS_CMAKE_BOOL=	MOD_VORBIS
 XINE_DESC=		Enable xine module
 XINE_CMAKE_BOOL=	MOD_XINE
 
-XML_DESC=		Enable XML module
-XML_USES=		gnome
-XML_USE=		gnome=libxml2
-XML_CMAKE_BOOL=		MOD_XML
-
 pre-configure:
 	${RM} ${STAGEDIR}${PREFIX}/man/man1/melt.1
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
diff --git a/multimedia/mlt7/distinfo b/multimedia/mlt7/distinfo
index f91c2efba83b..68049b3f9136 100644
--- a/multimedia/mlt7/distinfo
+++ b/multimedia/mlt7/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1623936853
-SHA256 (mlt-7.0.1.tar.gz) = b68c88d9ad91889838186188cce938feee8b63e3755a3b6fb45dc9c2ae0c5ecd
-SIZE (mlt-7.0.1.tar.gz) = 1181298
+TIMESTAMP = 1643124903
+SHA256 (mlt-7.4.0.tar.gz) = 17c19843ffdbca66777aaadf39acb11829fd930eaded92f768cbcb8ae59a5f37
+SIZE (mlt-7.4.0.tar.gz) = 1206316
+SHA256 (86b922b361c0dbc9a70999abaef7be065e91dd1f.patch) = 1e02b9955d93fc91fea1801623d1aa1b669f3bef88f1d6d206e9454b78e9972f
+SIZE (86b922b361c0dbc9a70999abaef7be065e91dd1f.patch) = 1775
+SHA256 (41cfefcdd9c490b016cedcdc56186f50ee35bc44.patch) = 8f76c5f1d292c6fa6135218a092858a10bf63a836cf91f191847fb04f8be98c8
+SIZE (41cfefcdd9c490b016cedcdc56186f50ee35bc44.patch) = 981
diff --git a/multimedia/mlt7/pkg-plist b/multimedia/mlt7/pkg-plist
index 1eb098b58c6d..c1703f353baa 100644
--- a/multimedia/mlt7/pkg-plist
+++ b/multimedia/mlt7/pkg-plist
@@ -90,7 +90,7 @@ lib/mlt-7/libmltcore.so
 %%VIDSTAB%%lib/mlt-7/libmltvidstab.so
 %%VORBIS%%lib/mlt-7/libmltvorbis.so
 %%XINE%%lib/mlt-7/libmltxine.so
-%%XML%%lib/mlt-7/libmltxml.so
+lib/mlt-7/libmltxml.so
 libdata/pkgconfig/mlt++-7.pc
 libdata/pkgconfig/mlt-framework-7.pc
 man/man1/melt-7.1.gz
@@ -302,9 +302,11 @@ man/man1/melt-7.1.gz
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/stills/PPM
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/stills/TGA
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/stills/TIFF
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/stills/webp
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/vp9
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/webm
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/webm-pass1
+%%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/webp
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/x264-medium
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/x264-medium-baseline
 %%AVFORMAT%%%%DATADIR%%/presets/consumer/avformat/x264-medium-main
@@ -407,8 +409,9 @@ man/man1/melt-7.1.gz
 %%VIDSTAB%%%%DATADIR%%/vid.stab/filter_deshake.yml
 %%VIDSTAB%%%%DATADIR%%/vid.stab/filter_vidstab.yml
 %%VORBIS%%%%DATADIR%%/vorbis/producer_vorbis.yml
-%%XML%%%%DATADIR%%/xml/consumer_xml.yml
-%%XML%%%%DATADIR%%/xml/mlt-xml.dtd
-%%XML%%%%DATADIR%%/xml/producer_xml-nogl.yml
-%%XML%%%%DATADIR%%/xml/producer_xml-string.yml
-%%XML%%%%DATADIR%%/xml/producer_xml.yml
+%%DATADIR%%/xml/consumer_xml.yml
+%%DATADIR%%/xml/filter_gpstext.yml
+%%DATADIR%%/xml/mlt-xml.dtd
+%%DATADIR%%/xml/producer_xml-nogl.yml
+%%DATADIR%%/xml/producer_xml-string.yml
+%%DATADIR%%/xml/producer_xml.yml