summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreroen2013-05-28 21:13:11 +0200
committereroen2013-05-28 21:13:41 +0200
commitd141ffc43a4d8d04f976b85b5f0cfe83a4ce0514 (patch)
tree62181066bca00fbfd48bb311923d1cb37e9316a8
parentd68a6454d284a7f3993feddde21c41652596a5bb (diff)
downloaderoen-overlay-d141ffc43a4d8d04f976b85b5f0cfe83a4ce0514.tar.gz
eroen-overlay-d141ffc43a4d8d04f976b85b5f0cfe83a4ce0514.tar.bz2
eroen-overlay-d141ffc43a4d8d04f976b85b5f0cfe83a4ce0514.tar.xz
libsndfile-1.0.25-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/libsndfile/Manifest2
-rw-r--r--media-libs/libsndfile/libsndfile-1.0.25-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 e7fbf4aa..b7826173 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 2299 SHA256 78d7ac84e053b6b5dab383ffc2ae9526da19c8e78c00ed5fe7af51bcbb15c703 SHA512 79f14f61c9ac659993b52970b80637998c6f152c984e805072e8151058058137b1a8d6200c48e26fbfbbaeb4e4e1d9d6d560a7fa264139ab52ac89b5e4b87406 WHIRLPOOL 0a7707f13313d45cdae47295fe637bf5105f6233ab89ab3583b657539d9eacbffab0707826270f7e851743a4854139ce80a00956d2afc131d38336112fa59fac
+EBUILD emul-linux-x86-soundlibs-20130224.ebuild 2481 SHA256 1771398fe0aa1be27f8f22ad444e428627c49a920f669c670fe898d1656e4f16 SHA512 814232b2d13bd1c0cae1c5c09f65f86c7940667b962b00803324aa82bdc7a9140b68c3d677642fb3dd16f31a4d37d1edb6b581a19a3a425f2b7ca25bdc5243b1 WHIRLPOOL cdbc0d5d6c1973339d06f10cdf9c608925041cc7110ab88db44286069bbfed3738963e1bd094101ce79e3aa39fb888302ac3e76240a62bbcff587fad0a00a4b6
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 21019986..99552ec4 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-libogg filter-libvorbis filter-webrtc-audio-processing"
+IUSE="alsa filter-alsa-lib filter-audiofile filter-fftw filter-flac filter-libogg filter-libsndfile filter-libvorbis filter-webrtc-audio-processing"
RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
~app-emulation/emul-linux-x86-medialibs-${PV}
@@ -50,6 +50,12 @@ src_prepare() {
rm usr/lib32/pkgconfig/ogg.pc || die
fi
+ # media-libs/libsndfile-1.0.25-r1
+ if use filter-libsndfile; then
+ rm usr/lib32/libsndfile.so{,.1,.1.0.25} || die
+ rm usr/lib32/pkgconfig/sndfile.pc || die
+ fi
+
# media-libs/libvorbis-1.3.3-r1
if use filter-libvorbis; then
rm usr/lib32/libvorbis.so{,.0,.0.4.6} || die
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 1e8a6877..b1a45942 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,4 +1,4 @@
AUX libsndfile-1.0.17-regtests-need-sqlite.patch 894 SHA256 c53026864c6a05b1ccc8b12e7af895f5d0e2d3a00335fd9f49ed7cc9aecece73 SHA512 1c914a1e51b15149bdba7d242f1ce6979d36cee7e6a6771c6b301d309805e1d5c9db28d4ab968b573504b88a9531c1a3b67af8d92d69f59c047ba692746ce5ed WHIRLPOOL efdf9e09c71f4c3701ebdcc9f300490abed19b096495d0b9a45352f6b996fa1856457e7f5a022ea0f4a559d62e4453899b1239b902f19dace5b9569825dcb8f7
DIST libsndfile-1.0.25.tar.gz 1060692 SHA256 59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882 SHA512 4ca9780ed0a915aca8a10ef91bf4bf48b05ecb85285c2c3fe7eef1d46d3e0747e61416b6bddbef369bd69adf4b796ff5f61380e0bc998906b170a93341ba6f78 WHIRLPOOL 37ef0a66f11d3f60741fe40bce2b255f44284cf78f7c762542def2aab0eefed1360181bb7f29b9850c11e8672a78bc5a687bc04f2cc349e45dfd24721bea8f29
-EBUILD libsndfile-1.0.25-r1.ebuild 2418 SHA256 bc281308ae39c961d92f2c51ed5efbec5ba45907945bb61933d65e04a7465da1 SHA512 2859e8a5ab7a77c75ea7ecb031d6725fe3e250f77272639dfebec757d24890b902c347b0bcc4185876478ab76df14017319b6f584ea6b15e0568d42103e3da7b WHIRLPOOL bcbb7cbdf630c1b88b2795bba3287ff158e6c1c70768a7d8bfb5a09b6c3d506e6045e4e78461fdcb68d988ba14d6a467544f0b4e920841cbe443404ae36f4dc4
+EBUILD libsndfile-1.0.25-r1.ebuild 2484 SHA256 f6ffb8644e18b8f2e5721687947a0bcc19b5e92948d45a50f8f9f908d81d1c9b SHA512 258d594cdd6290bb7842914ea3fb470f8566e2a951c7b0076dc719dfbc8bdae235959d14ad563718bd93b4e777ae656c3f22a9e3aa33793d251978ba17b826e3 WHIRLPOOL e1ef9cb51e94ddb99f2bbbc7a7d723335b8aca59b9578ea32c1ccb84b79d4e87c9085e9b11345c89358e6002750dcf414443e5c101e666c2c55816ec14530f90
MISC metadata.xml 159 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369 SHA512 a77b80f2ab1799aab052edd575ad80daae01c717af7bd5bf3dcda15714b9afd2e9fd6553cc20b000bc3157915b7082641a92fda56de3a9b8362ae2488925e4b1 WHIRLPOOL 913c53cb00341537eff621357b1c5b8379bb63df52d18b88fdef0173cdfd7c60f6d1ece1d42b5d0fcda69ed73ab4138f4268c6394851b07a9411a8306fef9173
diff --git a/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild b/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild
index 54acddf2..82991bfb 100644
--- a/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.25-r1.ebuild
@@ -35,7 +35,9 @@ RDEPEND="
app-emulation/emul-linux-x86-baselibs[development]
) )
)
- 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? ( ${PYTHON_DEPS} )"