summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-emulation/emul-linux-x86-soundlibs/Manifest2
-rw-r--r--app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20130224.ebuild9
-rw-r--r--media-libs/alsa-lib/Manifest2
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild4
4 files changed, 13 insertions, 4 deletions
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
index 8d8150f3..46870dca 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 1227 SHA256 ecfb08590b5257d27d6954f39a902f2c63e387cd6dbae40889f48674293cf30a SHA512 b335f99d290c5b38b3950f29059417dada8c8a696136689b42538b7e2732e71d0b68ee493460380b02639f2b7f9ecc846612bd3921cab036ded9965fec4bebaa WHIRLPOOL 7d20c8703c0f1899159865d401c19e51f92018ce9fb057d8bac7008a242754a518804c111b3130189628befb67a00671075b409c22d65479c26049188078bed8
+EBUILD emul-linux-x86-soundlibs-20130224.ebuild 1462 SHA256 4cfa49e20d899678b2db6d1f93e6c29383b51e811ba4a427b112bab13febde04 SHA512 e4aaa18bc9e48618336744a4e70c2a0833fc4ff3a138d58dc4a83c096f45af42e3bce6346a7d1f92bf5fa80d249a005fe8917b54c8aa02f6d783bdb5f855b974 WHIRLPOOL ac0f0c02a23f5cfa331ee74e8289f06b99c65fbe23c77de528e7d8c7a3902d113de020d34d2097b030fb13d3a678459d0493103839c94a247a38fb48b19227a3
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 9ebe18f6..c4280061 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-fftw filter-webrtc-audio-processing"
+IUSE="alsa filter-alsa-lib filter-fftw filter-webrtc-audio-processing"
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
~app-emulation/emul-linux-x86-medialibs-${PV}
@@ -19,6 +19,13 @@ src_prepare() {
use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
ALLOWED="(${_ALLOWED})"
+ # media-libs/alsa-lib-1.0.27.1
+ if use filter-alsa-lib; then
+ rm usr/lib32/alsa-lib/smixer/smixer-{ac97,hda,sbase}.so || die
+ rm usr/lib32/libasound.so{,.2,.2.0.0} || die
+ rm usr/lib32/pkgconfig/alsa.pc || die
+ fi
+
if use filter-fftw; then
rm "${S}"/usr/lib32/pkgconfig/fftw3{,f,l}.pc || die "rm 1"
rm "${S}"/usr/lib32/libfftw3{,f,l}.so{,.3} || die "rm 2"
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index c7430c54..81a2c9f3 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,3 +1,3 @@
DIST alsa-lib-1.0.27.1.tar.bz2 906234 SHA256 690e07a3ef6270d40ed2130638dba3c18395aae8db4a109bcc473643ce29a03b SHA512 546a52c5c23d51e3a49a36565c0bdda98efc3bbe8ba217c72cfb6986b0e1a6104a3040bc223a74966139416ce39709421a3131f3edb29362a3f949b0ae939909 WHIRLPOOL 485a5b260edc208776ca553d13065d242f1266e38b25dab252596fc8d4c9c3482d11fd3e472c7c96c97b396718a715ca12f36c76635bd069ebe09edc6815693f
-EBUILD alsa-lib-1.0.27.1.ebuild 1986 SHA256 85626e2991d284d6cdd1b052f71e514bbc2e68618c7445c6463b382ceeab9dec SHA512 0a5ea50c37e91e152df92d65803b2b2a733c688b499e746defb736faadbc862e326f2fdd1216c062cb009f714b0545e4e8e8ecfaa7c3f9d614df0bcd87225ebe WHIRLPOOL 0c543f4ae518d406ae3c4b0ae42e5b179b737b7e976bdd83d066b0d3d195811f0dc0bcee9a836f4f329b84fe3569417e0cb629c27d9c458b6fce1e152b334a08
+EBUILD alsa-lib-1.0.27.1.ebuild 2052 SHA256 596e8f55fc208a15bddc0f1ac7d7f4c33cfe3b3a0c60e364482a74f13113eba4 SHA512 dfbf7af9298ea287b88e4b1dccd11c3b2fd1f58c2c61fdb0c563d579f9c04c0d4f8bc7ea48f55872c5642e6de8461c38e427e50fe99bc906746b646a413686cc WHIRLPOOL cf22318e2584aa9f7f6fc2c7e5265fd83483f5cc95c445ed8fcf1d0cfa15b7ff6025a290f6c17ee671108698a57ac1731bc7f5c1d7c71f04f57cb887dc14d84d
MISC metadata.xml 349 SHA256 68b0f168985d3b03a0997eb9f9338662d1584dc7fe7ea35ae8f7564e5e20c2e3 SHA512 477956b85f7ddddac6b0bb67a52803a569f3ee6011ab917a3d2a60975a11c0a9ef5acedebbcb75bdbd04063e2c6e7aabf10a0c2444dd10492eda4cb8f817f688 WHIRLPOOL c42f98c4da4bd5c20d32bfa6a3d9d68b71aaccbc905cad9a7552366be99c1e1f010279d458b620e97e2c1044cef0af066cf79fc5a1fcecf8fb31c91a3e1e95ab
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild
index f23dcdfb..3cc93c2b 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild
@@ -19,7 +19,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
IUSE="doc debug alisp python"
RDEPEND="python? ( ${PYTHON_DEPS} )
- 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 ) )"
DEPEND="${RDEPEND}
doc? ( >=app-doc/doxygen-1.2.6 )"