From 4a3b864e31e3385f256094ffe3ccd4682bff5cba Mon Sep 17 00:00:00 2001 From: Steve Dibb Date: Fri, 1 Dec 2006 16:32:04 +0000 Subject: [PATCH] Disable pvr support Package-Manager: portage-2.1.1-r2 --- media-video/mplayer/ChangeLog | 5 ++++- media-video/mplayer/Manifest | 16 ++++++++-------- media-video/mplayer/mplayer-1.0_rc1.ebuild | 8 +++++++- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index e4ed0bdb07e3..2e5394831a9a 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/mplayer # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.436 2006/11/21 20:43:05 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.437 2006/12/01 16:32:04 beandog Exp $ + + 01 Dec 2006; Steve Dibb mplayer-1.0_rc1.ebuild: + Disable pvr support 21 Nov 2006; Luca Barbato mplayer-1.0_rc1.ebuild: fix the iconv-truetype logic, thanks to hansmi for pointing the issue diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index fdff44ac923a..3d4cb24643ff 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -27,14 +27,14 @@ EBUILD mplayer-1.0_pre8.ebuild 15502 RMD160 f5a95b76f748d84dd3c9f48250abdb371f0c MD5 db980765b40b1685613b1c2b3f91ecbc mplayer-1.0_pre8.ebuild 15502 RMD160 f5a95b76f748d84dd3c9f48250abdb371f0c1143 mplayer-1.0_pre8.ebuild 15502 SHA256 064f4421b0e091fba4c575b09cedd21cf6c4b8757bdc4608519d63d5b2dd5c9e mplayer-1.0_pre8.ebuild 15502 -EBUILD mplayer-1.0_rc1.ebuild 15946 RMD160 bf3f007342f0a2c17a1a0b70daa83d5c3925373c SHA1 544a3cbe55317206f7d18c8fafa550b423cb48da SHA256 dd6de14693f8c7e6b9fd3e053beffc6f8f9e476c2705cf14569ecb2bf2704788 -MD5 d7b657dfa2cdf95083945987b8019d83 mplayer-1.0_rc1.ebuild 15946 -RMD160 bf3f007342f0a2c17a1a0b70daa83d5c3925373c mplayer-1.0_rc1.ebuild 15946 -SHA256 dd6de14693f8c7e6b9fd3e053beffc6f8f9e476c2705cf14569ecb2bf2704788 mplayer-1.0_rc1.ebuild 15946 -MISC ChangeLog 78748 RMD160 96808582f20b88fef5d9a5343ca681ca0d8daa7f SHA1 aa3f9626681db436d06d62b78b44b36fae864864 SHA256 617fbc39515e11c82f268bd8a01cab6685a52781b953f6b1c603da9073559e1c -MD5 47d7b887a3b27feadf4247ac8fb674b5 ChangeLog 78748 -RMD160 96808582f20b88fef5d9a5343ca681ca0d8daa7f ChangeLog 78748 -SHA256 617fbc39515e11c82f268bd8a01cab6685a52781b953f6b1c603da9073559e1c ChangeLog 78748 +EBUILD mplayer-1.0_rc1.ebuild 16130 RMD160 9f6a85548a4121692d2f9510cd513dc0217517f1 SHA1 483a9588a9df81e2dfe684438351703ae23fac2a SHA256 7875d37522025f4db7cd03b3148ed86c99b121f73b6a2f2b7d939663ec4df913 +MD5 f08411b634688e37bc87746251e044e1 mplayer-1.0_rc1.ebuild 16130 +RMD160 9f6a85548a4121692d2f9510cd513dc0217517f1 mplayer-1.0_rc1.ebuild 16130 +SHA256 7875d37522025f4db7cd03b3148ed86c99b121f73b6a2f2b7d939663ec4df913 mplayer-1.0_rc1.ebuild 16130 +MISC ChangeLog 78842 RMD160 02ff1d5f90e593365c353239cc88f1214923b596 SHA1 e80ee263e26a7bec5f985c786e3407c2f4fc489e SHA256 4a47c31332ff4a07ba7cbf364b741a4d2d664e57723f0810233d13c14fdd912f +MD5 ddc572100616439e422f2cbc5bba633f ChangeLog 78842 +RMD160 02ff1d5f90e593365c353239cc88f1214923b596 ChangeLog 78842 +SHA256 4a47c31332ff4a07ba7cbf364b741a4d2d664e57723f0810233d13c14fdd912f ChangeLog 78842 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.ebuild b/media-video/mplayer/mplayer-1.0_rc1.ebuild index c2fbb8096d29..f5742919cca4 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-2006 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.14 2006/11/21 20:43:05 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.15 2006/12/01 16:32:04 beandog Exp $ inherit eutils flag-o-matic @@ -264,6 +264,12 @@ src_compile() { else myconf="${myconf} --disable-png" fi + + # 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" + myconf="${myconf} $(use_enable ipv6 inet6)" myconf="${myconf} $(use_enable joystick)" myconf="${myconf} $(use_enable lirc)" -- 2.26.2