summaryrefslogtreecommitdiff
path: root/media-video/mplayer/mplayer-9999.ebuild
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/mplayer/mplayer-9999.ebuild')
-rw-r--r--media-video/mplayer/mplayer-9999.ebuild22
1 files changed, 7 insertions, 15 deletions
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 252dcec7163c..c93bd3174815 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -3,9 +3,9 @@
EAPI=6
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+EGIT_REPO_URI="https://git.videolan.org/git/ffmpeg.git"
ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3" || SVN_ECLASS=""
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3"
inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
@@ -17,7 +17,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
+vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
VIDEO_CARDS="mga tdfx"
for x in ${VIDEO_CARDS}; do
@@ -126,7 +126,6 @@ RDEPEND+="
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
- xvmc? ( x11-libs/libXvMC )
"
ASM_DEP="dev-lang/yasm"
@@ -152,8 +151,6 @@ SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
- KEYWORDS=""
fi
# faac codecs are nonfree
@@ -162,7 +159,6 @@ fi
# ass and freetype font require iconv and ass requires freetype fonts
# unicode transformations are usefull only with iconv
# radio requires oss or alsa backend
-# xvmc requires xvideo support
REQUIRED_USE="
dga? ( X )
dvdnav? ( dvd )
@@ -176,8 +172,7 @@ REQUIRED_USE="
vidix? ( X )
xinerama? ( X )
xscreensaver? ( X )
- xv? ( X )
- xvmc? ( xv )"
+ xv? ( X )"
RESTRICT="faac? ( bindist )"
pkg_setup() {
@@ -213,7 +208,7 @@ src_unpack() {
subversion_src_unpack
cd "${WORKDIR}"
rm -rf "${WORKDIR}/${P}/ffmpeg/"
- ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+ ( EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/ffmpeg/" git-r3_src_unpack )
else
unpack ${A}
fi
@@ -279,9 +274,11 @@ src_configure() {
--disable-svga --disable-svgalib_helper
--disable-ass-internal
--disable-arts
+ --disable-directfb
--disable-kai
--disable-libopus
--disable-libilbc
+ --disable-xvmc
$(use_enable network networking)
$(use_enable joystick)
"
@@ -489,11 +486,6 @@ src_configure() {
use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
use xscreensaver || myconf+=" --disable-xss"
use X || myconf+=" --disable-x11"
- if use xvmc; then
- myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
- else
- myconf+=" --disable-xvmc"
- fi
############################
# OSX (aqua) configuration #