Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Feb 2019 00:58:01 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r494114 - in head/multimedia: svt-av1 svt-hevc svt-vp9
Message-ID:  <201902280058.x1S0w1oe052546@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Feb 28 00:58:00 2019
New Revision: 494114
URL: https://svnweb.freebsd.org/changeset/ports/494114

Log:
  multimedia/svt-*: ignore __linux__ for third_party libs
  
  Unlike SVT-* encoders GoogleTest properly supports FreeBSD and in fact
  won't build if using Linux conditionals.

Modified:
  head/multimedia/svt-av1/Makefile   (contents, props changed)
  head/multimedia/svt-hevc/Makefile   (contents, props changed)
  head/multimedia/svt-vp9/Makefile   (contents, props changed)

Modified: head/multimedia/svt-av1/Makefile
==============================================================================
--- head/multimedia/svt-av1/Makefile	Thu Feb 28 00:57:53 2019	(r494113)
+++ head/multimedia/svt-av1/Makefile	Thu Feb 28 00:58:00 2019	(r494114)
@@ -43,7 +43,7 @@ post-patch:
 	@${REINPLACE_CMD} -i .opsys 's/Linux/${OPSYS}/' \
 		${WRKSRC}/CMakeLists.txt \
 		${WRKSRC}/Source/Lib/*/CMakeLists.txt
-	@${GREP} -Flr '__linux' ${WRKSRC} | ${XARGS} \
+	@${GREP} --exclude='*/third_party/*' -Flr '__linux' ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__${OPSYS}__/'
 # Avoid -msse4.1 for (unused) function not under Source/Lib/ASM_SSE4_1/
 	@${REINPLACE_CMD} -e '/_sse4_1/,/}/d; /smmintrin\.h/d' \

Modified: head/multimedia/svt-hevc/Makefile
==============================================================================
--- head/multimedia/svt-hevc/Makefile	Thu Feb 28 00:57:53 2019	(r494113)
+++ head/multimedia/svt-hevc/Makefile	Thu Feb 28 00:58:00 2019	(r494114)
@@ -52,7 +52,7 @@ post-patch:
 	@${REINPLACE_CMD} -i .opsys 's/Linux/${OPSYS}/' \
 		${WRKSRC}/CMakeLists.txt \
 		${WRKSRC}/Source/Lib/*/CMakeLists.txt
-	@${GREP} -Flr '__linux' ${WRKSRC} | ${XARGS} \
+	@${GREP} --exclude='*/third_party/*' -Flr '__linux' ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__${OPSYS}__/'
 
 .include <bsd.port.mk>

Modified: head/multimedia/svt-vp9/Makefile
==============================================================================
--- head/multimedia/svt-vp9/Makefile	Thu Feb 28 00:57:53 2019	(r494113)
+++ head/multimedia/svt-vp9/Makefile	Thu Feb 28 00:58:00 2019	(r494114)
@@ -47,7 +47,7 @@ post-patch:
 	@${REINPLACE_CMD} -i .opsys 's/Linux/${OPSYS}/' \
 		${WRKSRC}/CMakeLists.txt \
 		${WRKSRC}/Source/Lib/*/CMakeLists.txt
-	@${GREP} -Flr '__linux' ${WRKSRC} | ${XARGS} \
+	@${GREP} --exclude='*/third_party/*' -Flr '__linux' ${WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__${OPSYS}__/'
 
 .include <bsd.port.mk>



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