summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/mplayer2/ChangeLog6
-rw-r--r--media-video/mplayer2/mplayer2-2.0.ebuild13
-rw-r--r--media-video/mplayer2/mplayer2-9999.ebuild13
3 files changed, 13 insertions, 19 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 432af9768a66..7ef14c1025d3 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.12 2011/04/03 22:16:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.13 2011/04/04 12:44:34 scarabeus Exp $
+
+ 04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
+ mplayer2-9999.ebuild:
+ Allow enabling/disabling xvid decoding over xvid.
03 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild,
mplayer2-9999.ebuild:
diff --git a/media-video/mplayer2/mplayer2-2.0.ebuild b/media-video/mplayer2/mplayer2-2.0.ebuild
index 9fe7aaa3907e..9226000bc15e 100644
--- a/media-video/mplayer2/mplayer2-2.0.ebuild
+++ b/media-video/mplayer2/mplayer2-2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.9 2011/04/03 22:16:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.10 2011/04/04 12:44:34 scarabeus Exp $
EAPI=4
@@ -19,7 +19,7 @@ libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas
+network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3
tga +theora +truetype +unicode v4l v4l2 vdpau
-+vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvmc"
++vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid xvmc"
VIDEO_CARDS="s3virge mga tdfx vesa"
for x in ${VIDEO_CARDS}; do
@@ -125,6 +125,7 @@ RDEPEND+="
truetype? ( ${FONT_RDEPS} )
vorbis? ( media-libs/libvorbis )
xanim? ( media-video/xanim )
+ xvid? ( media-libs/xvid )
"
X_DEPS="
@@ -379,17 +380,11 @@ src_configure() {
for i in ${uses}; do
use ${i} || myconf+=" --disable-lib${i}"
done
- uses="faad gif jpeg live mad mng png pnm speex tga theora xanim"
+ uses="faad gif jpeg live mad mng png pnm speex tga theora xanim xvid"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
- # Encoding
- uses="xvid"
- for i in ${uses}; do
- myconf+=" --disable-${i}"
- done
-
#################
# Binary codecs #
#################
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index 1d09d634c7dd..2098b60d038a 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.10 2011/04/03 22:16:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.11 2011/04/04 12:44:34 scarabeus Exp $
EAPI=4
@@ -19,7 +19,7 @@ libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 nas
+network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime
radio +rar +real +rtc samba +shm sdl +speex sse sse2 ssse3
tga +theora +truetype +unicode v4l v4l2 vdpau
-+vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvmc"
++vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvid xvmc"
VIDEO_CARDS="s3virge mga tdfx vesa"
for x in ${VIDEO_CARDS}; do
@@ -125,6 +125,7 @@ RDEPEND+="
truetype? ( ${FONT_RDEPS} )
vorbis? ( media-libs/libvorbis )
xanim? ( media-video/xanim )
+ xvid? ( media-libs/xvid )
"
X_DEPS="
@@ -378,17 +379,11 @@ src_configure() {
for i in ${uses}; do
use ${i} || myconf+=" --disable-lib${i}"
done
- uses="faad gif jpeg live mad mng png pnm speex tga theora xanim"
+ uses="faad gif jpeg live mad mng png pnm speex tga theora xanim xvid"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
- # Encoding
- uses="xvid"
- for i in ${uses}; do
- myconf+=" --disable-${i}"
- done
-
#################
# Binary codecs #
#################