summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Holzer <mholzer@gentoo.org>2003-10-18 23:00:18 +0000
committerMartin Holzer <mholzer@gentoo.org>2003-10-18 23:00:18 +0000
commit44992a1647a9e07fce92c93bba7aa6c14b8428f6 (patch)
treebbbca81e74701163915d5fb5fdbbb641342639ca
parentadd wxGTK unicode check (diff)
downloadgentoo-2-44992a1647a9e07fce92c93bba7aa6c14b8428f6.tar.gz
gentoo-2-44992a1647a9e07fce92c93bba7aa6c14b8428f6.tar.bz2
gentoo-2-44992a1647a9e07fce92c93bba7aa6c14b8428f6.zip
added matroska support. Closes #28636.
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/Manifest6
-rw-r--r--media-video/mplayer/mplayer-1.0_pre1-r1.ebuild9
-rw-r--r--media-video/mplayer/mplayer-1.0_pre2.ebuild9
4 files changed, 22 insertions, 8 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 195926c10d7f..8cc5e8a1fb52 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.91 2003/10/13 19:15:20 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.92 2003/10/18 23:00:12 mholzer Exp $
+
+ 20 Oct 2003; Martin Holzer <mholzer@gentoo.org> mplayer-1.0_pre1-r1.ebuild,
+ mplayer-1.0_pre2.ebuild:
+ added matroska support. Closes #28636.
14 Oct 2003; Martin Holzer <mholzer@gentoo.org> mplayer-0.92.ebuild,
mplayer-1.0_pre1-r1.ebuild, mplayer-1.0_pre2.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index ce8d59fb903f..8b338614a3f9 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,7 +1,7 @@
-MD5 23a186ee55c7bfd0cb3625099c60731e ChangeLog 16270
+MD5 8a4999a5945208be3019615f1cf256c4 ChangeLog 16417
MD5 c835d9e3b9c541623c6324822cdc066c mplayer-0.92.ebuild 11816
-MD5 2fc27116e99d86a61ca833e383a1596a mplayer-1.0_pre1-r1.ebuild 11362
-MD5 adb98023d0446117e71920ca2dc3ad80 mplayer-1.0_pre2.ebuild 11275
+MD5 37d7b88f88d9fa1ce06ffa9b14ab2c8f mplayer-1.0_pre1-r1.ebuild 11523
+MD5 1a61000fe3b42bddeccc14967969b870 mplayer-1.0_pre2.ebuild 11434
MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396
MD5 89440216f99b2e09265d46fead5363fb files/digest-mplayer-1.0_pre1-r1 358
MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92 355
diff --git a/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild
index 6943581f2629..187585609e1f 100644
--- a/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2003 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_pre1-r1.ebuild,v 1.9 2003/10/13 19:15:22 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre1-r1.ebuild,v 1.10 2003/10/18 23:00:12 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"
+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"
inherit eutils
@@ -49,6 +49,7 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
encode? ( media-sound/lame
>=media-libs/libdv-0.9.5 )
xmms? ( media-sound/xmms )
+ matroska? ( >=media-libs/libmatroska-0.5.0 )
opengl? ( virtual/opengl )
directfb? ( dev-libs/DirectFB )
oggvorbis? ( media-libs/libvorbis )
@@ -240,6 +241,10 @@ src_compile() {
use lirc \
&& myconf="${myconf} --enable-lirc" \
|| myconf="${myconf} --disable-lirc"
+
+ use matroska \
+ && myconf="${myconf} --enable-matroska" \
+ || myconf="${myconf} --disable-matroska"
if [ -d /opt/RealPlayer9/Real/Codecs ]
then
diff --git a/media-video/mplayer/mplayer-1.0_pre2.ebuild b/media-video/mplayer/mplayer-1.0_pre2.ebuild
index 03df5c3c8e72..d22796b42c3b 100644
--- a/media-video/mplayer/mplayer-1.0_pre2.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2003 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_pre2.ebuild,v 1.8 2003/10/13 19:15:22 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre2.ebuild,v 1.9 2003/10/18 23:00:12 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"
+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"
inherit eutils
@@ -49,6 +49,7 @@ RDEPEND="ppc? ( >=media-libs/xvid-0.9.0 )
encode? ( media-sound/lame
>=media-libs/libdv-0.9.5 )
xmms? ( media-sound/xmms )
+ matroska? ( >=media-libs/libmatroska-0.5.0 )
opengl? ( virtual/opengl )
directfb? ( dev-libs/DirectFB )
oggvorbis? ( media-libs/libvorbis )
@@ -238,6 +239,10 @@ src_compile() {
&& myconf="${myconf} --enable-lirc" \
|| myconf="${myconf} --disable-lirc"
+ use matroska \
+ && myconf="${myconf} --enable-matroska" \
+ || myconf="${myconf} --disable-matroska"
+
if [ -d /opt/RealPlayer9/Real/Codecs ]
then
einfo "Setting REALLIBDIR to /opt/RealPlayer9/Real/Codecs..."