summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-02-21 02:29:47 +0000
committerMike Gilbert <floppym@gentoo.org>2014-02-21 02:29:47 +0000
commitabbb5b58a2617e913707d587390a096d0e422a79 (patch)
tree6617499c65bcea839ed89bc4440992f9636f7ad3 /media-libs/libvpx
parentBump (diff)
downloadgentoo-2-abbb5b58a2617e913707d587390a096d0e422a79.tar.gz
gentoo-2-abbb5b58a2617e913707d587390a096d0e422a79.tar.bz2
gentoo-2-abbb5b58a2617e913707d587390a096d0e422a79.zip
Fix compatibility with dash, bug 498136.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'media-libs/libvpx')
-rw-r--r--media-libs/libvpx/ChangeLog6
-rw-r--r--media-libs/libvpx/files/libvpx-1.3.0-dash.patch16
-rw-r--r--media-libs/libvpx/libvpx-1.3.0.ebuild8
3 files changed, 27 insertions, 3 deletions
diff --git a/media-libs/libvpx/ChangeLog b/media-libs/libvpx/ChangeLog
index 00da37d465b9..4d99defc8ae6 100644
--- a/media-libs/libvpx/ChangeLog
+++ b/media-libs/libvpx/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libvpx
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.100 2014/02/20 01:03:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/ChangeLog,v 1.101 2014/02/21 02:29:46 floppym Exp $
+
+ 21 Feb 2014; Mike Gilbert <floppym@gentoo.org> +files/libvpx-1.3.0-dash.patch,
+ libvpx-1.3.0.ebuild:
+ Fix compatibility with dash, bug 498136.
20 Feb 2014; Mike Gilbert <floppym@gentoo.org> libvpx-1.1.0.ebuild,
libvpx-1.2.0_pre20130625.ebuild, libvpx-1.3.0.ebuild, libvpx-9999.ebuild:
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/libvpx-1.3.0.ebuild b/media-libs/libvpx/libvpx-1.3.0.ebuild
index 4edab913b856..d6bb2138ac8e 100644
--- a/media-libs/libvpx/libvpx-1.3.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.3.0.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.3.0.ebuild,v 1.2 2014/02/20 01:03:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.3.0.ebuild,v 1.3 2014/02/21 02:29:46 floppym Exp $
EAPI=4
-inherit multilib toolchain-funcs multilib-minimal
+inherit eutils multilib toolchain-funcs multilib-minimal
LIBVPX_TESTDATA_VER=1.3.0
@@ -46,6 +46,10 @@ REQUIRED_USE="
ssse3? ( sse2 )
"
+src_prepare() {
+ epatch "${FILESDIR}/libvpx-1.3.0-dash.patch"
+}
+
multilib_src_configure() {
unset CODECS #357487