Introduce USE=libav to control the preferred implementation. Fixes subslot & implemen...
authorMichał Górny <mgorny@gentoo.org>
Sun, 1 Feb 2015 23:21:51 +0000 (23:21 +0000)
committerMichał Górny <mgorny@gentoo.org>
Sun, 1 Feb 2015 23:21:51 +0000 (23:21 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

media-video/mplayer2/ChangeLog
media-video/mplayer2/Manifest
media-video/mplayer2/mplayer2-2.0_p20131009-r1.ebuild [new file with mode: 0644]
media-video/mplayer2/mplayer2-9999.ebuild

index 412f2588ea7925c2de483b49cfb7ac973eda5770..b66055ad0ac60eec42b082b4a038fc7374a22352 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/mplayer2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.140 2015/01/31 01:34:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.141 2015/02/01 23:21:49 mgorny Exp $
+
+*mplayer2-2.0_p20131009-r1 (01 Feb 2015)
+
+  01 Feb 2015; Michał Górny <mgorny@gentoo.org>
+  +mplayer2-2.0_p20131009-r1.ebuild, mplayer2-9999.ebuild:
+  Introduce USE=libav to control the preferred implementation. Fixes subslot &
+  implementation switch rebuilds as well.
 
   31 Jan 2015; Patrick Lauer <patrick@gentoo.org> metadata.xml:
   Remove unneded useflag description from metadata.xml
index 1c306040c55d08f8ff4175f12fa98ed49aa1b19b..c05e40aa67a719009b554e864da012a70ecd91c7 100644 (file)
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX generate-tarball.sh 964 SHA256 49ca2e1174e26f73f2dfadb42426f304e30fc2d7f049e577699ecfdf775b9599 SHA512 7141872caebf0e76e92f400f97f0bb540aed071decfb7668cf652d9a6f304cab968355b6d12343001b797d9cbfb113c3a5a272418427391ec7c85404dd618f90 WHIRLPOOL 1adef66fb0889c55f7a095eb1c543935c0a3b4e92ec4d3f086cbfbf9348dac58acec61aa57f0d222376da80cabb0925f3a59215dabf3c93a0baac1e89967d850
 AUX mplayer2-2.0_p20120828-ffmpeg.patch 765 SHA256 2387daac56d711d4a7d32fc15f1b20d787342e4eb21b7cdab44aa04f2b01bc43 SHA512 e5ffa7ba9cba0c381ae37903659aaa050ecde489d7fc011e9375c41800afda08ee6073126a1e1099c4a83deb890b4ebb7ca0af43c3a9664aad8f7546757be140 WHIRLPOOL 1eb7aea177a423dd999e6c4797405bbb61c6f474ec086e9a7b91310fdc51292177fecfbb9191ba6af8326f49791607eb2d09b4201c900d3df3cbeee30a9f29d8
 AUX mplayer2-2.0_p20131009_support_libav10.patch 5172 SHA256 285d5ea88763b2c41e252327b205b268696f807cf8592507648d5b4c3301a398 SHA512 d7efeac8a4db5feee4300707de80d498381f81b96eeb0a61431e7d005d3102b6083d5faaa795c741a8281baf9ee1660da1c0c07463f9525bba09cb7e85c6d6d3 WHIRLPOOL 3a39264ecc09151e412d9f436813f95ecaa8cb42e683274204737c6ebbc860df08cab1828bf3ad0810c0e7cf009a3101c5e2c2d769ee0c8716c37a53a93705ed
@@ -7,7 +10,27 @@ DIST mplayer2-2.0_p20130428.tar.xz 1911464 SHA256 41e54e6c86761196e111250fd6db79
 DIST mplayer2-2.0_p20131009.tar.xz 1907780 SHA256 c105b3804d4d66af29015d4ecd46abbdff75c39d78d5457c535519ecc4d3855a SHA512 8c072bf8fa6a908d3c587e5f26daa6a07098abc8dabd20f77b172e8de5537125873ac1cfc8f07e5616eb0b35aaa73fbab2b30e94a057d220c481dae7740cb3e6 WHIRLPOOL f595c4032371239f1f31f6356d5c7d07534fc8227ba3f1e1452b507ac64baec0747c80b067eaed5fbdc58ee957875a39d9d782eed45b6d797d9a283a34496b78
 EBUILD mplayer2-2.0_p20130126.ebuild 11842 SHA256 a0b0e2be323f3f8ffee7c01063d50a80d989f26b169d8807886d0137a7243d4f SHA512 372ecf65066e3c235c29680503e611510205ece3d6ecac94f6767121631c3676d102669854d1a87dc093d500ff70afeaa3b3a15ab814072a0eb9e4c4658b88e0 WHIRLPOOL 05ca9a84f311d14edb60deb4028aa540966006059f153e08adfc41beb6f3534a5925bc6c06ffe24776ed4c106dc2f27b72624e4474bfd77b23ec4d29ba368e63
 EBUILD mplayer2-2.0_p20130428-r1.ebuild 10517 SHA256 218c1b481bd74be4a9b2095e3b2336636d3df4a0414f5a5a5274a41086e28fd0 SHA512 1bf194ce10eba257b712e53db37710c4f654edf4045597c82e5b2522a8c03e883c95b429b95220b134471b79441396b9e49fa920e4a82f47672316d884d9f6ca WHIRLPOOL 7c2e1e37ea0e3a53dfdd499c6220f9a60a1626a6732a0b827fb52d3e7b7fa0bf9f4438bc16fbc523ee7ba845231ee82d9262bac8f984344149924c65b8a38233
+EBUILD mplayer2-2.0_p20131009-r1.ebuild 10681 SHA256 998da2bf3a07a090f5b93ac6f15a3355dee0b3b21ca5ae7b512dd5fb88d0d9d5 SHA512 dc92332ac882da14404afe23bbaf85e7407fc01e1a54b5e3ddcb28de1cde0747088a996323e43a11bd3e5ca1d84e5df7b82dcdede15d0b7c98b06eb113b52616 WHIRLPOOL 79d52c9c636fa0d1bdabce0b2616ec2e83208702c926f2662e763b4d5a325ea54ece87dd284ebd344877f0479d052a527584be9a75ac5a4e66905c7c16b0ccd0
 EBUILD mplayer2-2.0_p20131009.ebuild 10628 SHA256 9b7ce9bf8b09527d9ae12f84d392269c853dcc3e3501ad283ca484071508ab2d SHA512 01639bce5b693a0961eb84de695fba6e7a53fb3099e740e6fd8a1f04b0069cc66bba0f3fa63cc93e4ba01edbf8c14b199f2f4b57f45a02ce0fd62e28fc9674ef WHIRLPOOL b47aa7a4f6c06ec85aa9b59d68ea5cd9e09d4ed378ee5792d7f86d014f76adad73e6913c939215557eda18444cbad6ae03a80cf2f880d456fc9aaa6f3c2805ba
-EBUILD mplayer2-9999.ebuild 10577 SHA256 53853aae3c4e69d1dc97d54d46554705df3993f1719e5758a901b1e236322b68 SHA512 d7a5659da0236f325b8d28cf73910ccd8eea69366722094d363cd1acfdbb9a0c389dc1706c4ba4e72c975185c7fad5269a411400dd27b3ae201cddb46011191a WHIRLPOOL 3bd12f8e5514c7f2df24ace0f1ebb2d561be6a25a68c4e56cf34b2ef7d8264944564fe704e9952cbc467ae12ea4f49cfc23a89db153596d12962a323482c05d3
-MISC ChangeLog 25236 SHA256 639cf344e2c50dd3f63964a7d741de68a7fed8f121c7557c7ed64ccf97c18317 SHA512 4c7231bb98cb388d0ebf7903a71af296713a2c845bc3debb699618826e8c08f41a7121105e27066fe70731258b4ae202f95f1203505e1ef421afaf13bc98c93b WHIRLPOOL 59ed567e59c442037f0f3cee91b19e3123af90a4136436de6b6afd99ba26c4ad498b56c05cc58e40138a909d8f7a38b89ab16a257c26dfa418a7d98c7911afd3
+EBUILD mplayer2-9999.ebuild 10621 SHA256 af9d8c12e14677da368e34e338329cce8df04a5bc1f02c85a75f1a9cf8143c3c SHA512 40e2d2353964bc71c82b1551763c9fc8562cfad8cc53b0f358f10a902db9b0ce6f561403055faa909007b81bfef682425e170ef7eb5a217783524cdde85eb8d2 WHIRLPOOL 689e814275201639e7af4c226c0f3d12912d59a089aab51a13882d485ca27f5f3587badcbaaf900bf60b69b28c0a8faa3b2d6a46aeb77b2da9a01350b8449e1f
+MISC ChangeLog 25508 SHA256 64bf3371a0054d6311869526b046ff99aac4b431d8fced6a56e39d0dd1f36d95 SHA512 82d07bcf2a757b72b0c34904fa38ef42f5f0bd39a51c8a7771216c476568cf10e0834d62678726f0d50031d3fb9b35e7a79df372b7d6c65099e62fc4a42daa86 WHIRLPOOL 60129a2c1ada653ef384ee516773456d1bc1a48c548e3e745a18297d6c48ddd4d2ee7344f6b2729256ae8a6c9b8ee9869887b4237473380333f882602feec32c
 MISC metadata.xml 2918 SHA256 91d275b5fe3b0b0c69b914e0fbd9c7ee208ff6d2842124ca5ceada265ce00d11 SHA512 97912c3e93c8d2ecd1641b524770bf4993cf941256a69b67d026e57890f2b845680fc7326639030545888572c2e6bb44c4e9ed0b81de63d4b8e163b2c4c2b90e WHIRLPOOL 29845d959727366ab640f20fbb7ea961237f3516bf2c2001f076dca7324b6f8d8b5be20ddf6653cad60f14d43018a6c022ae2911e3f7439a1bb4582eac500d1e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQJ8BAEBCABmBQJUzrUOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOu5IQANmFqq51XyzhYfYVcq49LsFO
+a8C5E8eLHbwGLVx0hcqtlVV6IZD56ZBAL2MzfxQFa8lfiV33nDh0h9WUepNrhU1N
+dDPiDz8fomM+tiOeB4iLxzhoItXNc4XJecnlSLwLFQdJhcc/0o/6bCUFvLLzSJZ6
+DHbi3KRydnIF2IyyadwLu2CPr1wjspKoTlyFoET4EHJWRxSHveRVJuLY3fgZtnQI
+Xwdc0Bkyas2Oy9PNKc+jT5o9I7r3/EtdKVdIi3Bs/m/Uofw8oPo+CBi36n+Zdi18
+XyNXRbl98VI3dmL5e0f7bK6VxZDroulJjCjQkQlmro3yNV6QbMu+YTtzFZEsh2Ik
+DO63i/SJwffoV8jDGTSvOJL+gr0u7PDmXi4ibc3zOwcoTm9bCm2J25sLn2D6Yav1
+49rGNbN7dXEM1RUKMLFziXlcTXZhcXQmFsfUfr6v5VdEzaLkJY40rfq1oS/EAguM
+pzZ9ieXkHFfgYOf1pfCYqxKS8DPbypQf0vHXAAI9D+6idXlGqUkwrhoMy1apEkhG
+lA8IJCBpJo32EIZGxtrdUvr3L8P5ZQ+vJXuHD690oDYKujEtdM3RMYkpMWMbaemr
+jqlib/+NsvyDJ3RJj/0Y9cT9InZjO0ogbwo6T77krEuSC8YTT9m6c+Hee6nkyYg0
+0C2UwsrzklUIbuTFMftV
+=hUT2
+-----END PGP SIGNATURE-----
diff --git a/media-video/mplayer2/mplayer2-2.0_p20131009-r1.ebuild b/media-video/mplayer2/mplayer2-2.0_p20131009-r1.ebuild
new file mode 100644 (file)
index 0000000..e9cbf8e
--- /dev/null
@@ -0,0 +1,378 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0_p20131009-r1.ebuild,v 1.1 2015/02/01 23:21:49 mgorny Exp $
+
+EAPI=5
+
+# https://bugs.gentoo.org/show_bug.cgi?id=434356#c4
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git"
+
+inherit toolchain-funcs flag-o-matic multilib eutils python-any-r1
+[[ ${PV} == *9999* ]] && inherit git-2
+
+NAMESUF="${PN/mplayer/}"
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayer2.org/"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="http://dev.gentoo.org/~maksbotan/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="+alsa aqua bluray bs2b cddb +cdio cpudetection debug directfb doc dvb +dvd
++dvdnav +enca ftp gif +iconv ipv6 jack joystick jpeg ladspa lcms +libass libav libcaca
+lirc md5sum mng +mp3 +network +opengl oss png pnm portaudio +postproc pulseaudio
+pvr +quvi radio samba selinux +shm tga +threads +unicode v4l vcd vdpau +X xinerama
++xscreensaver +xv yuv4mpeg"
+IUSE+=" symlink"
+
+CPU_FEATURES="cpu_flags_x86_3dnow:3dnow cpu_flags_x86_3dnowext:3dnowext altivec +cpu_flags_x86_mmx:mmx cpu_flags_x86_mmxext:mmxext cpu_flags_x86_sse:sse cpu_flags_x86_sse2:sse2 cpu_flags_x86_ssse3:ssse3"
+for x in ${CPU_FEATURES}; do
+       IUSE+=" ${x%:*}"
+done
+
+REQUIRED_USE="
+       cddb? ( cdio network )
+       dvdnav? ( dvd )
+       enca? ( iconv )
+       lcms? ( opengl )
+       libass? ( iconv )
+       opengl? ( || ( aqua X ) )
+       portaudio? ( threads )
+       pvr? ( v4l )
+       radio? ( v4l || ( alsa oss ) )
+       v4l? ( threads )
+       vdpau? ( X )
+       xinerama? ( X )
+       xscreensaver? ( X )
+       xv? ( X )
+"
+
+RDEPEND+="
+       sys-libs/ncurses
+       sys-libs/zlib
+       X? (
+               x11-libs/libXext
+               x11-libs/libXxf86vm
+               opengl? ( virtual/opengl )
+               lcms? ( media-libs/lcms:2 )
+               vdpau? ( x11-libs/libvdpau )
+               xinerama? ( x11-libs/libXinerama )
+               xscreensaver? ( x11-libs/libXScrnSaver )
+               xv? ( x11-libs/libXv )
+       )
+       alsa? ( media-libs/alsa-lib )
+       bluray? ( media-libs/libbluray )
+       bs2b? ( media-libs/libbs2b )
+       cdio? (
+               || (
+                       dev-libs/libcdio-paranoia
+                       <dev-libs/libcdio-0.90[-minimal]
+               )
+       )
+       directfb? ( dev-libs/DirectFB )
+       dvb? ( virtual/linuxtv-dvb-headers )
+       dvd? (
+               >=media-libs/libdvdread-4.1.3
+               dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+       )
+       enca? ( app-i18n/enca )
+       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]
+               virtual/ttf-fonts
+       )
+       libcaca? ( media-libs/libcaca )
+       lirc? ( app-misc/lirc )
+       mng? ( media-libs/libmng )
+       mp3? ( media-sound/mpg123 )
+       png? ( media-libs/libpng )
+       pnm? ( media-libs/netpbm )
+       portaudio? ( >=media-libs/portaudio-19_pre20111121 )
+       postproc? (
+               libav? ( media-libs/libpostproc:0= )
+               !libav? ( media-video/ffmpeg:0= )
+       )
+       pulseaudio? ( media-sound/pulseaudio )
+       quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 )
+       samba? ( net-fs/samba )
+       || (
+               libav? ( >=media-video/libav-9.12:0=[threads?,vdpau?] )
+               !libav? ( >=media-video/ffmpeg-1.2.6:0=[threads?,vdpau?] )
+       )
+       symlink? ( !media-video/mplayer )
+"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       ${PYTHON_DEPS}
+       dev-python/docutils
+       X? (
+               x11-proto/videoproto
+               x11-proto/xf86vidmodeproto
+               xinerama? ( x11-proto/xineramaproto )
+               xscreensaver? ( x11-proto/scrnsaverproto )
+       )
+       doc? (
+               dev-libs/libxslt
+               app-text/docbook-xml-dtd
+               app-text/docbook-xsl-stylesheets
+       )
+"
+RDEPEND+="
+       selinux? ( sec-policy/selinux-mplayer )
+"
+DOCS=( AUTHORS Copyright README etc/example.conf etc/input.conf etc/codecs.conf )
+
+pkg_setup() {
+       if [[ ${PV} == *9999* ]]; then
+               elog
+               elog "This is a live ebuild which installs the latest from upstream's"
+               elog "git repository, and is unsupported by Gentoo."
+               elog "Everything but bugs in the ebuild itself will be ignored."
+               elog
+       fi
+
+       if use !libass; then
+               ewarn
+               ewarn "You've disabled the libass flag. No OSD or subtitles will be displayed."
+       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"
+
+       python-any-r1_pkg_setup
+}
+
+src_prepare() {
+       epatch "${FILESDIR}/${PN}-py2compat.patch"
+       epatch "${FILESDIR}/${P}_support_libav10.patch"
+       epatch_user
+
+       # fix path to bash executable in configure scripts
+       sed -i -e "1c\#!${EPREFIX}/bin/bash" \
+               configure version.sh || die
+
+       sed -e 's/ $(INSTALLSTRIP)//' \
+               -e '/$(INSTALL) -d $(LIBDIR)/d' \
+               -i Makefile || die
+
+       if [[ -n ${NAMESUF} ]]; then
+               sed -e "/^EXESUF/s,= \$_exesuf$,= ${NAMESUF}\$_exesuf," \
+                       -i configure || die
+               sed -e "s/mplayer/${PN}/" \
+                       -i TOOLS/midentify.sh || die
+       fi
+}
+
+src_configure() {
+       local myconf=""
+       local uses i
+
+       # 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 #
+       #####################
+       # rtc is useless and /dev/rtc0 is only readable for root
+       myconf+=" --disable-rtc"
+       # SDL output is fallback for platforms where nothing better is available
+       myconf+=" --disable-sdl"
+       myconf+="
+               $(use_enable network networking)
+               $(use_enable joystick)
+       "
+       uses="bluray ftp vcd"
+       for i in ${uses}; do
+               use ${i} || myconf+=" --disable-${i}"
+       done
+       use ipv6 || myconf+=" --disable-inet6"
+       use quvi || myconf+=" --disable-libquvi"
+       use samba || myconf+=" --disable-smb"
+       use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+       ########
+       # 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 #
+       #############
+       uses="enca libass"
+       for i in ${uses}; do
+               use ${i} || myconf+=" --disable-${i}"
+       done
+       # iconv optionally can use unicode
+       use iconv || myconf+=" --disable-iconv --charset=noconv"
+       use iconv && use unicode && myconf+=" --charset=UTF-8"
+       # obscure and not maintained feature
+       myconf+=" --disable-unrarexec"
+
+       #####################################
+       # DVB / Video4Linux / Radio support #
+       #####################################
+       # BSD legacy TV/radio support, FreeBSD actually supports V4L2, and V4L2 supports this chip.
+       myconf+=" --disable-tv-bsdbt848 --disable-radio-bsdbt848"
+       use dvb || myconf+=" --disable-dvb"
+       use pvr || myconf+=" --disable-pvr"
+       use v4l || myconf+=" --disable-tv --disable-tv-v4l2 --disable-v4l2"
+       if use radio; then
+               myconf+=" --enable-radio --enable-radio-capture"
+       else
+               myconf+=" --disable-radio-v4l2"
+       fi
+
+       ##########
+       # Codecs #
+       ##########
+       # better demuxers and decoders are provided by libav and ffmpeg
+       uses="faad liba52 libdca libdv libnut libvorbis mad musepack speex theora tremor xanim xvid"
+       for i in ${uses}; do
+               myconf+=" --disable-${i}"
+       done
+       use mp3 || myconf+=" --disable-mpg123"
+       uses="gif jpeg mng png pnm tga"
+       for i in ${uses}; do
+               use ${i} || myconf+=" --disable-${i}"
+       done
+
+       #################
+       # Binary codecs #
+       #################
+       myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+       ################
+       # Video Output #
+       ################
+       uses="directfb md5sum yuv4mpeg"
+       for i in ${uses}; do
+               use ${i} || myconf+=" --disable-${i}"
+       done
+       use libcaca || myconf+=" --disable-caca"
+       use postproc || myconf+=" --disable-libpostproc"
+
+       ################
+       # Audio Output #
+       ################
+       myconf+=" --disable-rsound" # media-sound/rsound is in pro-audio overlay only
+       uses="alsa jack ladspa portaudio"
+       for i in ${uses}; do
+               use ${i} || myconf+=" --disable-${i}"
+       done
+       use bs2b || myconf+=" --disable-libbs2b"
+       #use openal && myconf+=" --enable-openal" # build fails
+       use oss || myconf+=" --disable-ossaudio"
+       use pulseaudio || myconf+=" --disable-pulse"
+
+       ####################
+       # Advanced Options #
+       ####################
+       use threads || myconf+=" --disable-pthreads"
+
+       # Platform specific flags, hardcoded on amd64 (see below)
+       use cpudetection && myconf+=" --enable-runtime-cpudetection"
+       use shm || myconf+=" --disable-shm"
+
+       for i in ${CPU_FEATURES//+/}; do
+               myconf+=" $(use_enable ${i%:*} ${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 #
+       ###########################
+       use X || myconf+=" --disable-x11"
+       uses="vdpau xinerama xv"
+       for i in ${uses}; do
+               use ${i} || myconf+=" --disable-${i}"
+       done
+       use opengl || myconf+=" --disable-gl"
+       use lcms || myconf+=" --disable-lcms2"
+       use xscreensaver || myconf+=" --disable-xss"
+
+       ############################
+       # OSX (aqua) configuration #
+       ############################
+       use aqua && myconf+=" --enable-macosx-bundle --enable-macosx-finder"
+
+       CFLAGS= LDFLAGS= ./configure \
+               --cc="$(tc-getCC)" \
+               --extra-cflags="${CFLAGS}" \
+               --extra-ldflags="${LDFLAGS}" \
+               --pkg-config="$(tc-getPKG_CONFIG)" \
+               --prefix="${EPREFIX}"/usr \
+               --bindir="${EPREFIX}"/usr/bin \
+               --confdir="${EPREFIX}"/etc/${PN} \
+               --mandir="${EPREFIX}"/usr/share/man \
+               --localedir="${EPREFIX}"/usr/share/locale \
+               ${myconf} || die
+
+       MAKEOPTS+=" V=1"
+}
+
+src_compile() {
+       default
+       use doc && emake -C DOCS/xml html-chunked
+}
+
+src_install() {
+       default
+
+       if use doc; then
+               rm -r TOOLS/osxbundle* DOCS/tech/{Doxyfile,realcodecs} || die
+               dodoc -r TOOLS DOCS/tech
+               dohtml -r DOCS/HTML/*
+       fi
+
+       newbin TOOLS/midentify.sh midentify${NAMESUF}
+
+       if [[ -n ${NAMESUF} ]]; then
+               mv "${ED}/usr/share/man/man1/mplayer.1" "${ED}/usr/share/man/man1/mplayer${NAMESUF}.1" || die
+
+               if use symlink; then
+                       dosym ${PN} /usr/bin/mplayer
+                       dosym midentify${NAMESUF} /usr/bin/midentify
+               fi
+       fi
+}
index d427752a40a6f4465bd68180a623e6811a5a8f9f..bd36a02cb0f5fcfb97729366dc25dab89437e50c 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.70 2015/01/30 17:27:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.71 2015/02/01 23:21:49 mgorny Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ SLOT="0"
 [[ ${PV} == *9999* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="+alsa aqua bluray bs2b cddb +cdio cpudetection debug directfb doc dvb +dvd
-+dvdnav +enca ftp gif +iconv ipv6 jack joystick jpeg ladspa lcms +libass libcaca
++dvdnav +enca ftp gif +iconv ipv6 jack joystick jpeg ladspa lcms +libass libav libcaca
 lirc md5sum mng +mp3 +network +opengl oss png pnm portaudio +postproc pulseaudio
 pvr +quvi radio samba selinux +shm tga +threads +unicode v4l vcd vdpau +X xinerama
 +xscreensaver +xv yuv4mpeg"
@@ -97,17 +97,15 @@ RDEPEND+="
        pnm? ( media-libs/netpbm )
        portaudio? ( >=media-libs/portaudio-19_pre20111121 )
        postproc? (
-               || (
-                       media-libs/libpostproc
-                       media-video/ffmpeg:0
-               )
+               libav? ( media-libs/libpostproc:0= )
+               !libav? ( media-video/ffmpeg:0= )
        )
        pulseaudio? ( media-sound/pulseaudio )
        quvi? ( >=media-libs/libquvi-0.4.1 <media-libs/libquvi-0.9 )
        samba? ( net-fs/samba )
        || (
-               >=media-video/libav-9.12:=[threads?,vdpau?]
-               >=media-video/ffmpeg-1.2.6:0=[threads?,vdpau?]
+               libav? ( >=media-video/libav-9.12:0=[threads?,vdpau?] )
+               !libav? ( >=media-video/ffmpeg-1.2.6:0=[threads?,vdpau?] )
        )
        symlink? ( !media-video/mplayer )
 "