From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Fri, 14 Oct 2005 13:50:08 +0000 (+0000)
Subject: Different way to handle XvMC libraries: if more than one support is requested, don... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=58ef031484da91455919188756d82fa3f596e9a4;p=gentoo.git

Different way to handle XvMC libraries: if more than one support is requested, don't enable xvmc at all, don't die.
Package-Manager: portage-2.0.53_rc5
---

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/Manifest b/media-libs/xine-lib/Manifest
index 85090a4a6cd2..47777e90c82e 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 095feb2168f12a337f2f2461d3999d54 ChangeLog 16409
+MD5 d73e8c0308449112849cb48bb54ff47a ChangeLog 16611
 MD5 9678227c043f04d5e8561cb6ba80d3e6 files/digest-xine-lib-1.0.1-r4 137
 MD5 33da8deb9637be23cd464aba9c5c4ac4 files/digest-xine-lib-1.1.0 137
 MD5 3d6e1d0e96ea02e463d045cd83e2e32f files/digest-xine-lib-1.1.0-r5 138
@@ -11,13 +11,13 @@ MD5 cd292167e0ca6e7910e1cf32091e3a27 files/xine-lib-formatstring.patch 315
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 MD5 6b76f6f5129a29911fd681772ba92601 xine-lib-1.0.1-r4.ebuild 7507
 MD5 6d96166f223f8fbeecbdc2acaf32ccb3 xine-lib-1.1.0-r5.ebuild 6845
-MD5 93ce75c20fa078abf527bf9f07a315b5 xine-lib-1.1.0-r6.ebuild 6946
+MD5 e127cf5b8fcdf3d9c094cc34efb6fb34 xine-lib-1.1.0-r6.ebuild 6833
 MD5 1a7fe2febb92bcbc715be3fcdb0d8361 xine-lib-1.1.0.ebuild 7277
 MD5 c87a2009ccb1471f8011d312a14602d2 xine-lib-1_rc8-r2.ebuild 5296
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDS7xGj5H05b2HAEkRAlCFAJ9XTMVcUMieOtGhK5h4F0QNt1W0yQCcCEPH
-7OcS2qSgTcxsha/l0cn8SA4=
-=41vL
+iD8DBQFDT7ewj5H05b2HAEkRAjoQAJsE2DQzVC0UniynC6lTXoTplfjUhwCbBx7A
+XZFoMQYQu6k/uxYSt+t9Vro=
+=NVND
 -----END PGP SIGNATURE-----
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
-}