diff options
| author |   Gregory M. Tuner <gmt@be-evil.net> | 2014-01-19 10:47:17 -0800 |
|---|---|---|
| committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-01-19 10:47:17 -0800 |
| commit | fdbe79dad8ae56b6e2f49fd9aad85aee56e127ae (patch) | |
| tree | 85acff13e93777e938546b7d75309f8bcfdc7b98 /media-libs | |
| parent | app-emulation/emul-linux-x86-gstplugins: misc. fixes (diff) | |
| download | gmt-fdbe79dad8ae56b6e2f49fd9aad85aee56e127ae.tar.gz gmt-fdbe79dad8ae56b6e2f49fd9aad85aee56e127ae.tar.bz2 gmt-fdbe79dad8ae56b6e2f49fd9aad85aee56e127ae.zip | |
media-libs/gstreamer:0.10: fix silly multilib bug, emul-linux-x86 exclusion, parallelize
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/gstreamer/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/gstreamer/gstreamer-0.10.36-r1.ebuild | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest index 527ef8f..ac29d72 100644 --- a/media-libs/gstreamer/Manifest +++ b/media-libs/gstreamer/Manifest @@ -3,7 +3,7 @@ AUX gstreamer-0.10.36-disable-test_fail_abstract_new.patch 1319 SHA256 05f71ddb1 AUX gstreamer-1.2.0-OOT-gtkdoc-install-hack.patch 4001 SHA256 5055a880885a98d9939e731538225ce7c7e0b61dfad815c5f68845b14f151bc1 SHA512 600d46d52af178667b4ba2b447adf72f33508d03df7590d7b087fcd1e67e09871a6e8395701e062df6f58360f0b63eda1e7115fda222bfe0f176898cc91f603d WHIRLPOOL 2a67d6ce23f1f19b84fb211db0046a9261ff654c0225b69c884f524cdd25351ff415e4e32ba382cc3ceb699838fe8e479aaf919fd0f7990479bec14fa8f6029c DIST gstreamer-0.10.36.tar.xz 3025876 SHA256 9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da SHA512 7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8 WHIRLPOOL 03b841624552be860d4bf824bde9d6d5d6afc629048244b02037c96370c88191f34a6d09f02af61f295a9d6f84952efec2c5d4b0a28e8e70cd17966ed1b01d93 DIST gstreamer-1.2.0.tar.xz 3194556 SHA256 94af5274299f845adf41cc504e0209b269acab7721293f49850fea27b4099463 SHA512 e5d7d9a3fb7de88f1be8696a37b8d2de48b5aa0f47b1c04a0924f61c83a7b18450222240f130401d89218fb2ff584c1243547d2bb3c0fdcbd790c9c4d7df2abe WHIRLPOOL 2d90ae8084ebda7628216845e14242d73d4f7bbf37fd0f2b33e4a7a476965087fc8cbbe5cdbee553e5b4bb3e6fbf6512b5c65ab58669428b792d5d040c847a8b -EBUILD gstreamer-0.10.36-r1.ebuild 3916 SHA256 901ea25d8c05c1bc6e065b840dae617a546b0df18dd26e68f2141d5f6ecee3a1 SHA512 4565e48cfa874a067b75fe2fecfb7b7e3850e94f857cbaacfa5e3f68cdade0dfcf1c9b9e4f48c3a12194f3fe49f4acbe5ef326ecb490c704c714c1cd3e2832da WHIRLPOOL 51e28500a114a0665cdd685e48cc74841dab77c0fb154afbba5b6d65619019a282bb24c05470247ff2a660e171a49b4e355c9d7062183ed2c4f57404a3327058 +EBUILD gstreamer-0.10.36-r1.ebuild 4085 SHA256 ddc814bcbd764515a32db3f57c862bc7b7c3e156a7279ecfd09e4b32930cc3bb SHA512 3ec278cf085db7e8a6f265a2c3297bbeb370b9881617b33cbd847d17bf9e3b5e753417335aed4f237b670da694c8ca9eaa3369569c014730d5d4b3b19a9cb0ce WHIRLPOOL 7a667827dd79dfaea4094536b8539af3f74d546f6851112558a3227b2d431ad0b1e68311bf687e810dfd3d5d220180f37c874dfd8dc566bdae2412aa43fd00a9 EBUILD gstreamer-1.2.0-r1.ebuild 2811 SHA256 24e26e9761238a5860cb43037591a89b30bc10f1112817768f62b165093823db SHA512 58cf2947037564f477061b27ac8201d4c1d4d3d9881ec22f8c953663533a1d1aa9f1c032ae138957a234dbb6f8f87dbf96aaa265713e399f0614f19d8557221f WHIRLPOOL 5422fe2cb98150e5f5c01776d8ca60c47d4e43bc38b378049c8ef90de11a473ef2269429c9c55bf1b02882c2010c1cbc4728ba4cb10597085f8e4267142d25bc MISC ChangeLog 47216 SHA256 3f9bd8528b0d53690b653cca7a51372fab77002585f763ae2628da8b4fb8e85c SHA512 f3d9a50e3d63d3b74c90ee5df588d9c2dfc6cf8e67823de5afa9f89027f3ab8f6e3386553ee59d76b0f6826b9982df21e0a83f2a24892e9f89d8ef93dc3cf746 WHIRLPOOL b9b3032ec0ba0461c30583625733de5bb3ea84b95c6b06a44fb9915d38bbf60af50e8fccaa26c3f2c94f0225dd3f7468ababce606265544c3cd3f159a4eadc2f MISC metadata.xml 356 SHA256 56bce20bed627cb8a3aabba94b49891f2fc9c62001d873e6ebf06ec53fd1072e SHA512 0cdd5271f2df57644bc7d8fee21a291984b93bb63d07fc5da0f8299b99d96752a10ff06f1a19f85c7caf84e41219d187ed94e21575ab7ba495f68e7f53ddb499 WHIRLPOOL 6e5407c243fa4fea8e475434da67fc4fcab0ec13603a8998cd844c39dffaf2642dded7bf49c6ecc69bf600176a710f89a1f525eb7c60de2249cf829366877e47 diff --git a/media-libs/gstreamer/gstreamer-0.10.36-r1.ebuild b/media-libs/gstreamer/gstreamer-0.10.36-r1.ebuild index f8b8296..20f407b 100644 --- a/media-libs/gstreamer/gstreamer-0.10.36-r1.ebuild +++ b/media-libs/gstreamer/gstreamer-0.10.36-r1.ebuild @@ -17,9 +17,13 @@ IUSE="+introspection nls +orc test" RDEPEND=">=dev-libs/glib-2.24:2[${MULTILIB_USEDEP}] >=dev-libs/libxml2-2.4.9[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.6.8[${MULTILIB_USEDEP}] )" + introspection? ( >=dev-libs/gobject-introspection-0.6.8[${MULTILIB_USEDEP}] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-medialibs-20131008-r1[abi_x86_32(-)] + !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] + )" DEPEND="${RDEPEND} - app-arch/xz-utils + app-arch/xz-utils[${MULTILIB_USEDEP}] >=dev-util/gtk-doc-am-1.3 sys-devel/bison sys-devel/flex @@ -30,6 +34,8 @@ RDEPEND="${RDEPEND} !<media-libs/gst-plugins-base-0.10.36-r1" # ^^ multi-abi-support +MULTILIB_PARALLEL_PHASES="src_configure src_compile" + src_prepare() { # Disable silly test that's not guaranteed to pass on an arbitrary machine epatch "${FILESDIR}/${PN}-0.10.36-disable-test_fail_abstract_new.patch" @@ -49,7 +55,7 @@ src_prepare() { # Disable windows-portability tests that are relevant only on x86 and amd64 # and can fail on other arches (bug #455038) - if has x86 $(multilib_get_enabled_abis) || has amd64 $(multilib_get_enabled_abis) ; then + if ! ( use amd64 || use x86 ) ; then sed -e 's#check:\(.*\)$(CHECK_EXPORTS)#check:\1#' -i Makefile.{am,in} || die fi |