From nobody Sat Aug 05 19:17:01 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 4RJC4s5X8kz4mR5m; Sat, 5 Aug 2023 19:17:01 +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 4RJC4s4KHPz4gDy; Sat, 5 Aug 2023 19:17:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691263021; 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=pJBBNieeyhO/OB+YkmHV9WMVrH3rrIr8TsMNsX8YWhg=; b=cBLiD/AZJRe6mJmlfQSjy4dsskO7VOWnTV0zL+TYPXY8181VkmE5jp1CKfMf5z2yKvIWAR Hc1RTqP2brx48YwYClT5xZwRpQ4TzFT5T51vYzBpBtg6GHCr85DpVOqrEOy5sSVb7c4LqW zYK4G6Ud/0Z+A6/Apk4mF9c8rDc1S9XhAPdNNt4Z8yICoGMuSAW+LtjsOeBDNbzmxHbX6E ApSKuBNwlFSx3uFfC8aaYEQObJ6XuvuVqu8izuWbvIbUOKk928i+YU8Ltyy980Kw7Tv3LR 7IIZxEct3r1+Fa76hdUuHKlS22Dw4RN4GKu4lqCM5sXB+6z0ySCmeTDtc17zCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691263021; 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=pJBBNieeyhO/OB+YkmHV9WMVrH3rrIr8TsMNsX8YWhg=; b=aVY3w+6id4pEy5Qd2XMo/RN6L9MF2UHNp6B5h8GD2t5XD1+Cvd57VWzRctBYDPKjGApmS+ 4e/6oQ1+rDDTSTHwVX+zoK38v184cAfT/RJHXpG3LogPQA4afOk0oNIeIpW1K5kIqq4oRb /N+Pa3p/12/wtWZxMWqmC7ltXWbXg5hJ2lygOc00RzNBg2xo81jhaY5X7LrYTVFNc1jn7k 3qKHKXBCz04zXi+vOaQ8q7kUH16MgAwDlK1GdMn9U+a/5FcSbPaFXv944icpAYVJSqv+Vj laSRmeFz9hvJU4zPOV6jmJIDqeOwj8NropnUk9xjcRnwK82kxkIKFQRDVtofng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691263021; a=rsa-sha256; cv=none; b=kojBN3r6Kz4Zvdj+4gBeNpIVCTEKoxg12+o64w6Hv+1wjlgXoU+cUMh6pVsSD2C0SIwHcW mdP/WkEAUtVa9C0vtjxeFZoPDBtNq8qPnNGjgcfz3Uu7mR0bQnjDUk9dPH1VuH+0Fu+bj0 9Q6vn2JB8YkKp1pS8gD2yCzUhPAramh7QnkmCNDj6e9dsGs8A6N36vN3wIjG/YhBWrU3d3 GyRWUrIJOcUX6UjfQPhEmZpzxi70gEEVV/dHbycCsYXVWh0CWo0JQFW+Su3NMQ6iBZRKWy RtPXXyOEWzI0b9Bjl+2s4+2+R2t2KQGoV3zIFQRGqKECdlVER/d579CKg8pEMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RJC4s3Pn1zgq1; Sat, 5 Aug 2023 19:17:01 +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 375JH1EX010584; Sat, 5 Aug 2023 19:17:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 375JH1gV010583; Sat, 5 Aug 2023 19:17:01 GMT (envelope-from git) Date: Sat, 5 Aug 2023 19:17:01 GMT Message-Id: <202308051917.375JH1gV010583@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: e7c7730f1fca - main - multimedia/vapoursynth-l-smash-works: Switch to active fork and update to 20230716 release 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: e7c7730f1fca7a3a5654bb09eb3391989631f978 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e7c7730f1fca7a3a5654bb09eb3391989631f978 commit e7c7730f1fca7a3a5654bb09eb3391989631f978 Author: Daniel Engberg AuthorDate: 2023-08-05 19:07:43 +0000 Commit: Daniel Engberg CommitDate: 2023-08-05 19:15:50 +0000 multimedia/vapoursynth-l-smash-works: Switch to active fork and update to 20230716 release This fork also supports FFmpeg 6.0 so switch to that while at it Changelog: https://github.com/HomeOfAviSynthPlusEvolution/L-SMASH-Works/releases/tag/20230716 PR: 270303 --- multimedia/vapoursynth-l-smash-works/Makefile | 49 ++++++---------------- multimedia/vapoursynth-l-smash-works/distinfo | 6 +-- .../files/patch-meson.build | 23 ++++++++++ 3 files changed, 38 insertions(+), 40 deletions(-) diff --git a/multimedia/vapoursynth-l-smash-works/Makefile b/multimedia/vapoursynth-l-smash-works/Makefile index b946d8a1dd9e..d7a92882baf2 100644 --- a/multimedia/vapoursynth-l-smash-works/Makefile +++ b/multimedia/vapoursynth-l-smash-works/Makefile @@ -1,64 +1,39 @@ PORTNAME= l-smash-works -DISTVERSION= 0.0-940 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -g198cc78 -PORTREVISION= 2 +DISTVERSION= 20230716 CATEGORIES= multimedia PKGNAMEPREFIX= vapoursynth- MAINTAINER= ports@FreeBSD.org COMMENT= L-SMASH source plugin for VapourSynth -WWW= https://github.com/VFR-maniac/L-SMASH-Works/tree/master/VapourSynth +WWW= https://github.com/HomeOfAviSynthPlusEvolution/L-SMASH-Works LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= fails to build with FFmpeg 6 (PR 270303) - BUILD_DEPENDS= ${LOCALBASE}/include/vapoursynth/VSHelper.h:multimedia/vapoursynth -BUILD_DEPENDS+= ffmpeg>=3.2,1:multimedia/ffmpeg LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ liblsmash.so:multimedia/l-smash +USES= meson pkgconfig USE_GITHUB= yes -GH_ACCOUNT= VFR-maniac +GH_ACCOUNT= HomeOfAviSynthPlusEvolution GH_PROJECT= L-SMASH-Works +USE_LDFLAGS= yes -USES= gmake pkgconfig shebangfix EXCLUDE= VSHelper.h VSScript.h VapourSynth.h EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} + WRKSRC_SUBDIR= VapourSynth -SHEBANG_FILES= configure -bash_CMD= ${SH} -HAS_CONFIGURE= yes -CONFIGURE_ENV= LD="${CC}" REV="${PORTVERSION:E}" \ - HASH="${DISTVERSIONSUFFIX:S/^-g//}" -CONFIGURE_ARGS= --prefix="${PREFIX}" \ - --extra-cflags="${CPPFLAGS} ${CFLAGS}" \ - --extra-ldflags="${LDFLAGS}" \ - --extra-libs="${LIBS}" -MAKEFILE= GNUmakefile -MAKE_ARGS= STRIP="${STRIP_CMD}" -CPPFLAGS+= `pkg-config vapoursynth --cflags` -USE_LDCONFIG= yes -DATADIR= ${PREFIX}/lib/vapoursynth -DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} -PLIST_FILES= lib/libvslsmashsource.so.${PORTVERSION:E} -PORTDATA= libvslsmashsource.so -PORTDOCS= README -OPTIONS_DEFINE= DOCS +PLIST_FILES= lib/vapoursynth/libvslsmashsource.so post-patch: - @${REINPLACE_CMD} -Ee '/CROSS/!s/^(CC|LD|REV|HASH)=.*/: $${&}/' \ - -e 's/pushd/cd/; s/popd/cd -/' \ - -e 's/-Os //; /=.*-fexcess-precision/d' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} 's/ -msse2 -g0//' ${WRKSRC}/${MAKEFILE} + @${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \ + ${PATCH_WRKSRC}/meson.build + @${REINPLACE_CMD} -e 's|LSMASHSource.dll|libvslsmashsource.so|g' \ + ${PATCH_WRKSRC}/README post-install: - ${RLN} ${STAGEDIR}${PREFIX}/lib/libvslsmashsource.so.${PORTVERSION:E} \ - ${STAGEDIR}${DATADIR}/libvslsmashsource.so - (cd ${WRKSRC} && ${COPYTREE_SHARE} \ - "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) + ${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include diff --git a/multimedia/vapoursynth-l-smash-works/distinfo b/multimedia/vapoursynth-l-smash-works/distinfo index be6c05922789..46a53e3a14eb 100644 --- a/multimedia/vapoursynth-l-smash-works/distinfo +++ b/multimedia/vapoursynth-l-smash-works/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1568560420 -SHA256 (VFR-maniac-L-SMASH-Works-0.0-940-g198cc78_GH0.tar.gz) = 81b64ace0f04822668a9294c1bdfb9dfb60cc649d57bb4031d16a9a85bf3a532 -SIZE (VFR-maniac-L-SMASH-Works-0.0-940-g198cc78_GH0.tar.gz) = 226709 +TIMESTAMP = 1690746766 +SHA256 (HomeOfAviSynthPlusEvolution-L-SMASH-Works-20230716_GH0.tar.gz) = 24cb8648afbe11926a7f95a947e33fe8f8ee17e6ec5f2dd12ec461d0942cc9db +SIZE (HomeOfAviSynthPlusEvolution-L-SMASH-Works-20230716_GH0.tar.gz) = 317505 diff --git a/multimedia/vapoursynth-l-smash-works/files/patch-meson.build b/multimedia/vapoursynth-l-smash-works/files/patch-meson.build new file mode 100644 index 000000000000..44976ad332d4 --- /dev/null +++ b/multimedia/vapoursynth-l-smash-works/files/patch-meson.build @@ -0,0 +1,23 @@ +--- meson.build.orig 2023-07-15 13:34:47 UTC ++++ meson.build +@@ -5,7 +5,8 @@ project('L-SMASH-Works', 'c', + + version_h = declare_dependency( + sources: vcs_tag( +- command: ['git', 'describe', '--tags', '--long'], ++ command: ['false'], ++ fallback: '%%DISTVERSION%%', + input: 'version.h.in', + output: 'version.h' + ) +@@ -55,10 +56,6 @@ deps = [ + dependency('libswscale', version: '>=5.7.0'), + version_h + ] +- +-if host_machine.cpu_family().startswith('x86') +- add_project_arguments('-mfpmath=sse', '-msse2', language: 'c') +-endif + + if host_machine.system() == 'windows' + add_project_arguments('-D__USE_MINGW_ANSI_STDIO', language: 'c')