summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris White <chriswhite@gentoo.org>2004-07-29 22:08:58 +0000
committerChris White <chriswhite@gentoo.org>2004-07-29 22:08:58 +0000
commit225f618a600a532bba550a89fe5624be6bc83bd3 (patch)
tree6c6509d0ee0369b34f438d85d940bd3e5a62a2ce /media-video
parentFixed ocaml bindings problem. Bug 56682 (Manifest recommit) (diff)
downloadgentoo-2-225f618a600a532bba550a89fe5624be6bc83bd3.tar.gz
gentoo-2-225f618a600a532bba550a89fe5624be6bc83bd3.tar.bz2
gentoo-2-225f618a600a532bba550a89fe5624be6bc83bd3.zip
Added fix for latest live-2004-07* for live USE flag. Fixes Bug #58807.
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/Manifest4
-rw-r--r--media-video/mplayer/files/mplayer-1.0_pre5-live.patch11
-rw-r--r--media-video/mplayer/mplayer-1.0_pre5-r2.ebuild5
4 files changed, 23 insertions, 3 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index e3d2d0a40c8e..ffcaee7579ed 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.184 2004/07/29 02:35:00 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.185 2004/07/29 22:08:57 chriswhite Exp $
+
+ 30 Jul 2004; Chris White <chriswhite@gentoo.org>
+ +files/mplayer-1.0_pre5-live.patch, mplayer-1.0_pre5-r2.ebuild:
+ Added fix for latest live-2004-07* for live USE flag. Fixes Bug #58807.
29 Jul 2004; Chris White <chriswhite@gentoo.org> mplayer-1.0_pre4-r7.ebuild,
mplayer-1.0_pre5-r2.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 7e522c1d80df..9d8c4f7625aa 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -11,7 +11,8 @@ MD5 6b9e16c4f08ac48748812909ed431f31 mplayer-1.0_pre4-r3.ebuild 13034
MD5 d13f33f9022f7abccfe9b14f96531057 mplayer-1.0_pre4-r4.ebuild 13157
MD5 5723f9ec95de90648f429ee43dfa8770 mplayer-1.0_pre4-r7.ebuild 12631
MD5 071a354aa3c0e9290b6dcfc8c3621d87 mplayer-1.0_pre4.ebuild 11319
-MD5 b030a2265620c083219a7eb9e18aa9c6 mplayer-1.0_pre5-r2.ebuild 13933
+MD5 8c44230452a49ee5ae57a63f75e865c4 mplayer-1.0_pre5-r2.ebuild 14028
+MD5 1e2f2ed8521a60fb0a51e4b5e425e73f mplayer-1.0_pre5-r2.ebuild~ 14016
MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355
@@ -55,5 +56,6 @@ MD5 084f1aa4fbe48d34c3154d5a4f238579 files/amd64_fix_the_blue_love.patch 17751
MD5 7dce8f2598e84e3d94186e2eb50f553b files/mplayer-1.0_pre4-mga-kernel2.6.patch 27826
MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358
+MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
MD5 368c4627025375cafb694d5a1cf82aa2 files/mplayer-1.0_pre5-alsa-gui.patch 31662
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-live.patch b/media-video/mplayer/files/mplayer-1.0_pre5-live.patch
new file mode 100644
index 000000000000..1cd4c1143845
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.0_pre5-live.patch
@@ -0,0 +1,11 @@
+--- libmpdemux/demux_rtp.cpp 2004-07-30 06:38:43.462828624 +0900
++++ /home/chris/main/libmpdemux/demux_rtp.cpp 2004-07-29 16:15:36.000000000 +0900
+@@ -407,7 +407,7 @@
+ delete rtpState->sdpDescription;
+ delete rtpState;
+
+- delete env; delete scheduler;
++ env->reclaim(); delete scheduler;
+ }
+
+ ////////// Extra routines that help implement the above interface functions:
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild
index b7909ea823ff..d83ee83eacc4 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild,v 1.9 2004/07/29 02:35:00 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r2.ebuild,v 1.10 2004/07/29 22:08:57 chriswhite Exp $
inherit eutils flag-o-matic kmod
@@ -127,6 +127,9 @@ src_unpack() {
#bug #58082. Fixes LANGUAGE variable issues
epatch ${FILESDIR}/mplayer-1.0_pre5-r1-conf_locale.patch
+ #fixes recent api changes to the latest live
+ use live && epatch ${FILESDIR}/${P}-live.patch
+
#mplayer gui uses oss all the time.
#this patch enables true alsa output in
#gmplayer. Fixes Bug #58619.