diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-10-14 13:50:08 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-10-14 13:50:08 +0000 |
| commit | 5bd5023c5c3617788c03fc32c3f2d74a1bed36d8 (patch) | |
| tree | 4dfb45c7cdcafa3c303d8a924b625fb01eec428a | |
| parent | Stable on sparc (diff) | |
| download | gentoo-2-5bd5023c5c3617788c03fc32c3f2d74a1bed36d8.tar.gz gentoo-2-5bd5023c5c3617788c03fc32c3f2d74a1bed36d8.tar.bz2 gentoo-2-5bd5023c5c3617788c03fc32c3f2d74a1bed36d8.zip | |
Different way to handle XvMC libraries: if more than one support is requested, don't enable xvmc at all, don't die.
(Portage version: 2.0.53_rc5)
| -rw-r--r-- | media-libs/xine-lib/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild | 36 |
2 files changed, 24 insertions, 19 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index 38b67ef44d2c..390df0ed6238 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/xine-lib # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.264 2005/10/11 13:20:16 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.265 2005/10/14 13:50:08 flameeyes Exp $ + + 14 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> + xine-lib-1.1.0-r6.ebuild: + Different way to handle XvMC libraries: if more than one support is + requested, don't enable xvmc at all, don't die. 11 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> xine-lib-1.1.0-r6.ebuild: diff --git a/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild b/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild index 75315ad6e0c6..fbae6e4ba538 100644 --- a/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild +++ b/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild,v 1.3 2005/10/11 13:20:17 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.0-r6.ebuild,v 1.4 2005/10/14 13:50:08 flameeyes Exp $ inherit eutils flag-o-matic toolchain-funcs libtool autotools @@ -135,22 +135,28 @@ src_compile() { if use xvmc; then count="0" - use nvidia && count="`expr ${count} + 1`" - use i8x0 && count="`expr ${count} + 1`" - use cle266 && count="`expr ${count} + 1`" + if use nvidia; then + count="`expr ${count} + 1`" + xvmclib="XvMCNVIDIA" + fi + + if use i8x0; then + count="`expr ${count} + 1`" + xvmclib="I810XvmC" + fi + + if use cle266; then + count="`expr ${count} + 1`" + xvmclib="viaXvMC" + fi + if [[ "${count}" -gt "1" ]]; then eerror "Invalid combination of USE flags" eerror "When building support for xvmc, you may only include support for one video card:" eerror " nvidia, i8x0, cle266" eerror "" - die "emerge again with different USE flags" - fi - - use nvidia && xvmclib="XvMCNVIDIA" - use i8x0 && xvmclib="I810XvmC" - use cle266 && xvmclib="viaXvMC" - - if [[ -n "${xvmclib}" ]]; then + eerror "XvMC support will not be built." + elif [[ -n "${xvmclib}" ]]; then xvmcconf="--with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}" xvmcdir=$(get_x11_dir libXvMC.so) @@ -224,9 +230,3 @@ src_install() { rm -rf ${D}/usr/share/doc/xine } - -pkg_postinst() { - einfo - einfo "Make sure to remove your ~/.xine if upgrading from a pre-1.0 version." - einfo -} |