fix mplayer to build against the latest live555.com

Package-Manager: portage-2.1.2_rc4-r3

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index b15f3ce2eb213c4795f31116b7f61e471654c96a..203cacb442043dfe7330e53af37edf85650b6115 100644 (file)
--- 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.442 2006/12/23 19:07:53 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.443 2006/12/31 02:15:20 lu_zero Exp $
+
+  31 Dec 2006; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_rc1.ebuild:
+  fix mplayer to build against the latest live555.com
 
   23 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   mplayer-1.0_rc1.ebuild:

diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index b081b443613ba77d448f39ff829030d40d48a793..5ac69bc288e012d983672705793c5137b0321b8b 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -27,14 +27,14 @@ 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.ebuild 16268 RMD160 093e2c1b66d82a043f83e2ddc0c8ce210c226412 SHA1 8c0f8129178ae858e9a3ada40529bd7c3197fe4a SHA256 ee26c48efe1b2a859427a6267070386ac1282d1baf764e536ed8d4e33c44a476
-MD5 6f2e4b015b8980cf866a0a1981b93f85 mplayer-1.0_rc1.ebuild 16268
-RMD160 093e2c1b66d82a043f83e2ddc0c8ce210c226412 mplayer-1.0_rc1.ebuild 16268
-SHA256 ee26c48efe1b2a859427a6267070386ac1282d1baf764e536ed8d4e33c44a476 mplayer-1.0_rc1.ebuild 16268
-MISC ChangeLog 79531 RMD160 ed48c3abc2352ebc77038ecfeb4b6ebdb7e44ba9 SHA1 76a6dccd7eabcad417cb53a88a7ef787946c62da SHA256 5b9a815a987281598dff9520256238f18e41b198b78ecc3644ed15aebe443ddf
-MD5 2bc9ce82b926e739e795cc96b0fb01a8 ChangeLog 79531
-RMD160 ed48c3abc2352ebc77038ecfeb4b6ebdb7e44ba9 ChangeLog 79531
-SHA256 5b9a815a987281598dff9520256238f18e41b198b78ecc3644ed15aebe443ddf ChangeLog 79531
+EBUILD mplayer-1.0_rc1.ebuild 16198 RMD160 6cf9eca808b9c4cd13e79e03430364455d129a2e SHA1 6180ed6f03e4151e21fbb04c42bc85798917583d SHA256 3fccb454be3923e0f780d26b77dd09e159ee3567e3d99a6577288f704f0a61b0
+MD5 4805c855ded316d69a4ac8e37cec2690 mplayer-1.0_rc1.ebuild 16198
+RMD160 6cf9eca808b9c4cd13e79e03430364455d129a2e mplayer-1.0_rc1.ebuild 16198
+SHA256 3fccb454be3923e0f780d26b77dd09e159ee3567e3d99a6577288f704f0a61b0 mplayer-1.0_rc1.ebuild 16198
+MISC ChangeLog 79656 RMD160 424e13939974255bf10e2b25738efc0fedfd495b SHA1 d6ecb2ab9e8c59276b2c186cce662255c11bb582 SHA256 281e16c1e5003567342b46da11c99ba923ddaa115fc46995eaee3fe324060e1c
+MD5 0e508f195439fc73270b2f6c65efe4b3 ChangeLog 79656
+RMD160 424e13939974255bf10e2b25738efc0fedfd495b ChangeLog 79656
+SHA256 281e16c1e5003567342b46da11c99ba923ddaa115fc46995eaee3fe324060e1c ChangeLog 79656
 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 6bc157aaaba02233d4f5e8ee43e3a704541c9d6f..de5d872fcfb9265836b4f2f5e4a418acc756a55b 100644 (file)
--- 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.20 2006/12/23 19:07:53 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc1.ebuild,v 1.21 2006/12/31 02:15:20 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
@@ -276,10 +276,10 @@ src_compile() {
        myconf="${myconf} $(use_enable ipv6 inet6)"
        myconf="${myconf} $(use_enable joystick)"
        myconf="${myconf} $(use_enable lirc)"
-       myconf="${myconf} $(use_enable live)"
        myconf="${myconf} $(use_enable rtc)"
        myconf="${myconf} $(use_enable samba smb)"
        myconf="${myconf} $(use_enable truetype freetype)"
+       use live || myconf="${myconf} --disable-live"
        use v4l  || myconf="${myconf} --disable-tv-v4l1"
        use v4l2 || myconf="${myconf} --disable-tv-v4l2"
        use jack || myconf="${myconf} --disable-jack"
@@ -404,8 +404,6 @@ src_compile() {
                myconf="${myconf} --enable-linux-devfs"
        fi
 
-       use live && myconf="${myconf} --with-livelibdir=/usr/$(get_libdir)/live"
-
        # support for blinkenlights
        use bl && myconf="${myconf} --enable-bl"