diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/libvpx/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-libs/libvpx/files')
7 files changed, 244 insertions, 0 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 new file mode 100644 index 000000000000..698e65a2dba5 --- /dev/null +++ b/media-libs/libvpx/files/libvpx-1.1.0-arm.patch @@ -0,0 +1,38 @@ +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 new file mode 100644 index 000000000000..eb6b286cd66b --- /dev/null +++ b/media-libs/libvpx/files/libvpx-1.1.0-chost.patch @@ -0,0 +1,36 @@ +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 new file mode 100644 index 000000000000..84d536f5054c --- /dev/null +++ b/media-libs/libvpx/files/libvpx-1.1.0-generic-gnu-shared.patch @@ -0,0 +1,39 @@ +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 new file mode 100644 index 000000000000..bcacdbf4c79d --- /dev/null +++ b/media-libs/libvpx/files/libvpx-1.1.0-x32.patch @@ -0,0 +1,64 @@ +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 new file mode 100644 index 000000000000..6e8eba908faf --- /dev/null +++ b/media-libs/libvpx/files/libvpx-1.2.0_pre20130625-armv7.patch @@ -0,0 +1,41 @@ +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 diff --git a/media-libs/libvpx/files/libvpx-1.3.0-dash.patch b/media-libs/libvpx/files/libvpx-1.3.0-dash.patch new file mode 100644 index 000000000000..fa021b659a06 --- /dev/null +++ b/media-libs/libvpx/files/libvpx-1.3.0-dash.patch @@ -0,0 +1,16 @@ +dash compat +https://bugs.gentoo.org/show_bug.cgi?id=498136 + +--- a/build/make/configure.sh ++++ b/build/make/configure.sh +@@ -405,8 +405,8 @@ + } + + write_common_target_config_mk() { +- local CC=${CC} +- local CXX=${CXX} ++ local CC="${CC}" ++ local CXX="${CXX}" + enabled ccache && CC="ccache ${CC}" + enabled ccache && CXX="ccache ${CXX}" + print_webm_license $1 "##" "" diff --git a/media-libs/libvpx/files/libvpx-1.3.0-sparc-configure.patch b/media-libs/libvpx/files/libvpx-1.3.0-sparc-configure.patch new file mode 100644 index 000000000000..dc3f6c9387c7 --- /dev/null +++ b/media-libs/libvpx/files/libvpx-1.3.0-sparc-configure.patch @@ -0,0 +1,10 @@ +--- configure~ 2014-01-10 21:12:42.000000000 +0100 ++++ configure 2014-04-05 12:51:51.794638686 +0200 +@@ -109,6 +109,7 @@ + all_platforms="${all_platforms} ppc64-darwin9-gcc" + all_platforms="${all_platforms} ppc64-linux-gcc" + all_platforms="${all_platforms} sparc-solaris-gcc" ++all_platforms="${all_platforms} sparc-linux-gcc" + all_platforms="${all_platforms} x86-android-gcc" + all_platforms="${all_platforms} x86-darwin8-gcc" + all_platforms="${all_platforms} x86-darwin8-icc" |