Attachment 159807 Details for Bug 202270 – v0

[patch] v0

libvpx_1.4.0.488.diff (text/plain), 11.91 KB, created by Jan Beich on 2015-08-12 17:42:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-08-12 17:42:29 UTC

Size: 11.91 KB

patch

obsolete

>Index: multimedia/libvpx/Makefile
>===================================================================
>--- multimedia/libvpx/Makefile	(revision 393968)
>+++ multimedia/libvpx/Makefile	(working copy)
>@@ -2,10 +2,10 @@
> # $FreeBSD$
> 
> PORTNAME=	libvpx
>-PORTVERSION=	1.4.0
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	1.4.0-488 # tracking www/firefox
>+DISTVERSIONSUFFIX=	-ge67d45d
> CATEGORIES=	multimedia
>-MASTER_SITES=	DEBIAN
>-DISTNAME=	${PORTNAME}_${DISTVERSION}.orig
> 
> MAINTAINER=	ashish@FreeBSD.org
> COMMENT=	VP8/VP9 Codec SDK
>@@ -15,7 +15,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm
> 
>-USES=		cpe gmake perl5 shebangfix tar:bzip2
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	webmproject
>+
>+USES=		compiler cpe gmake perl5 shebangfix tar:bzip2
> CPE_VENDOR=	john_koleszar
> HAS_CONFIGURE=	yes
> USE_PERL5=	build
>@@ -28,7 +31,6 @@ POSTPROC_DESC=	Enable postprocessing
> RUNTIME_DESC=	Enable runtime CPU detection
> SHARED_DESC=	Enable shared-library support
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
> ALL_TARGET=
> CONFIGURE_ARGS+=--prefix=${PREFIX} \
> 		--disable-install-docs \
>@@ -51,18 +53,6 @@ SHEBANG_FILES=	build/make/ads2gas.pl
> 
> .include <bsd.port.options.mk>
> 
>-.if ${OSVERSION}  < 900000
>-.if ${ARCH} == "amd64"
>-USE_GCC=	yes
>-.endif
>-.endif
>-
>-# Workaround for GCC in 9.x post r260075
>-# OSVERSION taken from r260135, the closest OSVERSION
>-.if ${OSVERSION} >  902505 && ${OSVERSION} < 1000000
>-CFLAGS+=	-flax-vector-conversions
>-.endif
>-
> .if ${OSVERSION} >= 1000000
> CONFIGURE_ARGS+=	--disable-unit-tests
> .endif
>@@ -77,6 +67,9 @@ CONFIGURE_ARGS+=	--target=ia64-linux-gcc
> CONFIGURE_ARGS+=	--target=ppc32-linux-gcc
> .elif ${ARCH} == "powerpc64"
> CONFIGURE_ARGS+=	--target=ppc64-linux-gcc
>+.elif ${ARCH} == "sparc64"
>+CONFIGURE_ARGS+=	--target=sparc64-linux-gcc
>+USES:=			${USES:Ncompiler*} compiler:c++11-lib
> .elif ${ARCH} == "armv6"
> CONFIGURE_ARGS+=	--target=armv6-linux-gcc --cpu=armv6
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-build_make_Makefile
>@@ -84,8 +77,22 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-build_make
> IGNORE=	no support for ${ARCH} the moment. testing/patches are welcome
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
>+# Workaround for GCC in 9.x post r260075
>+# OSVERSION taken from r260135, the closest OSVERSION
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} > 902505
>+. if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} == 42
>+CFLAGS+=	-flax-vector-conversions
>+. endif
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} 's|$link_with_cc$=gcc|\1=$${CC}|' \
> 		${WRKSRC}/build/make/configure.sh
> 
>-.include <bsd.port.mk>
>+post-install:
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vpx*
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libvpx.so.*.*.*
>+
>+.include <bsd.port.post.mk>
>Index: multimedia/libvpx/distinfo
>===================================================================
>--- multimedia/libvpx/distinfo	(revision 393968)
>+++ multimedia/libvpx/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (libvpx_1.4.0.orig.tar.bz2) = f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4
>-SIZE (libvpx_1.4.0.orig.tar.bz2) = 1807989
>+SHA256 (webmproject-libvpx-v1.4.0-488-ge67d45d_GH0.tar.bz2) = 9ee182a81d866d92021e4cb11bc81cf0bee96d5bb53c2122eb4d3cc6b86b712b
>+SIZE (webmproject-libvpx-v1.4.0-488-ge67d45d_GH0.tar.bz2) = 2324228
>Index: multimedia/libvpx/files/patch-configure
>===================================================================
>--- multimedia/libvpx/files/patch-configure	(revision 393968)
>+++ multimedia/libvpx/files/patch-configure	(working copy)
>@@ -1,10 +1,13 @@
> --- configure.orig
> +++ configure
>-@@ -164,6 +164,7 @@ all_platforms="${all_platforms} universa
>- all_platforms="${all_platforms} universal-darwin12-gcc"
>- all_platforms="${all_platforms} universal-darwin13-gcc"
>- all_platforms="${all_platforms} universal-darwin14-gcc"
>+@@ -148,6 +148,10 @@ all_platforms="${all_platforms} x86_64-w
>+ all_platforms="${all_platforms} x86_64-win64-vs10"
>+ all_platforms="${all_platforms} x86_64-win64-vs11"
>+ all_platforms="${all_platforms} x86_64-win64-vs12"
> +all_platforms="${all_platforms} ia64-linux-gcc"
>++all_platforms="${all_platforms} ppc32-linux-gcc"
>++all_platforms="${all_platforms} ppc64-linux-gcc"
>++all_platforms="${all_platforms} sparc64-linux-gcc"
>  all_platforms="${all_platforms} generic-gnu"
>  
>  # all_targets is a list of all targets that can be configured
>Index: security/vuxml/vuln.xml
>===================================================================
>--- security/vuxml/vuln.xml	(revision 394023)
>+++ security/vuxml/vuln.xml	(working copy)
>@@ -219,7 +219,7 @@ Notes:
>     <affects>
>       <package>
> 	<name>libvpx</name>
>-	<range><lt>1.5.0</lt></range>
>+	<range><lt>1.4.0.488</lt></range>
>       </package>
>       <package>
> 	<name>firefox</name>
>@@ -251,7 +251,7 @@ Notes:
>     <dates>
>       <discovery>2015-08-11</discovery>
>       <entry>2015-08-11</entry>
>-      <modified>2015-08-11</modified>
>+      <modified>2015-08-13</modified>
>     </dates>
>   </vuln>
> 
>Index: mail/thunderbird/Makefile
>===================================================================
>--- mail/thunderbird/Makefile	(revision 394023)
>+++ mail/thunderbird/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	thunderbird
> DISTVERSION=	38.1.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	mail news net-im ipv6
> MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
> 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
>@@ -21,6 +21,7 @@ BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr
> 		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
> 		libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \
> 		opus>=1.1:${PORTSDIR}/audio/opus \
>+		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
> 		sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
> 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
>@@ -27,7 +28,6 @@ BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr
> 		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
> 		zip:${PORTSDIR}/archivers/zip \
> 		unzip:${PORTSDIR}/archivers/unzip
>-#		libvpx>=1.5.0:${PORTSDIR}/multimedia/libvpx \
> #		opus>=1.1:${PORTSDIR}/audio/opus \
> 
> LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
>@@ -37,7 +37,7 @@ L_VERSION=	4.0.1
> 
> SSP_UNSAFE=	yes
> USE_GECKO=	gecko
>-USE_MOZILLA=	-opus -vpx
>+USE_MOZILLA=	-opus
> 
> USE_QT5=	# empty
> QT_NONSTANDARD=	yes
>Index: www/firefox/Makefile
>===================================================================
>--- www/firefox/Makefile	(revision 394023)
>+++ www/firefox/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	firefox
> DISTVERSION=	40.0
> DISTVERSIONSUFFIX=.source
>-PORTREVISION=	4
>+PORTREVISION=	5
> PORTEPOCH=	1
> CATEGORIES=	www ipv6
> MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
>@@ -20,6 +20,7 @@ BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr
> 		harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
> 		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
> 		libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \
>+		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
> 		sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
> 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
>@@ -26,7 +27,6 @@ BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr
> 		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
> 		zip:${PORTSDIR}/archivers/zip \
> 		unzip:${PORTSDIR}/archivers/unzip
>-#		libvpx>=1.5.0:${PORTSDIR}/multimedia/libvpx \
> #		opus>=1.1:${PORTSDIR}/audio/opus \
> 
> LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
>@@ -34,7 +34,7 @@ LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/lib
> USE_GECKO=	gecko
> CONFLICTS_INSTALL=	firefox-esr-31.* firefox-esr-24.* firefox-esr-17.*
> MOZ_PKGCONFIG_FILES=	# empty
>-USE_MOZILLA=	-opus -vpx
>+USE_MOZILLA=	-opus
> MOZILLA_NAME=	Firefox
> 
> USE_QT5=	# empty
>Index: www/firefox-esr/Makefile
>===================================================================
>--- www/firefox-esr/Makefile	(revision 394023)
>+++ www/firefox-esr/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	firefox
> DISTVERSION=	38.2.0
> DISTVERSIONSUFFIX=esr.source
>-PORTREVISION=	3
>+PORTREVISION=	4
> PORTEPOCH=	1
> CATEGORIES=	www ipv6
> MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
>@@ -21,6 +21,7 @@ BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr
> 		harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
> 		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
> 		libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \
>+		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
> 		sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
> 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
>@@ -27,7 +28,6 @@ BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr
> 		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
> 		zip:${PORTSDIR}/archivers/zip \
> 		unzip:${PORTSDIR}/archivers/unzip
>-#		libvpx>=1.5.0:${PORTSDIR}/multimedia/libvpx \
> #		opus>=1.1:${PORTSDIR}/audio/opus \
> 
> LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
>@@ -36,7 +36,7 @@ USE_GECKO=	gecko
> CPE_PRODUCT=	${PORTNAME}_esr
> CONFLICTS_INSTALL=	firefox-4[0-4].* firefox-3[02-9].* firefox-2[0-35-9].*
> MOZ_PKGCONFIG_FILES=	# empty
>-USE_MOZILLA=	-opus -vpx
>+USE_MOZILLA=	-opus
> MOZILLA_NAME=	Firefox
> 
> USE_QT5=	# empty
>Index: www/libxul/Makefile
>===================================================================
>--- www/libxul/Makefile	(revision 394023)
>+++ www/libxul/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libxul
> DISTVERSION=	38.2.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES?=	www devel
> MASTER_SITES=	MOZILLA/firefox/releases/${DISTVERSION}esr/source \
> 		MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build2/source
>@@ -19,6 +19,7 @@ BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr
> 		harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \
> 		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
> 		libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \
>+		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
> 		sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
> 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
>@@ -25,7 +26,6 @@ BUILD_DEPENDS=	nspr>=4.10.8:${PORTSDIR}/devel/nspr
> 		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
> 		zip:${PORTSDIR}/archivers/zip \
> 		unzip:${PORTSDIR}/archivers/unzip
>-#		libvpx>=1.5.0:${PORTSDIR}/multimedia/libvpx \
> #		opus>=1.1:${PORTSDIR}/audio/opus \
> 
> LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
>@@ -46,7 +46,7 @@ MOZ_OPTIONS?=	--enable-application=xulrunner
> USE_GECKO=	gecko
> CPE_PRODUCT=	firefox_esr
> MOZILLA_EXEC_NAME=xulrunner
>-USE_MOZILLA=	-opus -vpx
>+USE_MOZILLA=	-opus
> MOZILLA_PLIST_DIRS=	bin include lib share/idl libdata
> MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-js \
> 			mozilla-plugin
>Index: www/seamonkey/Makefile
>===================================================================
>--- www/seamonkey/Makefile	(revision 394023)
>+++ www/seamonkey/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	seamonkey
> DISTVERSION=	2.33.1
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES?=	www mail news editors irc ipv6
> MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
> 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
>@@ -21,6 +21,7 @@ BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/devel/nspr
> 		graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \
> 		libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \
> 		opus>=1.1:${PORTSDIR}/audio/opus \
>+		libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \
> 		sqlite3>=3.8.7.4:${PORTSDIR}/databases/sqlite3 \
> 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
> 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
>@@ -27,7 +28,6 @@ BUILD_DEPENDS=	nspr>=4.10.6:${PORTSDIR}/devel/nspr
> 		autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
> 		zip:${PORTSDIR}/archivers/zip \
> 		unzip:${PORTSDIR}/archivers/unzip
>-#		libvpx>=1.5.0:${PORTSDIR}/multimedia/libvpx \
> 
> LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
> 
>@@ -47,7 +47,7 @@ MOZ_EXTENSIONS=	default
> MOZ_OPTIONS+=	--program-transform-name='s/seamonkey/${MOZILLA}/' \
> 		--enable-application=suite
> 
>-USE_MOZILLA=	-vpx
>+USE_MOZILLA=	# empty
> MOZ_PKGCONFIG_FILES=
> 
> NOT_FOR_ARCHS=	ia64

Actions: View | Diff

Attachments on bug 202270: 159807 | 159808 | 159809 | 159810 | 159811 | 159812 | 159813 | 159814 | 159815 | 159828 | 159830