adding patch to compile with latest libmatroska

4 files changed, 46 insertions, 13 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 88e0b9761da6..e4f038d4b31c 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.109 2004/03/16 23:28:36 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.110 2004/03/17 22:39:07 mholzer Exp $
+
+  18 Mar 2004; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre3-r1.ebuild,
+  files/mplayer-1.0_pre3-libmatroska063.diff:
+  adding patch to compile with latest libmatroska
 
   16 Mar 2004; Stephen P. Becker <geoman@gentoo.org> mplayer-1.0_pre3.ebuild:
   Added ~mips keyword.
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 4f218b44039d..dbd3c108fe42 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,21 +1,22 @@
+MD5 2d23c2a645687d95406c6a7227ab67a3 mplayer-1.0_pre1-r1.ebuild 11452
+MD5 fba3cddc229a860ee10243c57a9e7bcb mplayer-1.0_pre3-r1.ebuild 12055
 MD5 7283c56dd4492e77d4cb57fcdbfc5073 mplayer-1.0_pre2.ebuild 11644
-MD5 f2f52852127fe37ed19906370cb75c47 mplayer-1.0_pre3-r1.ebuild 11930
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 23793eed4decfff39af31a95ef52aef7 ChangeLog 18751
 MD5 c85675a19ef8ffca4ad0ef4871071998 mplayer-1.0_pre3.ebuild 11750
-MD5 2d23c2a645687d95406c6a7227ab67a3 mplayer-1.0_pre1-r1.ebuild 11452
-MD5 d6c06a2d3f8f60a954056fbb790d38b6 ChangeLog 18575
 MD5 6ef8b4233f81e3c47276ad6f220e21fb mplayer-0.92.ebuild 11770
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
-MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
-MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
-MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
+MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
 MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92 355
+MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
 MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231
 MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
-MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2 358
+MD5 89440216f99b2e09265d46fead5363fb files/digest-mplayer-1.0_pre1-r1 358
 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3 358
-MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
 MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049
-MD5 89440216f99b2e09265d46fead5363fb files/digest-mplayer-1.0_pre1-r1 358
+MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810
+MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2 358
 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r1 358
+MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183
+MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520
+MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
 MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064
diff --git a/media-video/mplayer/files/mplayer-1.0_pre3-libmatroska063.diff b/media-video/mplayer/files/mplayer-1.0_pre3-libmatroska063.diff
new file mode 100644
index 000000000000..30fe7026bc63
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.0_pre3-libmatroska063.diff
@@ -0,0 +1,21 @@
+--- libmpdemux/demux_mkv.cpp	2004-03-16 21:43:06.000000000 +0100
++++ libmpdemux/demux_mkv.cpp.fixed	2004-03-16 21:44:30.000000000 +0100
+@@ -1226,7 +1226,6 @@
+   KaxCueClusterPosition *ccpos;
+   KaxCueTrack *ctrack;
+   KaxCueTrackPositions *ctrackpos;
+-  KaxCueReference *cref;
+   int upper_lvl_el, i, k;
+   uint64_t tc_scale, filepos = 0, timecode = 0;
+   uint32_t tnum = 0;
+@@ -1300,9 +1299,7 @@
+       mp_msg(MSGT_DEMUX, MSGL_DBG2, "[mkv] |   + found cue cluster "
+              "position: %llu\n", filepos);
+ 
+-      cref = FINDFIRST(ctrackpos, KaxCueReference);
+-      add_index_entry(mkv_d, tnum, filepos, timecode,
+-                      cref == NULL ? 1 : 0);
++      add_index_entry(mkv_d, tnum, filepos, timecode, 1);
+      
+       ctrackpos = FINDNEXT(cpoint, KaxCueTrackPositions, ctrackpos);
+     }
diff --git a/media-video/mplayer/mplayer-1.0_pre3-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre3-r1.ebuild
index d0bb16462195..2b1af7740151 100644
--- a/media-video/mplayer/mplayer-1.0_pre3-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r1.ebuild,v 1.1 2004/03/11 21:27:46 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre3-r1.ebuild,v 1.2 2004/03/17 22:39:07 mholzer Exp $
 
 IUSE="dga oss xmms jpeg 3dfx sse matrox sdl X svga ggi oggvorbis 3dnow aalib gnome xv opengl truetype dvd gtk gif esd fbcon encode alsa directfb arts dvb gtk2 samba lirc matroska debug joystick"
 
@@ -104,6 +104,13 @@ src_unpack() {
 	# Fix mencoder segfaulting with bad arguments
 	cd ${S}; epatch ${FILESDIR}/mencoder-segfault.patch
 
+	#Fix libmatroska 
+	if has_version '>=libmatroska-0.6.3'
+	then
+		cd ${S}; epatch ${FILESDIR}/${P}-libmatroska063.diff
+	fi
+
+
 	# Fix hppa detection
 	[ "${ARCH}" = "hppa" ] && sed -i -e "s/9000*/parisc*/" "${S}/configure"