diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-12 14:30:41 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-12 14:30:41 +0000 |
| commit | f4cac519fa51832f7d55ee49770858e3f51daa79 (patch) | |
| tree | c988e2bc5b3563da901d67683c9b20ca8d5dc949 /app-emulation/wine | |
| parent | Version bump to 4.5.21.10; fixes bug #509258 and bug #509258, proxied commit ... (diff) | |
| download | gentoo-2-f4cac519fa51832f7d55ee49770858e3f51daa79.tar.gz gentoo-2-f4cac519fa51832f7d55ee49770858e3f51daa79.tar.bz2 gentoo-2-f4cac519fa51832f7d55ee49770858e3f51daa79.zip | |
Support multilib gstreamer.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'app-emulation/wine')
| -rw-r--r-- | app-emulation/wine/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/wine/wine-1.7.19-r1.ebuild | 11 | ||||
| -rw-r--r-- | app-emulation/wine/wine-9999.ebuild | 7 |
3 files changed, 17 insertions, 7 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index 0384c867ab25..89ddff8c1ec3 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.511 2014/05/25 16:47:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.512 2014/06/12 14:30:41 mgorny Exp $ + + 12 Jun 2014; Michał Górny <mgorny@gentoo.org> wine-1.7.19-r1.ebuild, + wine-9999.ebuild: + Support multilib gstreamer. 25 May 2014; Michał Górny <mgorny@gentoo.org> wine-1.7.19-r1.ebuild, wine-9999.ebuild: diff --git a/app-emulation/wine/wine-1.7.19-r1.ebuild b/app-emulation/wine/wine-1.7.19-r1.ebuild index 579dbaa5da06..24f95f30a16a 100644 --- a/app-emulation/wine/wine-1.7.19-r1.ebuild +++ b/app-emulation/wine/wine-1.7.19-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.3 2014/05/25 16:47:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.19-r1.ebuild,v 1.4 2014/06/12 14:30:41 mgorny Exp $ EAPI="5" @@ -124,10 +124,13 @@ COMMON_DEPEND=" app-emulation/emul-linux-x86-sdl[development] media-libs/openal[abi_x86_32] ) ) - gstreamer? ( - app-emulation/emul-linux-x86-gstplugins + gstreamer? ( || ( app-emulation/emul-linux-x86-medialibs[development] - ) + ( + media-libs/gstreamer:0.10[abi_x86_32] + media-libs/gst-plugins-base:0.10[abi_x86_32] + ) + ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development] ( diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild index 0e526b12b883..b9e6baff21f7 100644 --- a/app-emulation/wine/wine-9999.ebuild +++ b/app-emulation/wine/wine-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.168 2014/05/25 16:47:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.169 2014/06/12 14:30:41 mgorny Exp $ EAPI="5" @@ -125,8 +125,11 @@ COMMON_DEPEND=" media-libs/openal[abi_x86_32] ) ) gstreamer? ( - app-emulation/emul-linux-x86-gstplugins app-emulation/emul-linux-x86-medialibs[development] + ( + media-libs/gstreamer:0.10[abi_x86_32] + media-libs/gst-plugins-base:0.10[abi_x86_32] + ) ) X? ( || ( app-emulation/emul-linux-x86-xlibs[development] |