summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreroen2013-05-28 19:39:56 +0200
committereroen2013-05-28 19:39:56 +0200
commit9e739dbb2adcd5b79daa24bb869caba804705eec (patch)
tree08d2a7b24cd90cc0400aef5a74212cb445fcd4bd
parentd62cef2bc0304f0400b5fe4583d723ae0caa55da (diff)
downloaderoen-overlay-9e739dbb2adcd5b79daa24bb869caba804705eec.tar.gz
eroen-overlay-9e739dbb2adcd5b79daa24bb869caba804705eec.tar.bz2
eroen-overlay-9e739dbb2adcd5b79daa24bb869caba804705eec.tar.xz
audiofile-0.3.6-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/audiofile/Manifest2
-rw-r--r--media-libs/audiofile/audiofile-0.3.6-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 46870dca..526b3e9f 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 1462 SHA256 4cfa49e20d899678b2db6d1f93e6c29383b51e811ba4a427b112bab13febde04 SHA512 e4aaa18bc9e48618336744a4e70c2a0833fc4ff3a138d58dc4a83c096f45af42e3bce6346a7d1f92bf5fa80d249a005fe8917b54c8aa02f6d783bdb5f855b974 WHIRLPOOL ac0f0c02a23f5cfa331ee74e8289f06b99c65fbe23c77de528e7d8c7a3902d113de020d34d2097b030fb13d3a678459d0493103839c94a247a38fb48b19227a3
+EBUILD emul-linux-x86-soundlibs-20130224.ebuild 1643 SHA256 b753493310756db3f91a80c53431ef7ceecf8c895125af3627d2dc7ebaa11844 SHA512 b490ed60c5e9c7e75279fcbb1d95bcd62a4f2e303748b87240c43ea36e238e1ca48b88c314f5786dfc552e5da10b5951ae19f60ca7e1b6d5a3a790faa7ca6682 WHIRLPOOL 0e0f8b93c807d2654a3d13a5ac5dd329e7949c0fa41d4cc6bd00264a63b34b07f53fbbb058927df68e9d4300c51cea43b3792a0bd37209fe60c81e2188b9677f
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 c4280061..fead6cbe 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-fftw filter-webrtc-audio-processing"
+IUSE="alsa filter-alsa-lib filter-audiofile filter-fftw filter-webrtc-audio-processing"
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
~app-emulation/emul-linux-x86-medialibs-${PV}
@@ -26,6 +26,12 @@ src_prepare() {
rm usr/lib32/pkgconfig/alsa.pc || die
fi
+ # media-libs/audiofile-0.3.6-r1
+ if use filter-audiofile; then
+ rm usr/lib32/libaudiofile.so{,.1,.1.0.0} || die
+ rm usr/lib32/pkgconfig/audiofile.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/audiofile/Manifest b/media-libs/audiofile/Manifest
index 92ea2925..4320c6a2 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -1,4 +1,4 @@
AUX audiofile-0.3.6-system-gtest.patch 4040 SHA256 655935e1f29060d4a2e99fa0d3771d9ec47d09f19668112d16c477b54a02112e SHA512 e58f033f075e3f6c34e25793353c122e05960ca2ff8aefaca936c7bd683989545d6839ad231136a870a9fc9a515623a056a149128fba7239bb9998c3ea320172 WHIRLPOOL 78722ba435cde819b7c16349da306e53d0f496c9a9f535f74849162e8c8d5dc37b5ff4d4a71620e904971a46916fd8500989ab02a6834f73dc6344311974c6d9
DIST audiofile-0.3.6.tar.xz 530760 SHA256 ea2449ad3f201ec590d811db9da6d02ffc5e87a677d06b92ab15363d8cb59782 SHA512 f3b58210a4ef3ac8e08a368a78e0f4b8345456d084bdebfd20d1631fa75e562aa58d31863a502b6ff18178327aa5b87403566bd34566fa52bdfc8e01de400bcb WHIRLPOOL 4e750d9071e2ebfaef033647655fea7ecd2bad3751b74c4e16bd702099f01d731e57d0473379faac8ff1f66c4e5ffeadbf41551e829294fa09fe201354270221
-EBUILD audiofile-0.3.6-r1.ebuild 1261 SHA256 7be7f99e6d884d36f5466058799688306d5b034f0eeaa69a1d1ce93be64847bc SHA512 5344e35709bd33808c30703124e83069e1c2bd9a6f401d8ce4afbcdc9026531b99cdb36257245838d3a2c2aa56d3caf169c4ba21e632a8efa02c17bd3a834db6 WHIRLPOOL dc8873bb3f30199e241bd227c42dc262eec5800d05e2aabff71f107a7dab25b0dde31be7a91463a3d5232b18f4f667487d3e34bfdd026cd5b284a4c3acee5764
+EBUILD audiofile-0.3.6-r1.ebuild 1327 SHA256 49025e570ef9b3c6e7d08595066c23e3c6040af238399085e20ab7fe814443bc SHA512 6a42f1fd00a76e0bd640c7436c321c8f5035d743357d4f83fd393acbe3cd0b003f92e31f8dd727d61eb6df1a183575d5799873ca2c2612eb6df387be5ccc7ea7 WHIRLPOOL a6e6965b9d44c3e4915f5b180e7034443899adf9fa7fe079ee304d00e5290908bc81831d28d61a02097e074b8e7ec925b43de96073d4ba96bb9120678efa64e0
MISC metadata.xml 177 SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2 SHA512 98444e8060758d0318b9e2b3473ff334e0bd9123d62a70eef1951096b76e22262a977c5dfb7efd01415c08fd4d141bdf73a536b3661b6333c4fe770560d83ddd WHIRLPOOL 61f5a9fdb88bbeb5aed394332e86827c756df08d943de2ea14debe60c31c718a64921255eb3df7535e5230a198be0126a62120a7098d067b952e80fe2ae76b36
diff --git a/media-libs/audiofile/audiofile-0.3.6-r1.ebuild b/media-libs/audiofile/audiofile-0.3.6-r1.ebuild
index 689a82f5..2fcef52f 100644
--- a/media-libs/audiofile/audiofile-0.3.6-r1.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.6-r1.ebuild
@@ -16,7 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
IUSE="flac static-libs test"
RDEPEND="flac? ( >=media-libs/flac-1.2.1[${MULTILIB_USEDEP}] )
- 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}
virtual/pkgconfig
test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"