commit: 02d8f71a2f26460153fee8f3450c1eeae6409015
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 07:54:15 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 07:56:54 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d8f71a
media-libs/x264: Bump to latest snapshot.
Also fix cflags patch, bug #562876.
Package-Manager: portage-2.2.23
media-libs/x264/Manifest | 1 +
.../x264/files/x264-0.0.20151011-cflags.patch | 51 ++++++++++++++++++++++
.../{x264-9999.ebuild => x264-0.0.20151011.ebuild} | 2 +-
media-libs/x264/x264-9999.ebuild | 2 +-
4 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 203faf6..c8c49eb 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,2 +1,3 @@
DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256
b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512
42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629
WHIRLPOOL
b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
DIST x264-snapshot-20150820-2245.tar.bz2 718209 SHA256
0ea86849d1a9b0a5b88fe6e0281359d7f5675c68fb83f6397b3e02896ccd77e3 SHA512
6b85f96f7cc85e1e938dad06c01b777aaf866796fb1763a02b4b7fa9c44f70bf15fc1bef123f7b24bb2c58b23f7276d4eb2b8f99b2e4fef3c716ed7f66d66e44
WHIRLPOOL
daf5a63dbe2cb77a496a3eec1b1687ef6c4a008328064c46bd0e90139d328a6ff4e7dbd17b8dad57c357717c0b665293c86883213b483e85d25a06ec93c81024
+DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256
80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512
a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3
WHIRLPOOL
520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
diff --git a/media-libs/x264/files/x264-0.0.20151011-cflags.patch
b/media-libs/x264/files/x264-0.0.20151011-cflags.patch
new file mode 100644
index 0000000..851e3f0
--- /dev/null
+++ b/media-libs/x264/files/x264-0.0.20151011-cflags.patch
@@ -0,0 +1,51 @@
+Index: x264-snapshot-20151011-2245/configure
+===================================================================
+--- x264-snapshot-20151011-2245.orig/configure
++++ x264-snapshot-20151011-2245/configure
+@@ -672,11 +672,6 @@ case $host_cpu in
+ if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
+ CFLAGS="$CFLAGS -march=i686"
+ fi
+- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
+- CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
+- fi
+- CFLAGS="-m32 $CFLAGS"
+- LDFLAGS="-m32 $LDFLAGS"
+ fi
+ if [ "$SYS" = MACOSX ]; then
+ ASFLAGS="$ASFLAGS -f macho32 -DPREFIX"
+@@ -695,13 +690,8 @@ case $host_cpu in
+ AS_EXT=".asm"
+ ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
+ stack_alignment=16
+- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64
$LDFLAGS"
+ if [ "$SYS" = MACOSX ]; then
+ ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX"
+- if cc_check '' "-arch x86_64"; then
+- CFLAGS="$CFLAGS -arch x86_64"
+- LDFLAGS="$LDFLAGS -arch x86_64"
+- fi
+ elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
+ ASFLAGS="$ASFLAGS -f win64"
+ # only the GNU toolchain is inconsistent in prefixing function
names with _
+@@ -1148,20 +1138,10 @@ if [ "$pic" = "yes" ] ; then
+ [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
+ fi
+
+-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
+- CFLAGS="$CFLAGS -fomit-frame-pointer"
+-fi
+-
+ if [ "$strip" = "yes" ]; then
+ LDFLAGS="$LDFLAGS -s"
+ fi
+
+-if [ "$debug" = "yes" ]; then
+- CFLAGS="-O1 -g $CFLAGS"
+-else
+- CFLAGS="-O3 -ffast-math $CFLAGS"
+-fi
+-
+ if cc_check '' -fno-tree-vectorize ; then
+ CFLAGS="$CFLAGS -fno-tree-vectorize"
+ fi
diff --git a/media-libs/x264/x264-9999.ebuild
b/media-libs/x264/x264-0.0.20151011.ebuild
similarity index 97%
copy from media-libs/x264/x264-9999.ebuild
copy to media-libs/x264/x264-0.0.20151011.ebuild
index 4dc5041..f097db6 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-0.0.20151011.ebuild
@@ -38,7 +38,7 @@ DOCS="AUTHORS doc/*.txt"
src_prepare() {
# Initial support for x32 ABI, bug #420241
# Avoid messing too much with CFLAGS.
- epatch "${FILESDIR}"/x264-cflags.patch
+ epatch "${FILESDIR}"/x264-0.0.20151011-cflags.patch
}
multilib_src_configure() {
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 4dc5041..f097db6 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -38,7 +38,7 @@ DOCS="AUTHORS doc/*.txt"
src_prepare() {
# Initial support for x32 ABI, bug #420241
# Avoid messing too much with CFLAGS.
- epatch "${FILESDIR}"/x264-cflags.patch
+ epatch "${FILESDIR}"/x264-0.0.20151011-cflags.patch
}
multilib_src_configure() {
