summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/mplayer2/ChangeLog8
-rw-r--r--media-video/mplayer2/Manifest34
-rw-r--r--media-video/mplayer2/mplayer2-2.0_p20120902.ebuild548
-rw-r--r--media-video/mplayer2/mplayer2-9999.ebuild4
4 files changed, 575 insertions, 19 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog
index 1500dad242e8..434577c44fcd 100644
--- a/media-video/mplayer2/ChangeLog
+++ b/media-video/mplayer2/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-video/mplayer2
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.63 2012/08/13 13:19:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.64 2012/09/02 10:14:23 scarabeus Exp $
+
+*mplayer2-2.0_p20120902 (02 Sep 2012)
+
+ 02 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+ +mplayer2-2.0_p20120902.ebuild, mplayer2-9999.ebuild:
+ Add new snapshot. Update bit live ebuild wrt aqua use.
13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+files/mplayer2-py2compat.patch, mplayer2-9999.ebuild:
diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest
index 5ba47dfe6b7f..1e08e9859159 100644
--- a/media-video/mplayer2/Manifest
+++ b/media-video/mplayer2/Manifest
@@ -5,25 +5,27 @@ AUX mplayer2-py2compat.patch 2054 SHA256 19fc7ab3d8efa867b1768b687c5c91cd588dc07
DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12
DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29
DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1
-DIST mplayer2-2.0_p20120309.tar.xz 3328620 SHA256 8a46e0be27dd479c91bde64a35725c6ff668e5a74ab3a56ac3fe29d16f6a0a31
+DIST mplayer2-2.0_p20120309.tar.xz 3328620 SHA256 8a46e0be27dd479c91bde64a35725c6ff668e5a74ab3a56ac3fe29d16f6a0a31 SHA512 c9b1eda3cfc6279a96864aad9a6096b36742460233f03d715b94437e8ffbb1086d006f379f8fb4d7e2b7598ce810e62b5f88151832b19d8459344079fa55fe67 WHIRLPOOL 15522e5bf9c2fdabc86c23122159b7f9ee855211eb4ae088f1ebff07bb8dcb4b763d61c49ba31ea18d3e3c237a60e685a23e4fac71bf94b1af80f84c638d9fd3
+DIST mplayer2-2.0_p20120902.tar.xz 1734840 SHA256 bbb1d378f699aac8ca4e9526f7ac5a1fa4650d079870f1eddf03b273984d0592 SHA512 b8702240a9bb221a007cacc4b919436de506625f7bc9c3442e8a83a2935e860003a3c742e0811bd413c669d3cc287f65f1cde42b32ac9c93a220c077ffcb3b35 WHIRLPOOL bb02835ab2df8af58c6f146915abf0bdca1908a2f5afa603ca13c941a35366dac7bc3c409a0b08aae97b3c4ba1b8cc2bf36b6cfa56f6bcd987269781f44abf8a
EBUILD mplayer2-2.0_p20120309.ebuild 16416 SHA256 aaafe58532a1c4e263b1433d962b11fc8b67af3e24e603413c5c9300981f1276 SHA512 dc9b495fa441ecfa517f06e66952565c35aa84d9597a9e936d901a12b61233e5e483f86f04c07bd552f25dc75654c434284f617e8c5c28174e45c71b63713c2a WHIRLPOOL 7a9418dc7a920f00c318a5135788b32397faef62a8b37cea7654e1bb33928e0182eeccce28b90a9fbabde829a174309a76b4c63916d72ef8a47e45262e4b3793
-EBUILD mplayer2-9999.ebuild 14687 SHA256 919a758190bcab376dc5bb5b2fd5fbfe26403a6da2af5b4c65699b4d53e69902 SHA512 245e35d844633ad3f1cdacf0c61efd72c157a2d1341e537da00f82d233488a72d500384df2483e445d9a28e305826f167441e18e112e72948cf7c8769403875b WHIRLPOOL c640698c4391e6e0e843cfd0093ec1b8c5e437af9c4d7cecdb1be5112b18a3707d69bf4f5e382367ca4298719850eddeca7281c571a746e45a3ee886608fbd0f
-MISC ChangeLog 13244 SHA256 908b99feecafa1708e45c3fcb61c154310c954f6130cbdbaa234c145b978914f SHA512 59bac7ae67451707bd798012fdb1d7bc51a25f2ef1edd37131ec8a41132259f1f33290fc71edc320daf50fc6d608c1b895764fbabfb15a4bf1686c4a54a62c78 WHIRLPOOL 95f8f27d066b674257a753529d7818cff1a7ce057f7bda4a58c5283acbf9c359a5d81b207aa483f9188e59c86c834b791515e1f3328a305db837a43e1e23cddf
+EBUILD mplayer2-2.0_p20120902.ebuild 14715 SHA256 e656daeffe14b481557a7678b655b2b4cc5d29ddab2d75f43e54ff485731ff5d SHA512 c7c876fabf004be45dac62bb68bcb9c9a3c55531dd0242cedf32f7c8b1998c0f5f8cdae64af96b4a9ba0a8e6d571f981557eb8a1e47238f3951baf60dc0445b1 WHIRLPOOL 83c0ebf5f9b46812184f4dffe829af0bbe4fed067a50f769846a3dfd6463ccd53143561fbc57201bf49a80eb3146d838c0e8b07543fe52f1c4ca421df429bc5b
+EBUILD mplayer2-9999.ebuild 14699 SHA256 b2a9b12a69cb28d6b02e903db5f44d6ee5c344685a928353061abba0a22d7f84 SHA512 66ee1a9f717dcb86621c018adacc0b4a3cb858181c64118773988f2601aafd99f6f3d9976f72c9aa84b187266bab9901208c3255fcbca735658acafaa02a2bac WHIRLPOOL f2bcc38b4e8c16e04494f1d0804031499a2bf04edb328228f0b314f686190efafd77395d35f0f5f07c9c2b4a5aac02399f2dc7bb5d5f6620d46146128fac2d24
+MISC ChangeLog 13452 SHA256 d1036d100e0ae74b45df659c68d332bd8cafe8dc89982019d319be2395e7b4c1 SHA512 9e4cbd53daac577ca6cba5e98395ef972a060c4b3afa93662e30f0d70d85ee35d3ab4d9c05d3a43f9626d03bb6bd05b2a9cb5e5c9ba7703367de8af7f0b36b6e WHIRLPOOL 9359178e8be585a49309ed9fb285ca7af2d5a494ffff5c92989840a343ae1a75f1e6aee1990555153178514cc5c270a22cf0ec9bbfc4c51a5e52166cfb8baafd
MISC metadata.xml 3304 SHA256 a55a151b22e9f6c45f94422e06603643f445768d747259ed0c8a8cfb10635aad SHA512 10d16a816563586c52ace596889722b4dec99603ddc14f817ee590e018693c71ce30a2feb645922062df648d83e6aa68ec2c215e8e02384d0af1ec51af1188fa WHIRLPOOL 8a44fc1cd6897b3924d703823c701e8b490396bbe90535ec7b72600a6e0cb8afe1b40c8aea7606c150cae12805eb05868008ba9b03591f8f5b92d06ac5556cea
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQKP7FAAoJEOSiRoyO7jvoqVAP/1YHr1/6EcGeE2pTB80I+Hny
-V4Oy41ZgvL0434B4m/7kPdCb18//HC7yaUptZGlkS4J9ygdQgpvvWJpCEXhEW8n8
-6LGjIUXQq8fB24iABaMuFOkYYJ9G4GDoz1rBOHfvuOqEIPBRkaXiyP7xkRPmFAx6
-Ul+LC5fqTzZ7ckRB++0E+YZZonessCzpxAy+WuYYrQZWZh/2niucMQuIoVx3wm4z
-DukI2x+M4XDL5uOm7gGSftsSL98l+nGCD0RcMAiJgVPaXpkCg6qTVolEtajjembL
-hY51Fx3yV59U6GA2MI7oWFApU0hGEMWN9QTQWML3Xx4ohjg5eCnGOueX4ZNGL2kQ
-tOQOQ7+/V1paNdeCmkBbkdqYC0rT00VOqmHQgUPalcTrHoRQXDIfWSC5wX7zXe4N
-ObNPoKL7CCrHsVkSKXJuOXStXHvorFrUGMNx3yLwptQh5LWie56sD3Z473AkQ+hr
-MN3ua9FCvwmfJQLGNAF//ZGtuyutZWgovVaNy1Btb6qCqDqVeC/kJxSXFWsCoh3P
-R3XAqlywoLtqyagKrSwx3d5Qk4t4fs1sFqA8NKn0Z8PZTNaaHs2nuxRrqBNI7E8f
-u3Zku86O7olSyXu4UqG/b+DgII9dG9S2p/foWMoHaiOM2Z0P2B8xDp10vvOFcjrP
-el+X5P+MdkvQUdulhm59
-=jTUf
+iQIcBAEBCAAGBQJQQzGJAAoJEOSiRoyO7jvoz6IP/1qgwqncD8kKZIN6N2SGsAIu
+PBxN5t1uJWy+ut+v7Tb1AQ/WEc5Cp4+JkmfuHzBNzQTePnTWaZ9FG7GbXPWKyHns
+t1hfd55L33k+aYb1zLk9/4Re50lfLdxD95Z4MhCxplH/d2wNHhDJ7bsDTFSv9gIv
+QIJJqtHqR88ZoSWQ+JpIRqcopmudpqX0KAUZP/mw8bfTuSsPut3mVnE69WR3zJK8
+TF70twx8xRGm37hOmNb12C1EBhTs3A8xxyhQekqlD8S5BAQM31irMU8GPTwC+4f0
+qnoQ6mWsXXta8Ao5N7hL/MMFXUcnSCi9d994TrfcfRKAWEfzepmr6CO7JyQGDRF4
+yk6/wrLS64GPMEuNKgaINecGiuT0BiS8z1dUHUZXldvu24zO80BYKbP6i4osgAuz
+2JudOBOTE1BAHF8NmbXhOk78X3wodVtQ5kfMlWbPuZrZRPqgf/YbhyRA54G0TLhD
+v/zfctgTrWEnpCHt4tbfOlq7c4Welmd2wMzdkuW9trKxCAg2dNPgfqpo4gh+zKoI
+WseuVnwaBiWSFFMVr2gkFSLgsg0ySfCJfSS9vHXlDfCF9B+AtQhe7XXg3x1PcMQl
+pXh6MKSyurozZKi3Hj9ryo5ifpMEAfdHtOxN0fHB54A3qxNdDGOixZ8rTkU9VRyx
+W7jb/D5HBqi6c1SdnZ3z
+=D9u3
-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/mplayer2-2.0_p20120902.ebuild b/media-video/mplayer2/mplayer2-2.0_p20120902.ebuild
new file mode 100644
index 000000000000..674422daa170
--- /dev/null
+++ b/media-video/mplayer2/mplayer2-2.0_p20120902.ebuild
@@ -0,0 +1,548 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20120902.ebuild,v 1.1 2012/09/02 10:14:23 scarabeus Exp $
+
+EAPI=4
+
+[[ ${PV} = *9999* ]] && VCS_ECLASS="git-2" || VCS_ECLASS=""
+
+inherit toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS}
+
+NAMESUF="${PN/mplayer/}"
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayer2.org/"
+
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
+else
+ RELEASE_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
+fi
+SRC_URI="${RELEASE_URI}
+ !truetype? (
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+ )
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} == *9999* ]]; then
+ KEYWORDS=""
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
+IUSE="+a52 aalib +alsa aqua bidi bindist bl bluray bs2b cddb +cdio
+ cpudetection debug directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +faad
+ fbcon ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+ +libass libcaca lirc mad md5sum mng +mp3 nas +network nut +opengl oss png pnm
+ portaudio postproc pulseaudio pvr +quicktime radio +rar +real +rtc samba
+ sdl +speex tga +theora +truetype +unicode v4l vdpau +vorbis win32codecs +X
+ xanim xinerama +xscreensaver +xv xvid"
+IUSE+=" symlink"
+
+CPU_FEATURES="3dnow 3dnowext altivec +mmx mmxext +shm sse sse2 ssse3"
+for x in ${CPU_FEATURES}; do
+ IUSE+=" ${x}"
+done
+
+VIDEO_CARDS="s3virge mga tdfx"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+# bindist does not cope with win32codecs, which are nonfree
+REQUIRED_USE="
+ libass? ( truetype )
+ bindist? ( !win32codecs )
+ cddb? ( cdio network )
+ dvdnav? ( dvd )
+ dxr3? ( X )
+ ggi? ( X )
+ opengl? ( || ( X aqua ) )
+ radio? ( || ( dvb v4l ) )
+ truetype? ( iconv )
+ vdpau? ( X )
+ xinerama? ( X )
+ xscreensaver? ( X )
+ xv? ( X )
+"
+
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+# nemesi? ( net-libs/libnemesi )
+RDEPEND+="
+ sys-libs/ncurses
+ sys-libs/zlib
+ !bindist? (
+ x86? (
+ win32codecs? ( media-libs/win32codecs )
+ )
+ )
+ X? (
+ x11-libs/libXext
+ x11-libs/libXxf86vm
+ ggi? (
+ media-libs/libggi
+ media-libs/libggiwmh
+ )
+ opengl? ( virtual/opengl )
+ vdpau? ( x11-libs/libvdpau )
+ xinerama? ( x11-libs/libXinerama )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ xv? (
+ x11-libs/libXv
+ )
+ )
+ a52? ( media-libs/a52dec )
+ aalib? ( media-libs/aalib )
+ alsa? ( media-libs/alsa-lib )
+ bidi? ( dev-libs/fribidi )
+ bluray? ( media-libs/libbluray )
+ bs2b? ( media-libs/libbs2b )
+ cdio? ( dev-libs/libcdio )
+ directfb? ( dev-libs/DirectFB )
+ dts? ( media-libs/libdca )
+ dv? ( media-libs/libdv )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ dvd? (
+ >=media-libs/libdvdread-4.1.3
+ dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+ )
+ enca? ( app-i18n/enca )
+ faad? ( media-libs/faad2 )
+ gif? ( media-libs/giflib )
+ iconv? ( virtual/libiconv )
+ jack? ( media-sound/jack-audio-connection-kit )
+ jpeg? ( virtual/jpeg )
+ ladspa? ( media-libs/ladspa-sdk )
+ libass? ( >=media-libs/libass-0.9.10[enca?,fontconfig] )
+ libcaca? ( media-libs/libcaca )
+ lirc? ( app-misc/lirc )
+ mad? ( media-libs/libmad )
+ mng? ( media-libs/libmng )
+ mp3? ( media-sound/mpg123 )
+ nas? ( media-libs/nas )
+ nut? ( >=media-libs/libnut-661 )
+ png? ( media-libs/libpng )
+ pnm? ( media-libs/netpbm )
+ portaudio? ( >=media-libs/portaudio-19_pre20111121 )
+ postproc? ( || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) )
+ pulseaudio? ( media-sound/pulseaudio )
+ rar? (
+ || (
+ app-arch/unrar
+ app-arch/rar
+ )
+ )
+ samba? ( net-fs/samba )
+ sdl? ( media-libs/libsdl )
+ speex? ( media-libs/speex )
+ theora? ( media-libs/libtheora )
+ truetype? (
+ media-libs/fontconfig
+ >=media-libs/freetype-2.2.1:2
+ virtual/ttf-fonts
+ )
+ vorbis? ( media-libs/libvorbis )
+ xanim? ( media-video/xanim )
+ xvid? ( media-libs/xvid )
+ >=virtual/ffmpeg-0.10.2
+ symlink? ( !media-video/mplayer )
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=dev-lang/python-2.6
+ sys-devel/gettext
+ X? (
+ x11-proto/videoproto
+ x11-proto/xf86vidmodeproto
+ dxr3? ( media-video/em8300-libraries )
+ xinerama? ( x11-proto/xineramaproto )
+ xscreensaver? ( x11-proto/scrnsaverproto )
+ )
+ amd64? ( ${ASM_DEP} )
+ doc? (
+ dev-libs/libxslt app-text/docbook-xml-dtd
+ app-text/docbook-xsl-stylesheets
+ )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-py2compat.patch"
+)
+
+pkg_setup() {
+ if [[ ${PV} == *9999* ]]; then
+ elog
+ elog "This is a live ebuild which installs the latest from upstream's"
+ elog "${VCS_ECLASS} repository, and is unsupported by Gentoo."
+ elog "Everything but bugs in the ebuild itself will be ignored."
+ elog
+ fi
+
+ if use cpudetection; then
+ ewarn
+ ewarn "You've enabled the cpudetection flag. This feature is"
+ ewarn "included mainly for people who want to use the same"
+ ewarn "binary on another system with a different CPU architecture."
+ ewarn "MPlayer will already detect your CPU settings by default at"
+ ewarn "buildtime; this flag is used for runtime detection."
+ ewarn "You won't need this turned on if you are only building"
+ ewarn "mplayer for this system. Also, if your compile fails, try"
+ ewarn "disabling this use flag."
+ fi
+
+ einfo "For various format support you need to enable the support on your ffmpeg package:"
+ einfo " media-video/libav or media-video/ffmpeg"
+}
+
+src_prepare() {
+ # fix path to bash executable in configure scripts
+ local bash_scripts="configure version.sh"
+ sed -i -e "1c\#!${EPREFIX}/bin/bash" \
+ ${bash_scripts} || die
+
+ if [[ -n ${NAMESUF} ]]; then
+ sed -e "/^EXESUF/s,= \$_exesuf$,= ${NAMESUF}\$_exesuf," \
+ -i configure || die
+ sed -e "\, -m 644 DOCS/man/en/mplayer,i\ mv DOCS/man/en/mplayer.1 DOCS/man/en/${PN}.1" \
+ -e "\, -m 644 DOCS/man/\$(lang)/mplayer,i\ mv DOCS/man/\$(lang)/mplayer.1 DOCS/man/\$(lang)/${PN}.1" \
+ -e "s/er.1/er${NAMESUF}.1/g" \
+ -i Makefile || die
+ sed -e "s/mplayer/${PN}/" \
+ -i TOOLS/midentify.sh || die
+ fi
+
+ base_src_prepare
+}
+
+src_configure() {
+ local myconf=""
+ local uses i
+
+ # set LINGUAS
+ [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+
+ # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+ # compilation in almost every situation. The reason for this is
+ # because if --enable is used, it will force the build of that option,
+ # regardless of whether the dependency is available or not.
+
+ ###################
+ #Optional features#
+ ###################
+ # disable svga since we don't want it
+ # disable tremor, it needs libvorbisidec and is for FPU-less systems only
+ myconf+="
+ --disable-svga
+ --disable-tremor
+ $(use_enable network networking)
+ $(use_enable joystick)
+ "
+ uses="bl bluray enca ftp libass rtc" # nemesi <- not working with in-tree ebuild
+ myconf+=" --disable-nemesi" # nemesi automagic disable
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use bidi || myconf+=" --disable-fribidi"
+ use ipv6 || myconf+=" --disable-inet6"
+ use nut || myconf+=" --disable-libnut"
+ use rar || myconf+=" --disable-unrarexec"
+ use samba || myconf+=" --disable-smb"
+ if ! use lirc; then
+ myconf+="
+ --disable-lirc
+ --disable-lircc
+ --disable-apple-ir
+ "
+ fi
+
+ ########
+ # CDDA #
+ ########
+ use cddb || myconf+=" --disable-cddb"
+ use cdio || myconf+=" --disable-libcdio"
+
+ ################################
+ # DVD read, navigation support #
+ ################################
+ #
+ # dvdread - accessing a DVD
+ # dvdnav - navigation of menus
+ #
+ # use external libdvdcss, dvdread and dvdnav
+ myconf+=" --disable-dvdread-internal --disable-libdvdcss-internal"
+ use dvd || myconf+=" --disable-dvdread"
+ use dvdnav || myconf+=" --disable-dvdnav"
+
+ #############
+ # Subtitles #
+ #############
+ # SRT/ASS/SSA (subtitles) requires freetype support
+ # freetype support requires iconv
+ # iconv optionally can use unicode
+ use truetype || myconf+=" --disable-freetype"
+ use iconv || myconf+=" --disable-iconv --charset=noconv"
+ use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+ #####################################
+ # DVB / Video4Linux / Radio support #
+ #####################################
+ myconf+=" --disable-tv-bsdbt848"
+ # broken upstream, won't work with recent kernels
+ myconf+=" --disable-ivtv"
+ # v4l1 is gone since linux-headers-2.6.38
+ myconf+=" --disable-tv-v4l1"
+ if { use dvb || use v4l || use pvr || use radio; }; then
+ use dvb || myconf+=" --disable-dvb"
+ use pvr || myconf+=" --disable-pvr"
+ use v4l || myconf+=" --disable-tv-v4l2"
+ if use radio && { use dvb || use v4l; }; then
+ myconf+="
+ --enable-radio
+ --disable-radio-capture
+ "
+ else
+ myconf+="
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ "
+ fi
+ else
+ myconf+="
+ --disable-tv
+ --disable-tv-v4l2
+ --disable-radio
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ --disable-dvb
+ --disable-v4l2
+ --disable-pvr"
+ fi
+
+ ##########
+ # Codecs #
+ ##########
+ myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred
+ use dts || myconf+=" --disable-libdca"
+ use mp3 || myconf+=" --disable-mpg123"
+ uses="a52 bs2b dv vorbis"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-lib${i}"
+ done
+ uses="faad gif jpeg mad mng png pnm speex tga theora xanim xvid"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ myconf+=" --disable-live" # >=live-2012 are broken
+
+ #################
+ # Binary codecs #
+ #################
+ # bug 213836
+ if ! use x86 || ! use win32codecs; then
+ use quicktime || myconf+=" --disable-qtx"
+ fi
+
+ ######################
+ # RealPlayer support #
+ ######################
+ # Realplayer support shows up in four places:
+ # - libavcodec (internal)
+ # - win32codecs
+ # - realcodecs (win32codecs libs)
+ # - realcodecs (realplayer libs)
+
+ # internal
+ use real || myconf+=" --disable-real"
+
+ # Real binary codec support only available on x86, amd64
+ if use real; then
+ use x86 && myconf+=" --codecsdir=/opt/RealPlayer/codecs"
+ use amd64 && myconf+=" --codecsdir=/usr/$(get_libdir)/codecs"
+ fi
+ myconf+=" $(use_enable win32codecs win32dll)"
+
+ ################
+ # Video Output #
+ ################
+ uses="directfb md5sum sdl"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use aalib || myconf+=" --disable-aa"
+ use fbcon || myconf+=" --disable-fbdev"
+ use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
+ use libcaca || myconf+=" --disable-caca"
+ use postproc || myconf+=" --disable-libpostproc"
+
+ if ! use kernel_linux || ! use video_cards_mga; then
+ myconf+=" --disable-mga --disable-xmga"
+ fi
+
+ if use video_cards_tdfx; then
+ myconf+="
+ $(use_enable video_cards_tdfx tdfxvid)
+ $(use_enable fbcon tdfxfb)
+ "
+ else
+ myconf+="
+ --disable-3dfx
+ --disable-tdfxvid
+ --disable-tdfxfb
+ "
+ fi
+
+ # sun card, disable by default, see bug #258729
+ myconf+=" --disable-xvr100"
+
+ ################
+ # Audio Output #
+ ################
+ myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
+ uses="alsa jack ladspa nas portaudio"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ #use openal && myconf+=" --enable-openal" # build fails
+ use pulseaudio || myconf+=" --disable-pulse"
+ if ! use radio; then
+ use oss || myconf+=" --disable-ossaudio"
+ fi
+
+ ####################
+ # Advanced Options #
+ ####################
+ # Platform specific flags, hardcoded on amd64 (see below)
+ use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+ for i in ${CPU_FEATURES}; do
+ myconf+=" $(use_enable ${i/+/})"
+ done
+
+ use debug && myconf+=" --enable-debug=3"
+
+ if use x86 && gcc-specs-pie; then
+ filter-flags -fPIC -fPIE
+ append-ldflags -nopie
+ fi
+
+ ###########################
+ # X enabled configuration #
+ ###########################
+ myconf+=" --disable-dga1 --disable-dga2 --disable-vesa"
+ uses="dxr3 ggi vdpau xinerama xv"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use opengl || myconf+=" --disable-gl"
+ use xscreensaver || myconf+=" --disable-xss"
+
+ ############################
+ # OSX (aqua) configuration #
+ ############################
+ if use aqua; then
+ myconf+="
+ --enable-macosx-finder
+ --enable-macosx-bundle
+ "
+ fi
+
+ ./configure \
+ --cc="$(tc-getCC)" \
+ --pkg-config="$(tc-getPKG_CONFIG)" \
+ --prefix="${EPREFIX}"/usr \
+ --bindir="${EPREFIX}"/usr/bin \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --confdir="${EPREFIX}"/etc/${PN} \
+ --datadir="${EPREFIX}"/usr/share/${PN} \
+ --mandir="${EPREFIX}"/usr/share/man \
+ --localedir="${EPREFIX}"/usr/share/locale \
+ --enable-translation \
+ ${myconf} || die
+}
+
+src_compile() {
+ base_src_compile
+ # Build only user-requested docs if they're available.
+ if use doc ; then
+ # select available languages from $LINGUAS
+ LINGUAS=${LINGUAS/zh/zh_CN}
+ local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+ local BUILT_DOCS=""
+ for i in ${LINGUAS} ; do
+ has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+ done
+ if [[ -z $BUILT_DOCS ]]; then
+ emake -j1 -C DOCS/xml html-chunked
+ else
+ for i in ${BUILT_DOCS}; do
+ emake -j1 -C DOCS/xml html-chunked-${i}
+ done
+ fi
+ fi
+}
+
+src_install() {
+ local i
+
+ emake \
+ DESTDIR="${D}" \
+ INSTALLSTRIP="" \
+ install
+
+ dodoc AUTHORS Copyright README etc/codecs.conf
+
+ docinto tech/
+ dodoc DOCS/tech/{*.txt,mpsub.sub,playtree}
+ docinto TOOLS/
+ dodoc -r TOOLS
+ if use real; then
+ docinto tech/realcodecs/
+ dodoc DOCS/tech/realcodecs/*
+ fi
+
+ if use doc; then
+ docinto html/
+ dohtml -r "${S}"/DOCS/HTML/*
+ fi
+
+ if ! use truetype; then
+ dodir /usr/share/${PN}/fonts
+ # Do this generic, as the mplayer people like to change the structure
+ # of their zips ...
+ for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
+ cp -pPR "${i}" "${ED}/usr/share/${PN}/fonts"
+ done
+ # Fix the font symlink ...
+ rm -rf "${ED}/usr/share/${PN}/font"
+ dosym fonts/font-arial-14-iso-8859-1 /usr/share/${PN}/font
+ fi
+
+ insinto /etc/${PN}
+ newins "${S}/etc/example.conf" mplayer.conf
+ cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+ doins "${S}/etc/input.conf"
+
+ # set unrar path when required
+ if use rar; then
+ cat >> "${ED}/etc/${PN}/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+ fi
+ dosym ../../../etc/${PN}/mplayer.conf /usr/share/${PN}/mplayer.conf
+
+ newbin "${S}/TOOLS/midentify.sh" midentify${NAMESUF}
+
+ if [[ -n ${NAMESUF} ]] && use symlink; then
+ dosym "${PN}" /usr/bin/mplayer
+ dosym "midentify${NAMESUF}" /usr/bin/midentify
+ fi
+}
diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild
index 5546019df536..69b95a657c1a 100644
--- a/media-video/mplayer2/mplayer2-9999.ebuild
+++ b/media-video/mplayer2/mplayer2-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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.42 2012/08/13 13:19:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.43 2012/09/02 10:14:23 scarabeus Exp $
EAPI=4
@@ -59,7 +59,7 @@ REQUIRED_USE="
dvdnav? ( dvd )
dxr3? ( X )
ggi? ( X )
- opengl? ( X )
+ opengl? ( || ( X aqua ) )
radio? ( || ( dvb v4l ) )
truetype? ( iconv )
vdpau? ( X )