From nobody Tue Sep 19 18:27:18 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rqqrk5gdZz4m5Nc; Tue, 19 Sep 2023 18:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rqqrk34DSz3Nh8; Tue, 19 Sep 2023 18:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695148038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8sqXOZjj3YjFOv6q1Yoi8jfdbxkFdIeK+i2H88SWBDs=; b=XQcu8Wev2G9b7NOWaA0MkiYAmIhJH3UvZhBRPWy2jeTM8Ufg9WonIIuUyLpdWLUXQ6g2QN 9rfnyZQ+QS/ZwF7d5RDQXO5ThZW36za66/EEuFX8pecNL39VEQt7J7ir2NyzL+NCEY+w0Y ClZKmGHyfAkXdxN++KNNnf4IB/LUrcMBqDxVy6OVxhDyCkFZg3tGLT0Xhc2UtnmXvDZV+T 3VfbJW2lp88MY1pL/2s1+CLA8oPDZXY+brnieXOFEgX12/Iajtik6Uq75RMUVrky1uaODv FCKiKavJLlQ1BNwsY0ARZQ2T+Jw+P0l6y+m6SLta10gHwOawh/eq7KfuVZpFew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695148038; a=rsa-sha256; cv=none; b=ZWeyi5tWzpi+bKVTk61lmGCSWGBLDyWrQZynNt3VSdN8uD83bu5tJT0R99p9P9vOgvKBsa sLUSQ03gPXXRcFHZnlDbSuqd/TAEoloDWjHMAEDA6Om3JIElbIt7/2e/1pJ6nS9WRAGVHT gM8O+NO39OqlNz/eQTCtikFV8n8NrrasjPzA221/uctV3kS0J0LAE/GKNcFaG4wVPRKNiK Wd9d1SaGDvIgj5zQ2Va0KXSxBNX4Lr1p0qp46nx6Ho6MfpmXNLUcCgVkP9JEONZemsBuNf gx17MSV0E8lYe3sOo81xMlkLbzjMV5WbDLxNiQWrgk21TmgLa8Jp/gbWCgrwUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695148038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8sqXOZjj3YjFOv6q1Yoi8jfdbxkFdIeK+i2H88SWBDs=; b=AFS7MuJ0pTxlgN9I/2gkhrUOltyd9wByqrE3/UFevkAm5zkcsstPzphIRG3IpHg87DA+rK ikrsM8dDbl9qu7IzUH+dQLeEDJYl/7R7TKPE+PQBGSdZP45h10dLdf9z1I16ScLo1Q25H/ 1wjw49B7FjNBp95C7mnDIaFlhpRFMQW57l+SlJeX4GGhryDNr7Z2+8mkUR1Ptl74pdDQo2 pgvRjJvehBuC+ocIhd0gXJJC3/XNLGuX1enWHASSBhvBWdtWPb6uksGvt9yXP8w/Luy1k1 hls3jui8t9UDI3B3+Lw/V0G/fEdxYGGJjaAietPXYZM5eUJHTUXjF+h3V4sUwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rqqrk1xBRz88H; Tue, 19 Sep 2023 18:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38JIRI0x092039; Tue, 19 Sep 2023 18:27:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38JIRIpN092036; Tue, 19 Sep 2023 18:27:18 GMT (envelope-from git) Date: Tue, 19 Sep 2023 18:27:18 GMT Message-Id: <202309191827.38JIRIpN092036@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: f089d2af6775 - main - multimedia/mlt7: Backport bugfixes and some style changes to Makefile List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f089d2af6775567d633c46aa5cd6cc338d8bcabd Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f089d2af6775567d633c46aa5cd6cc338d8bcabd commit f089d2af6775567d633c46aa5cd6cc338d8bcabd Author: Daniel Engberg AuthorDate: 2023-09-19 18:09:06 +0000 Commit: Daniel Engberg 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