Disable ivtv video output support, bug 164748

Package-Manager: portage-2.1.1-r2

5 files changed, 30 insertions, 23 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 153685a94b3a..d5225bb87e99 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.450 2007/01/30 15:26:30 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.451 2007/02/01 14:34:39 beandog Exp $
+
+  01 Feb 2007; Steve Dibb <beandog@gentoo.org> mplayer-1.0_rc1.ebuild,
+  mplayer-1.0_rc1-r1.ebuild, mplayer-1.0_rc1-r2.ebuild:
+  Disable ivtv video output support, bug 164748
 
 *mplayer-1.0_rc1-r2 (30 Jan 2007)
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index bf41276071e0..21789bf54b59 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -32,22 +32,22 @@ EBUILD mplayer-1.0_pre8.ebuild 15497 RMD160 d343eaf934f9191ab5d1b4027a1e08b69bdb
 MD5 eb557ebfff47ddb8e4661c9cb580385f mplayer-1.0_pre8.ebuild 15497
 RMD160 d343eaf934f9191ab5d1b4027a1e08b69bdbd3a5 mplayer-1.0_pre8.ebuild 15497
 SHA256 04250054cfc7932d6b016fa4f474c3e2bbed1837c1b8b154ddb9f79b8f09285e mplayer-1.0_pre8.ebuild 15497
-EBUILD mplayer-1.0_rc1-r1.ebuild 16332 RMD160 99da3d3b626543cd23139faf14b780bc2af1059d SHA1 5dcff4ed72e1fd8bdb6255f29cffcad4ad12bb80 SHA256 c38f64c84941009f1f7f554cd41af1890cff0c9766f4ac38c19b10d50f9545ea
-MD5 2f4cf5ba1c04096a4921859b68751d7c mplayer-1.0_rc1-r1.ebuild 16332
-RMD160 99da3d3b626543cd23139faf14b780bc2af1059d mplayer-1.0_rc1-r1.ebuild 16332
-SHA256 c38f64c84941009f1f7f554cd41af1890cff0c9766f4ac38c19b10d50f9545ea mplayer-1.0_rc1-r1.ebuild 16332
-EBUILD mplayer-1.0_rc1-r2.ebuild 16389 RMD160 91f9750675c495a415d3c3dc776ffba5cba894a0 SHA1 218efab757dfec82af48710143c92c23f9a7a072 SHA256 04c9f2a5c6a72097d1abbe4660eb0ce12923133e0916b33bd14acbef4ff37c89
-MD5 d149f738a98768473a0154692a5a5585 mplayer-1.0_rc1-r2.ebuild 16389
-RMD160 91f9750675c495a415d3c3dc776ffba5cba894a0 mplayer-1.0_rc1-r2.ebuild 16389
-SHA256 04c9f2a5c6a72097d1abbe4660eb0ce12923133e0916b33bd14acbef4ff37c89 mplayer-1.0_rc1-r2.ebuild 16389
-EBUILD mplayer-1.0_rc1.ebuild 16213 RMD160 08007c60a53f8795dcd5b640c89c9984ba7a658a SHA1 434154dca4ed96fd77fa66f9c0980fe10d285d12 SHA256 24dbfab9f02f2cd47dae7bc66a96c5c2594766a9c557b3f0ac10ae1cd6709e63
-MD5 81ec348dcd18d9fc78f3993272cf2f97 mplayer-1.0_rc1.ebuild 16213
-RMD160 08007c60a53f8795dcd5b640c89c9984ba7a658a mplayer-1.0_rc1.ebuild 16213
-SHA256 24dbfab9f02f2cd47dae7bc66a96c5c2594766a9c557b3f0ac10ae1cd6709e63 mplayer-1.0_rc1.ebuild 16213
-MISC ChangeLog 80620 RMD160 b7f33a5db1e82b912d958aaf40f0d4b1fe91ad1d SHA1 d0dde9ce1ace003d5612555cb4e36e927a89f5ef SHA256 98045b69ba26ab21cbeb4c75172f9bd7d14be3ea96d60de5705d8456025d596d
-MD5 efe359b502f02b50fc073e02ab34c0d4 ChangeLog 80620
-RMD160 b7f33a5db1e82b912d958aaf40f0d4b1fe91ad1d ChangeLog 80620
-SHA256 98045b69ba26ab21cbeb4c75172f9bd7d14be3ea96d60de5705d8456025d596d ChangeLog 80620
+EBUILD mplayer-1.0_rc1-r1.ebuild 16371 RMD160 56b3bded2bd3befc12217e10f7206579164d8530 SHA1 335c35c8026d4eff1cfeced8dfa882d11673f4a9 SHA256 ee82ada04b8833d922c7b2f5d9dec44e079405f2f3cc1c8f27451a12c82e384b
+MD5 382390159d7046d162b6efb9e7ee86dc mplayer-1.0_rc1-r1.ebuild 16371
+RMD160 56b3bded2bd3befc12217e10f7206579164d8530 mplayer-1.0_rc1-r1.ebuild 16371
+SHA256 ee82ada04b8833d922c7b2f5d9dec44e079405f2f3cc1c8f27451a12c82e384b mplayer-1.0_rc1-r1.ebuild 16371
+EBUILD mplayer-1.0_rc1-r2.ebuild 16428 RMD160 bb6d1c2b989fbd5e82f444ad91fb6b3b64f2032a SHA1 64341d9ff2d28fdf1b7d8b03932a49fea8fad6fb SHA256 5b1e65bc69971055e5474193a703984db8abb152fc9d7c657228eb73a5999480
+MD5 95f41bd6b4ba7f23937d84312117d14c mplayer-1.0_rc1-r2.ebuild 16428
+RMD160 bb6d1c2b989fbd5e82f444ad91fb6b3b64f2032a mplayer-1.0_rc1-r2.ebuild 16428
+SHA256 5b1e65bc69971055e5474193a703984db8abb152fc9d7c657228eb73a5999480 mplayer-1.0_rc1-r2.ebuild 16428
+EBUILD mplayer-1.0_rc1.ebuild 16252 RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54a58 SHA1 82326953105606b7b802c45e3473303dd05e1508 SHA256 87528c199a11b40baff5e75d6fba5a83499c4bcb7e781fba3910db5423fb3e13
+MD5 3499ce30257f8bb8cc53c5c91ec31025 mplayer-1.0_rc1.ebuild 16252
+RMD160 ba27b359d588073d5fb08aeb8ae355d7e9a54a58 mplayer-1.0_rc1.ebuild 16252
+SHA256 87528c199a11b40baff5e75d6fba5a83499c4bcb7e781fba3910db5423fb3e13 mplayer-1.0_rc1.ebuild 16252
+MISC ChangeLog 80796 RMD160 8e40b8953c5fc2640a7637fd38d0949e8cd7b36c SHA1 0de9b80a9279dea1750cefd5db97c4176b8c7533 SHA256 1229417e6b10a3bfa99d7a71ce1308661de0c5b251108d108c502a4ad548b516
+MD5 5b31ea889899811dc97d89a0c62735d3 ChangeLog 80796
+RMD160 8e40b8953c5fc2640a7637fd38d0949e8cd7b36c ChangeLog 80796
+SHA256 1229417e6b10a3bfa99d7a71ce1308661de0c5b251108d108c502a4ad548b516 ChangeLog 80796
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
diff --git a/media-video/mplayer/mplayer-1.0_rc1-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc1-r1.ebuild
index fef45ade3737..572b41341d25 100644
--- a/media-video/mplayer/mplayer-1.0_rc1-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1-r1.ebuild,v 1.2 2007/01/30 15:22:24 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1-r1.ebuild,v 1.3 2007/02/01 14:34:39 beandog Exp $
 
 inherit eutils flag-o-matic
 
@@ -274,7 +274,8 @@ src_compile() {
 	# disable PVR support
 	# The build will break if you have media-tv/ivtv installed and
 	# linux-headers != 2.6.18, which is currently not keyworded
-	myconf="${myconf} --disable-pvr"
+	# See also, bug 164748
+	myconf="${myconf} --disable-pvr --disable-ivtv"
 
 	myconf="${myconf} $(use_enable ipv6 inet6)"
 	myconf="${myconf} $(use_enable joystick)"
diff --git a/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild b/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild
index 8cc42d687d44..994a6cbd0046 100644
--- a/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild,v 1.1 2007/01/30 15:26:30 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1-r2.ebuild,v 1.2 2007/02/01 14:34:39 beandog Exp $
 
 inherit eutils flag-o-matic
 
@@ -277,7 +277,8 @@ src_compile() {
 	# disable PVR support
 	# The build will break if you have media-tv/ivtv installed and
 	# linux-headers != 2.6.18, which is currently not keyworded
-	myconf="${myconf} --disable-pvr"
+	# See also, bug 164748
+	myconf="${myconf} --disable-pvr --disable-ivtv"
 
 	myconf="${myconf} $(use_enable ipv6 inet6)"
 	myconf="${myconf} $(use_enable joystick)"
diff --git a/media-video/mplayer/mplayer-1.0_rc1.ebuild b/media-video/mplayer/mplayer-1.0_rc1.ebuild
index ccd87469a658..9c9fe1db5ced 100644
--- a/media-video/mplayer/mplayer-1.0_rc1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.26 2007/01/30 15:22:24 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.27 2007/02/01 14:34:39 beandog Exp $
 
 inherit eutils flag-o-matic
 
@@ -271,7 +271,8 @@ src_compile() {
 	# disable PVR support
 	# The build will break if you have media-tv/ivtv installed and
 	# linux-headers != 2.6.18, which is currently not keyworded
-	myconf="${myconf} --disable-pvr"
+	# See also, bug 164748
+	myconf="${myconf} --disable-pvr --disable-ivtv"
 
 	myconf="${myconf} $(use_enable ipv6 inet6)"
 	myconf="${myconf} $(use_enable joystick)"