git: f089d2af6775 - main - multimedia/mlt7: Backport bugfixes and some style changes to Makefile

From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Tue, 19 Sep 2023 18:27:18 UTC
The branch main has been updated by diizzy:

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

commit f089d2af6775567d633c46aa5cd6cc338d8bcabd
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-09-19 18:09:06 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-09-19 18:09:17 +0000

    multimedia/mlt7: Backport bugfixes and some style changes to Makefile
    
    Backport following upstream commits:
    52c5bde61947fb473413cd9daf4b2664769702d9
    f7adc156a7aa5081cde9f52ca52d67df8bb728cf
    1d3669e60cd416e42ddeea171a9e1116ed1b613b
    2266e5c8e06efb18f3f13f26f0e7b6147ba5a840
    2df4fc8e630dbab5e9f1fa1fbf69b859ec8c159d
    b4943c55ea44b6d72a5f22b5dcb754c3c89454e3
    8a821cc5864c848bb55c251a87fdf0dae66e6c81
    
    References:
    https://gitlab.archlinux.org/archlinux/packaging/packages/mlt/-/commit/945df5433b8bfb3024699bf54c61ca6b2a9f06aa
    https://github.com/mltframework/mlt/commit/52c5bde61947fb473413cd9daf4b2664769702d9
    https://github.com/mltframework/mlt/commit/f7adc156a7aa5081cde9f52ca52d67df8bb728cf
    https://github.com/mltframework/mlt/commit/1d3669e60cd416e42ddeea171a9e1116ed1b613b
    https://github.com/mltframework/mlt/commit/2266e5c8e06efb18f3f13f26f0e7b6147ba5a840
    https://github.com/mltframework/mlt/commit/2df4fc8e630dbab5e9f1fa1fbf69b859ec8c159d
    https://github.com/mltframework/mlt/commit/b4943c55ea44b6d72a5f22b5dcb754c3c89454e3
    https://github.com/mltframework/mlt/commit/8a821cc5864c848bb55c251a87fdf0dae66e6c81
    
    PR:             273792
    Approved by:    kde (tcberner)
    Sponsored by:   Blinkinblox
---
 multimedia/mlt7/Makefile | 22 +++++++++++++---------
 multimedia/mlt7/distinfo | 16 +++++++++++++++-
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/multimedia/mlt7/Makefile b/multimedia/mlt7/Makefile
index 5b3103533bd5..83af26067290 100644
--- a/multimedia/mlt7/Makefile
+++ b/multimedia/mlt7/Makefile
@@ -1,17 +1,23 @@
 PORTNAME=		${_MLT_PORTNAME}
 DISTVERSION=		${_MLT_VERSION}
-PORTREVISION?=		1
+PORTREVISION?=		2
 CATEGORIES?=		multimedia
-# Don't use GitHub "fake" downloads that are auto-generated from a
-# tag; the project uploads tarballs for each release.
-#               https://github.com/mltframework/mlt/releases/download/v6.26.1/mlt-6.26.1.tar.gz
 MASTER_SITES=		https://github.com/mltframework/mlt/releases/download/v${DISTVERSION}/
 DISTFILES=		mlt-${DISTVERSION}${EXTRACT_SUFX}
 WRKSRC=			${WRKDIR}/mlt-${DISTVERSION}
 
+PATCH_SITES=		https://github.com/mltframework/mlt/commit/
+PATCHFILES=		52c5bde61947fb473413cd9daf4b2664769702d9.patch:-p1 \
+			f7adc156a7aa5081cde9f52ca52d67df8bb728cf.patch:-p1 \
+			1d3669e60cd416e42ddeea171a9e1116ed1b613b.patch:-p1 \
+			2266e5c8e06efb18f3f13f26f0e7b6147ba5a840.patch:-p1 \
+			2df4fc8e630dbab5e9f1fa1fbf69b859ec8c159d.patch:-p1 \
+			b4943c55ea44b6d72a5f22b5dcb754c3c89454e3.patch:-p1 \
+			8a821cc5864c848bb55c251a87fdf0dae66e6c81.patch:-p1
+
 MAINTAINER=		kde@FreeBSD.org
 COMMENT?=		Multimedia framework for TV broadcasting
-WWW=		https://www.mltframework.org/
+WWW=			https://www.mltframework.org/
 
 LICENSE?=		GPLv2 GPLv3 LGPL21
 LICENSE_COMB?=		multi
@@ -138,7 +144,8 @@ VIDSTAB_LIB_DEPENDS=	libvidstab.so:multimedia/vid.stab
 VIDSTAB_CMAKE_BOOL=	MOD_VIDSTAB
 
 VORBIS_DESC=		Enable Vorbis module
-VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis libogg.so:audio/libogg
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+			libogg.so:audio/libogg
 VORBIS_CMAKE_BOOL=	MOD_VORBIS
 
 XINE_DESC=		Enable xine module
@@ -146,9 +153,6 @@ XINE_CMAKE_BOOL=	MOD_XINE
 
 pre-configure:
 	${RM} ${STAGEDIR}${PREFIX}/man/man1/melt.1
-	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \
-		${WRKSRC}/src/modules/frei0r/factory.c \
-		${WRKSRC}/src/modules/jackrack/plugin_mgr.c
 
 common-post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/melt-7
diff --git a/multimedia/mlt7/distinfo b/multimedia/mlt7/distinfo
index 7f4bee2d6eda..6ec9342b101a 100644
--- a/multimedia/mlt7/distinfo
+++ b/multimedia/mlt7/distinfo
@@ -1,3 +1,17 @@
-TIMESTAMP = 1690648795
+TIMESTAMP = 1694715956
 SHA256 (mlt-7.18.0.tar.gz) = 9c57da14fbf3cb9c23b867b36f038aac7978c159ba0e8d8ac90e31c66878d115
 SIZE (mlt-7.18.0.tar.gz) = 1586572
+SHA256 (52c5bde61947fb473413cd9daf4b2664769702d9.patch) = 2162fe44964ff6946403510e2388ef0cb3dce4f2837b187aa6e83f7906a345a6
+SIZE (52c5bde61947fb473413cd9daf4b2664769702d9.patch) = 16559
+SHA256 (f7adc156a7aa5081cde9f52ca52d67df8bb728cf.patch) = 574de79fa667cc0a46ed04374ad7438b8b926777b394a2cb0c26f8e40c5c9446
+SIZE (f7adc156a7aa5081cde9f52ca52d67df8bb728cf.patch) = 1202
+SHA256 (1d3669e60cd416e42ddeea171a9e1116ed1b613b.patch) = a7f3d8da9126b0b34a3df3334c7f6b93218eef0ed86fbbc6ec058e8bd0075a19
+SIZE (1d3669e60cd416e42ddeea171a9e1116ed1b613b.patch) = 1367
+SHA256 (2266e5c8e06efb18f3f13f26f0e7b6147ba5a840.patch) = 3d2aa691ca10aeeb637a931503b744e35743a13e01beab33e2e725f0987628d9
+SIZE (2266e5c8e06efb18f3f13f26f0e7b6147ba5a840.patch) = 9880
+SHA256 (2df4fc8e630dbab5e9f1fa1fbf69b859ec8c159d.patch) = 8496448b49ecd5de12ce694db8064bfbd8adc5eaf7cd67d89487e5d69899d67a
+SIZE (2df4fc8e630dbab5e9f1fa1fbf69b859ec8c159d.patch) = 2232
+SHA256 (b4943c55ea44b6d72a5f22b5dcb754c3c89454e3.patch) = f6b102329cf8439bad833aa40b5b8417805a5b8ee560cbf082fed013ecdfca13
+SIZE (b4943c55ea44b6d72a5f22b5dcb754c3c89454e3.patch) = 1840
+SHA256 (8a821cc5864c848bb55c251a87fdf0dae66e6c81.patch) = 5ab536e019b704e5c9704a63d5867d98b0a700a6309e2965b78dd56697bfebb8
+SIZE (8a821cc5864c848bb55c251a87fdf0dae66e6c81.patch) = 964