summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Dibb <beandog@gentoo.org>2008-09-03 15:27:41 +0000
committerSteve Dibb <beandog@gentoo.org>2008-09-03 15:27:41 +0000
commit0e13090fe42f5ecf1c10f5dead622e1de14b8933 (patch)
tree55646791a3cee560a1dc8cef84ffdb42b6462440
parentFix midentify install (diff)
downloadbeandog-0e13090fe42f5ecf1c10f5dead622e1de14b8933.tar.gz
beandog-0e13090fe42f5ecf1c10f5dead622e1de14b8933.tar.bz2
beandog-0e13090fe42f5ecf1c10f5dead622e1de14b8933.zip
Update to work with latest configure changes
svn path=/; revision=14
-rw-r--r--media-video/mplayer/ChangeLog4
-rw-r--r--media-video/mplayer/Manifest1
-rw-r--r--media-video/mplayer/mplayer-9999-r3.ebuild (renamed from media-video/mplayer/mplayer-9999-r2.ebuild)29
3 files changed, 19 insertions, 15 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 2c540d3..65d8122 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 03 Sep 2008; Steve Dibb <beandog@gentoo.org> -mplayer-9999-r2.ebuild,
+ +mplayer-9999-r3.ebuild:
+ Update to work with latest configure changes
+
20 Aug 2008; Steve Dibb <beandog@gentoo.org> mplayer-9999-r2.ebuild:
Fix midentify install
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index acb76c9..f8e8953 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -4,4 +4,5 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e
DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
DIST svgalib_helper-1.9.17-mplayer.tar.bz2 7234 RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 SHA1 d2d596f1ddd283188b2990417d22903c0b466d25 SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5
EBUILD mplayer-9999-r2.ebuild 17091 RMD160 e673c9b8fc61031bbde27af28b4933abff4444e0 SHA1 d62d712922bb43a93e2f7639b03a1d64ad30fb89 SHA256 dec78499d3f491945272fe5e33383fc2dd5e74bfc91b5e58e1d0e710c5c8438d
+EBUILD mplayer-9999-r3.ebuild 17345 RMD160 f533feff18fb36beb816d404d4ef53546e75039c SHA1 9484a9be7af2aab52bad1781d8cadc14d1973e4b SHA256 771327f5e858f0979f03dc3aa69e5de451242228accdd260adc2d70d6906167d
MISC ChangeLog 720 RMD160 2854e98f0321b40dcd1ebb41293259719373314d SHA1 b0e3a25f488e5a7d7611cf239ff950ff513d731b SHA256 00a4bd31bf76755ddca52f88dd93dfe977d1cb47a94cc69a86fda3c9fb59e260
diff --git a/media-video/mplayer/mplayer-9999-r2.ebuild b/media-video/mplayer/mplayer-9999-r3.ebuild
index aa39434..adbd36d 100644
--- a/media-video/mplayer/mplayer-9999-r2.ebuild
+++ b/media-video/mplayer/mplayer-9999-r3.ebuild
@@ -7,13 +7,13 @@ EAPI="1"
inherit eutils flag-o-matic multilib subversion
RESTRICT="strip"
-IUSE="3dnow 3dnowext +a52 aac -aalib +alsa altivec amrnb amrwb -arts bidi bl
+IUSE="3dnow 3dnowext +a52 -aalib +alsa altivec amrnb amrwb -arts bidi bl
bindist cddb cdio cdparanoia cpudetection custom-cflags debug dga dirac doc dts dvb
-directfb +dvd dvdnav dv enca encode esd -fbcon ftp -gif ggi gtk iconv ipv6 jack joystick
+directfb +dvd dvdnav dv enca encode esd faac faac-lavc faad faad-internal -fbcon ftp -gif ggi gtk iconv ipv6 jack joystick
-jpeg kernel_linux ladspa -libcaca lirc live lzo +mad -md5sum +mmx mmxext mp2
+mp3 musepack nas nemesi unicode +vorbis opengl openal oss -png -pnm pulseaudio
pvr quicktime radio -rar real rtc -samba schroedinger sdl speex srt sse sse2 ssse3 svga teletext
-tga +theora -tivo +truetype v4l v4l2 vidix win32codecs +X x264 xanim xinerama
+tga +theora -tivo tremor tremor-internal +truetype v4l v4l2 vidix win32codecs +X x264 x264-lavc xanim xinerama
+xscreensaver +xv xvid xvmc zoran"
VIDEO_CARDS="s3virge mga tdfx vesa"
@@ -210,8 +210,7 @@ src_unpack() {
src_compile() {
- local myconf=" --disable-tv-bsdbt848 \
- --disable-faad-external"
+ local myconf=" --disable-tv-bsdbt848"
# broken upstream, won't work with recent kernels
myconf="${myconf} --disable-ivtv"
@@ -262,15 +261,6 @@ src_compile() {
--with-dvdnav-config=/usr/bin/dvdnav-config"
fi
- if use encode; then
- use aac || myconf="${myconf} --disable-faac"
- use dv || myconf="${myconf} --disable-libdv"
- use x264 || myconf="${myconf} --disable-x264"
- else
- myconf="${myconf} --disable-mencoder --disable-libdv --disable-x264 \
- --disable-faac"
- fi
-
# SRT (subtitles) requires freetype support
# freetype support requires iconv
# iconv optionally can use unicode
@@ -291,6 +281,7 @@ src_compile() {
use rar || myconf="${myconf} --disable-unrarexec"
use rtc || myconf="${myconf} --disable-rtc"
use samba || myconf="${myconf} --disable-smb"
+ use encode || myconf="${myconf} --disable-mencoder"
# DVB / Video4Linux / Radio support
if { use dvb || use pvr || use v4l || use v4l2 || use radio; }; then
@@ -316,19 +307,27 @@ src_compile() {
for x in gif jpeg live mad musepack pnm speex tga theora xanim xvid; do
use ${x} || myconf="${myconf} --disable-${x}"
done
- use aac || myconf="${myconf} --disable-faad-internal"
use amrnb || myconf="${myconf} --disable-libamr_nb"
use amrwb || myconf="${myconf} --disable-libamr_wb"
use dirac || myconf="${myconf} --disable-libdirac-lavc"
use dts || myconf="${myconf} --disable-libdca"
+ use dv || myconf="${myconf} --disable-libdv"
+ use faac || myconf="${myconf} --disable-faac"
+ use faac-lavc || myconf="${myconf} --disable-faac-lavc"
+ use faad || myconf="${myconf} --disable-faad"
+ use faad-internal || myconf="${myconf} --disable-faad-internal"
! use png && ! use gtk && myconf="${myconf} --disable-png"
use lzo || myconf="${myconf} --disable-liblzo"
use encode && use mp2 || myconf="${myconf} --disable-twolame \
--disable-toolame"
use mp3 || myconf="${myconf} --disable-mp3lib"
use schroedinger || myconf="${myconf} --disable-libschroedinger-lavc"
+ use tremor || myconf="${myconf} --disable-tremor"
+ use tremor-internal || myconf="${myconf} --disable-tremor-internal"
use vorbis || myconf="${myconf} --disable-libvorbis"
use xanim && myconf="${myconf} --xanimcodecsdir=/usr/lib/xanim/mods"
+ use x264 || myconf="${myconf} --disable-x264"
+ use x264-lavc || myconf="${myconf} --disable-x264-lavc"
if use x86 || use amd64; then
# Real codec support, only available on x86, amd64
if use real && use x86; then