Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Aug 2023 19:17:01 GMT
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e7c7730f1fca - main - multimedia/vapoursynth-l-smash-works: Switch to active fork and update to 20230716 release
Message-ID:  <202308051917.375JH1gV010583@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy:

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

commit e7c7730f1fca7a3a5654bb09eb3391989631f978
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-08-05 19:07:43 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
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 <bsd.port.mk>
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')



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308051917.375JH1gV010583>