summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreroen2013-05-28 20:34:44 +0200
committereroen2013-05-28 20:34:44 +0200
commitca1573722a1dc28b3f3e803759c42742f91f9410 (patch)
tree32c2b04b0021b68ca8e41af4b671142a07c05ee0
parent3b2f24de089510a74ad3debb452d6d5b4fa817a5 (diff)
downloaderoen-overlay-ca1573722a1dc28b3f3e803759c42742f91f9410.tar.gz
eroen-overlay-ca1573722a1dc28b3f3e803759c42742f91f9410.tar.bz2
eroen-overlay-ca1573722a1dc28b3f3e803759c42742f91f9410.tar.xz
libogg-1.3.0-r1: interoperate w/ elx86-soundlibs
-rw-r--r--app-emulation/emul-linux-x86-soundlibs/Manifest2
-rw-r--r--app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224.ebuild8
-rw-r--r--media-libs/libogg/Manifest2
-rw-r--r--media-libs/libogg/libogg-1.3.0-r1.ebuild4
4 files changed, 12 insertions, 4 deletions
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index 46ce7e1f..438bee0a 100644
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ b/app-emulation/emul-linux-x86-soundlibs/Manifest
@@ -1,3 +1,3 @@
DIST emul-linux-x86-soundlibs-20130224.tar.xz 7068240 SHA256 51ee669fb864b8522cd9ffa4aa8148c20eb07c06623a8c0bd718d444867da92a SHA512 67bca8c875e17bb8e1b3057182d08c679992ce525e124162e02e8a2c01bb5413d7ab19736a9f803d8a3835e7c5d68e556de9d3aee7240fb6708d2f3528ae56e0 WHIRLPOOL 48b9583dd91d5b1dbb4dedc1c9f5bf2937a325adad20bb45adf7de96e5d1db6a3e62a617ef85300c917faf57313a00790007d12db3a6dc9261ef627c71f14d9a
-EBUILD emul-linux-x86-soundlibs-20130224.ebuild 1852 SHA256 964a7539ffe8d0720bef6f79b020fdffead26290d7e80ca9f28a089e17ff25de SHA512 b85d0f7d998cd93aa0f27e12a0119098af1d94162160977beb9dda0e2990777eff0250cad3900295f66ab3e2ff992ca0b0e2fcb8d263d86e6762fd9072eb628c WHIRLPOOL 25e448c50747232fc3d7af6098d1412b26c94382ffe51631c12d8ed12ec22d28150ca396ba273be07fd32430769f6af14377d31ec543828bd4e62a0ed6582d5d
+EBUILD emul-linux-x86-soundlibs-20130224.ebuild 2012 SHA256 211d6f00335095c60328645b3dc9bf5cc2829a73cea2b70cde1c6cf4b220cda1 SHA512 238e493d60fc36e44397a23fefbc3579da81ecbea88d16317fb1d5e902acf866ecff1e71c4c867deb35066c8983a2f34f00ca7ca103a633252bb8ecbacd73ca1 WHIRLPOOL a4e7217e9f98d444ca78e19e5be2e11ec899ef90319846f99ca4278dc2b617e34645a7f9b7438536bbd6ffac2c32a810cef9515e7f66d8e0efafd62ca2e24691
MISC metadata.xml 225 SHA256 0ce288a649a1cbdf01d699a90300d341736ab0fd3456fd1002e2ffa8d409f453 SHA512 924fc3abc73e518a76ae8255dc51a98e2a96c5e0312b15a3b5f12e278b2b4345d0de8a7a2eb91dbad0b9e55e2c38ccc215fac8b07ff73ccd2fd9843e68531cf5 WHIRLPOOL 9ecaf784ea9cc1ae7e81cead25eb99cff6f61247a2f33ccf27782ddb17c2642f63a6892b9b664015d4f278469b2c8ef93b9f69b9a6d1f15cfcc55ce41451c503
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224.ebuild
index 03893cb7..d80f273b 100644
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224.ebuild
+++ b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224.ebuild
@@ -7,7 +7,7 @@ inherit emul-linux-x86
LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain"
KEYWORDS="-* amd64"
-IUSE="alsa filter-alsa-lib filter-audiofile filter-fftw filter-flac filter-webrtc-audio-processing"
+IUSE="alsa filter-alsa-lib filter-audiofile filter-fftw filter-flac filter-libogg filter-webrtc-audio-processing"
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
~app-emulation/emul-linux-x86-medialibs-${PV}
@@ -44,6 +44,12 @@ src_prepare() {
rm usr/lib32/pkgconfig/flac{,++}.pc || die
fi
+ # media-libs/libogg-1.3.0-r1
+ if use filter-libogg; then
+ rm usr/lib32/libogg.so{,.0,.0.8.0} || die
+ rm usr/lib32/pkgconfig/ogg.pc || die
+ fi
+
# 'media-libs/webrtc-audio-processing-0.1-r1
if use filter-webrtc-audio-processing; then
rm usr/lib32/libwebrtc_audio_processing.so{,.0,.0.0.0} || die
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 16c7444d..fab329ff 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,3 +1,3 @@
DIST libogg-1.3.0.tar.xz 289384 SHA256 231725029c843492914f24e74085e734bca6f1d6446ac72df39b0c3a9d4bc74b SHA512 d99f7285d1d92940e5e82778f208afe615ff44384b373d81186a57a77d57a8c7f5e3347ea9ad99dc87cd6091e41ed8f47f0c3277e6a113dbb157c6aa6dd0f357 WHIRLPOOL 75954c92b475686f23d3da9d2970f04271865c2617a53e4e0f38336991bcc0a8171ed394b48048b4bf91aff85951381a7360ffb0509158788688666c395a3c6b
-EBUILD libogg-1.3.0-r1.ebuild 1266 SHA256 f9f9e049592ed2f7fc7862c44c1bbaf102d2adb7a171b19b3aa2ff5a08d58458 SHA512 db135047b9003f1f6a69df59f7127a870cdf26b992e5c8357868aba5f49e95e2c50e43f57e59d8783b7d8f1f4be83602e23b7ed9c536156537c2289169b4cb3e WHIRLPOOL f6deecc534865a591bb7b66b7ee3dc43f0d0c9c7b3f9c89762b2fc67f95c575b25d7a62f8b043650e4cdadb343688386093ee1d131c0bde2d6abafbb9e79909f
+EBUILD libogg-1.3.0-r1.ebuild 1333 SHA256 283d8c6590b51011c5b85b0d45aecd688f04871c6914f62f5f3bd69fe42b22c6 SHA512 5dc521d46feb7b3d94f4ca4a7f4668973d9a9092aff62e0bba86aede494ae46d4b5d1e51ba019c8e874a0c4c2ef22c979e8fb73dbf2c05c265fb5b74aeb33c96 WHIRLPOOL eafebe16aba6d12d35a12ec80f30c28e79830145b9e61be034c72a45887d664a973a45d7e189444d57e625f2be4785a2b920fef36d606c64b7ca99cc4058fe8f
MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
diff --git a/media-libs/libogg/libogg-1.3.0-r1.ebuild b/media-libs/libogg/libogg-1.3.0-r1.ebuild
index e0e20d8b..51abe199 100644
--- a/media-libs/libogg/libogg-1.3.0-r1.ebuild
+++ b/media-libs/libogg/libogg-1.3.0-r1.ebuild
@@ -17,7 +17,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
IUSE="static-libs"
RDEPEND="
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224 )"
+ abi_x86_32? ( || (
+ app-emulation/emul-linux-x86-soundlibs[filter-${PN}]
+ !<=app-emulation/emul-linux-x86-soundlibs-20130224 ) )"
AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
DOCS=( AUTHORS CHANGES )