diff options
Diffstat (limited to 'media-libs/libvpx/files')
5 files changed, 0 insertions, 218 deletions
diff --git a/media-libs/libvpx/files/libvpx-1.1.0-arm.patch b/media-libs/libvpx/files/libvpx-1.1.0-arm.patch deleted file mode 100644 index 698e65a2dba5..000000000000 --- a/media-libs/libvpx/files/libvpx-1.1.0-arm.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2b59e14a0023be9d084349d58ee156a49cc674bb Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@chromium.org> -Date: Wed, 15 Aug 2012 11:55:31 -0400 -Subject: [PATCH] Parse out arm isa targets from dumpmachine - -The current parsing logic of the dumpmachine tuple lacks any arm -cases which means tgt_isa never gets set, so for all arm targets, -we get detected as generic-gnu. Add some basic arm checks here -so the automatic detection logic works. - -Change-Id: Ie5e98142876025c6708604236bc519c0bdb09319 ---- - build/make/configure.sh | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/build/make/configure.sh b/build/make/configure.sh -index 26eb864..eeb959a 100755 ---- a/build/make/configure.sh -+++ b/build/make/configure.sh -@@ -593,6 +593,15 @@ process_common_toolchain() { - - # detect tgt_isa - case "$gcctarget" in -+ armv6*) -+ tgt_isa=armv6 -+ ;; -+ armv7*) -+ tgt_isa=armv7 -+ ;; -+ armv5te*) -+ tgt_isa=armv5te -+ ;; - *x86_64*|*amd64*) - tgt_isa=x86_64 - ;; --- -1.7.9.7 - diff --git a/media-libs/libvpx/files/libvpx-1.1.0-chost.patch b/media-libs/libvpx/files/libvpx-1.1.0-chost.patch deleted file mode 100644 index eb6b286cd66b..000000000000 --- a/media-libs/libvpx/files/libvpx-1.1.0-chost.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 871bd23e4c41bb0fb94b72832b270766de540dea -Author: Alexis Ballier <alexis.ballier@gmail.com> -Date: Sat May 12 15:45:13 2012 -0400 - - Allow target autodetection to work when cross-compiling. - - Allow CHOST to override the gcc -dumpmachine output. This allows to - use the target autodetection code when cross compiling by setting the - CHOST variable. - - On Gentoo, we would like to support easy cross-compilation, and for - libvpx this would basically mean copying the code in - build/make/configure.sh to setup the right --target option. It seems a - lot easier to let it guess by itself. - - Another option I considered was using CROSS-gcc instead but this would - not work for our multilib setups: They use gcc -m32 to build 32bits - binaries and gcc -m32 -dumpmachine will output the 64bits version, - which would then make libvpx wrongly believe it is building for a - 64bits architecture. - - Change-Id: I05a19be402228f749e23be7473ca53ae74fd2186 - -diff --git a/build/make/configure.sh b/build/make/configure.sh -index 3c772e5..3118c0a 100755 ---- a/build/make/configure.sh -+++ b/build/make/configure.sh -@@ -549,7 +549,7 @@ setup_gnu_toolchain() { - - process_common_toolchain() { - if [ -z "$toolchain" ]; then -- gcctarget="$(gcc -dumpmachine 2> /dev/null)" -+ gcctarget="${CHOST:-$(gcc -dumpmachine 2> /dev/null)}" - - # detect tgt_isa - case "$gcctarget" in diff --git a/media-libs/libvpx/files/libvpx-1.1.0-generic-gnu-shared.patch b/media-libs/libvpx/files/libvpx-1.1.0-generic-gnu-shared.patch deleted file mode 100644 index 84d536f5054c..000000000000 --- a/media-libs/libvpx/files/libvpx-1.1.0-generic-gnu-shared.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b4ab43f12cc44a24e8161eb2d0857b78c756b18c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@chromium.org> -Date: Tue, 14 Aug 2012 14:24:28 -0400 -Subject: [PATCH] do not error out on generic-gnu + --enable-shared - -If you build with --enabled-shared on a Linux arch not explicitly -listed, the configure script will abort because it didn't detect -"linux" in the fallback generic-gnu tuple. - -Since this is the fallback tuple and people are passing ---enable-shared, assume the user knows what they're in for. - -Change-Id: Ia35b657e7247c8855e3a94fca424c9884d4241e3 ---- - configure | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 2e19e5b..dde215f 100755 ---- a/configure -+++ b/configure -@@ -454,7 +454,13 @@ process_detect() { - # Can only build shared libs on a subset of platforms. Doing this check - # here rather than at option parse time because the target auto-detect - # magic happens after the command line has been parsed. -- enabled linux || die "--enable-shared only supported on ELF for now" -+ if ! enabled linux; then -+ if enabled gnu; then -+ echo "--enable-shared is only supported on ELF; assuming this is OK" -+ else -+ die "--enable-shared only supported on ELF for now" -+ fi -+ fi - fi - if [ -z "$CC" ]; then - echo "Bypassing toolchain for environment detection." --- -1.7.9.7 - diff --git a/media-libs/libvpx/files/libvpx-1.1.0-x32.patch b/media-libs/libvpx/files/libvpx-1.1.0-x32.patch deleted file mode 100644 index bcacdbf4c79d..000000000000 --- a/media-libs/libvpx/files/libvpx-1.1.0-x32.patch +++ /dev/null @@ -1,64 +0,0 @@ -https://bugs.gentoo.org/426248 - -From c769945318b84b5c823091213634a4db0cdc5be5 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Tue, 25 Sep 2012 00:37:11 -0400 -Subject: [PATCH] check for x32 targets - -Add configure detection of the new x32 ABI. ---- - build/make/configure.sh | 5 +++++ - vpx_ports/x86_abi_support.asm | 10 ++++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/build/make/configure.sh b/build/make/configure.sh -index eeb959a..05bbabe 100755 ---- a/build/make/configure.sh -+++ b/build/make/configure.sh -@@ -989,6 +989,11 @@ process_common_toolchain() { - x86*) - bits=32 - enabled x86_64 && bits=64 -+ check_cpp <<EOF && bits=x32 -+#ifndef __ILP32__ -+#error "not x32" -+#endif -+EOF - soft_enable runtime_cpu_detect - soft_enable mmx - soft_enable sse -diff --git a/vpx_ports/x86_abi_support.asm b/vpx_ports/x86_abi_support.asm -index e1a540c..0c9fe37 100644 ---- a/vpx_ports/x86_abi_support.asm -+++ b/vpx_ports/x86_abi_support.asm -@@ -88,6 +88,8 @@ - %define sym(x) x - %elifidn __OUTPUT_FORMAT__,elf64 - %define sym(x) x -+%elifidn __OUTPUT_FORMAT__,elfx32 -+%define sym(x) x - %elifidn __OUTPUT_FORMAT__,x64 - %define sym(x) x - %else -@@ -223,6 +227,9 @@ - %ifidn __OUTPUT_FORMAT__,elf64 - %define WRT_PLT wrt ..plt - %define HIDDEN_DATA(x) x:data hidden -+ %elifidn __OUTPUT_FORMAT__,elfx32 -+ %define WRT_PLT wrt ..plt -+ %define HIDDEN_DATA(x) x:data hidden - %else - %define HIDDEN_DATA(x) x - %endif -@@ -364,5 +371,8 @@ section .text - %elifidn __OUTPUT_FORMAT__,elf64 - section .note.GNU-stack noalloc noexec nowrite progbits - section .text -+%elifidn __OUTPUT_FORMAT__,elfx32 -+section .note.GNU-stack noalloc noexec nowrite progbits -+section .text - %endif - --- -1.7.12 - diff --git a/media-libs/libvpx/files/libvpx-1.2.0_pre20130625-armv7.patch b/media-libs/libvpx/files/libvpx-1.2.0_pre20130625-armv7.patch deleted file mode 100644 index 6e8eba908faf..000000000000 --- a/media-libs/libvpx/files/libvpx-1.2.0_pre20130625-armv7.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit af9dd50e42e0a7558d0d555ee12a1eb60e87a458 -Author: Luca Barbato <lu_zero@gentoo.org> -Date: Thu Jan 10 05:13:57 2013 +0100 - - configure: support hardfloat armv7 CHOSTS - - Many linux distribution for arm switched to armhf/hardfloat, support - them. - - Change-Id: I8ab39d34782b4f24b7028ac76342118166fd5905 - -diff --git a/build/make/configure.sh b/build/make/configure.sh -index e27af96..f69b6d7 100755 ---- a/build/make/configure.sh -+++ b/build/make/configure.sh -@@ -597,8 +597,13 @@ process_common_toolchain() { - armv6*) - tgt_isa=armv6 - ;; -+ armv7*-hardfloat*) -+ tgt_isa=armv7 -+ float_abi=hard -+ ;; - armv7*) - tgt_isa=armv7 -+ float_abi=softfp - ;; - armv5te*) - tgt_isa=armv5te -@@ -784,8 +789,9 @@ process_common_toolchain() { - check_add_asflags --defsym ARCHITECTURE=${arch_int} - tune_cflags="-mtune=" - if [ ${tgt_isa} == "armv7" ]; then -- check_add_cflags -march=armv7-a -mfloat-abi=softfp -- check_add_asflags -march=armv7-a -mfloat-abi=softfp -+ [ -z "${float_abi}" ] && float_abi=softfp -+ check_add_cflags -march=armv7-a -mfloat-abi=${float_abi} -+ check_add_asflags -march=armv7-a -mfloat-abi=${float_abi} - - if enabled neon - then |