svn commit: r524171 - in head/multimedia: ffms2 vapoursynth vapoursynth-l-smash-works

[Jan Beich]

Author: jbeich
Date: Sun Jan 26 11:41:54 2020
New Revision: 524171
URL: https://svnweb.freebsd.org/changeset/ports/524171

Log:
  multimedia/vapoursynth: unbreak on non-x86

Modified:
  head/multimedia/ffms2/Makefile   (contents, props changed)
  head/multimedia/vapoursynth-l-smash-works/Makefile   (contents, props changed)
  head/multimedia/vapoursynth/Makefile   (contents, props changed)
  head/multimedia/vapoursynth/distinfo   (contents, props changed)

Modified: head/multimedia/ffms2/Makefile
==============================================================================
--- head/multimedia/ffms2/Makefile	Sun Jan 26 11:30:18 2020	(r524170)
+++ head/multimedia/ffms2/Makefile	Sun Jan 26 11:41:54 2020	(r524171)
@@ -11,24 +11,18 @@ COMMENT=	FFmpeg-based source library and VapourSynth p
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-.if ${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == i386
 BUILD_DEPENDS=	${LOCALBASE}/include/vapoursynth/VSHelper.h:multimedia/vapoursynth
-.endif
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FFMS
 
 USES=		compiler:c++11-lib gmake libtool pathfix pkgconfig
-.if ${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == i386
 EXCLUDE=	VSHelper.h VSScript.h VapourSynth.h
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
-.endif
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
-.if ${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == i386
 CPPFLAGS+=	`pkg-config vapoursynth --cflags`
-.endif
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 DATADIR=	${PREFIX}/lib/vapoursynth

Modified: head/multimedia/vapoursynth-l-smash-works/Makefile
==============================================================================
--- head/multimedia/vapoursynth-l-smash-works/Makefile	Sun Jan 26 11:30:18 2020	(r524170)
+++ head/multimedia/vapoursynth-l-smash-works/Makefile	Sun Jan 26 11:41:54 2020	(r524171)
@@ -12,9 +12,7 @@ COMMENT=	L-SMASH source plugin for VapourSynth
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-.if ${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == i386
 BUILD_DEPENDS=	${LOCALBASE}/include/vapoursynth/VSHelper.h:multimedia/vapoursynth
-.endif
 BUILD_DEPENDS+=	ffmpeg>=3.2,1:multimedia/ffmpeg
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		liblsmash.so:multimedia/l-smash
@@ -24,10 +22,8 @@ GH_ACCOUNT=	VFR-maniac
 GH_PROJECT=	L-SMASH-Works
 
 USES=		gmake pkgconfig shebangfix
-.if ${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == i386
 EXCLUDE=	VSHelper.h VSScript.h VapourSynth.h
 EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,}
-.endif
 WRKSRC_SUBDIR=	VapourSynth
 SHEBANG_FILES=	configure
 bash_CMD=	${SH}
@@ -40,9 +36,7 @@ CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--extra-libs="${LIBS}"
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	STRIP="${STRIP_CMD}"
-.if ${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == i386
 CPPFLAGS+=	`pkg-config vapoursynth --cflags`
-.endif
 USE_LDCONFIG=	yes
 DATADIR=	${PREFIX}/lib/vapoursynth
 DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}

Modified: head/multimedia/vapoursynth/Makefile
==============================================================================
--- head/multimedia/vapoursynth/Makefile	Sun Jan 26 11:30:18 2020	(r524170)
+++ head/multimedia/vapoursynth/Makefile	Sun Jan 26 11:41:54 2020	(r524171)
@@ -4,13 +4,13 @@ PORTNAME=	vapoursynth
 DISTVERSION=	R48
 CATEGORIES=	multimedia
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	a9b657d8b014.patch:-p1 4d4f8cbf272c.patch:-p1
+
 MAINTAINER=	jbeich at FreeBSD.org
 COMMENT=	Video processing framework with simplicity in mind
 
 LICENSE=	LGPL21+
-
-ONLY_FOR_ARCHS=	amd64 i386
-ONLY_FOR_ARCHS_REASON=	https://github.com/vapoursynth/vapoursynth/issues/509
 
 USE_GITHUB=	yes
 

Modified: head/multimedia/vapoursynth/distinfo
==============================================================================
--- head/multimedia/vapoursynth/distinfo	Sun Jan 26 11:30:18 2020	(r524170)
+++ head/multimedia/vapoursynth/distinfo	Sun Jan 26 11:41:54 2020	(r524171)
@@ -1,3 +1,7 @@
 TIMESTAMP = 1571984167
 SHA256 (vapoursynth-vapoursynth-R48_GH0.tar.gz) = 3e98d134e16af894cf7040e4383e4ef753cafede34d5d77c42a2bb89790c50a8
 SIZE (vapoursynth-vapoursynth-R48_GH0.tar.gz) = 611523
+SHA256 (a9b657d8b014.patch) = 95e5f2ec7b3c2d4c252721ee986f4c91fe7ab12a35c3de6ce13dede6543cb9c1
+SIZE (a9b657d8b014.patch) = 2712
+SHA256 (4d4f8cbf272c.patch) = b217e1d5d0278b65a1169d386a34d7882db05652585723194496de081281381e
+SIZE (4d4f8cbf272c.patch) = 654