diff options
| -rw-r--r-- | media-video/mplayer2/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/mplayer2/Manifest | 20 | ||||
| -rw-r--r-- | media-video/mplayer2/metadata.xml | 8 | ||||
| -rw-r--r-- | media-video/mplayer2/mplayer2-2.0.ebuild | 287 | ||||
| -rw-r--r-- | media-video/mplayer2/mplayer2-9999.ebuild | 293 | ||||
| -rw-r--r-- | media-video/vmaid/Manifest | 14 |
6 files changed, 141 insertions, 490 deletions
diff --git a/media-video/mplayer2/ChangeLog b/media-video/mplayer2/ChangeLog index bf0a365be82e..63ee08e3ff04 100644 --- a/media-video/mplayer2/ChangeLog +++ b/media-video/mplayer2/ChangeLog @@ -1,6 +1,13 @@ # 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.1 2011/03/28 22:59:02 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/ChangeLog,v 1.2 2011/03/29 12:44:12 scarabeus Exp $ + + 29 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer2-2.0.ebuild, + mplayer2-9999.ebuild, metadata.xml: + Drop support for internal only mp3lib, always link to external ffmpeg so all + features need to be in it instead of relying on some internal cloning. + Separate namespace for /etc/ config to be by default mplayer2. Make symlink + useflag enabled by default. 28 Mar 2011; Luca Barbato <lu_zero@gentoo.org> +metadata.xml, +mplayer2-2.0.ebuild, +mplayer2-9999.ebuild: diff --git a/media-video/mplayer2/Manifest b/media-video/mplayer2/Manifest index 86b90d43e18a..568464449120 100644 --- a/media-video/mplayer2/Manifest +++ b/media-video/mplayer2/Manifest @@ -1,8 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST font-arial-cp1250.tar.bz2 249705 RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 SHA1 ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 DIST font-arial-iso-8859-1.tar.bz2 234242 RMD160 666697cd5efd9387057a898c714175e7c2aacbcd SHA1 152c40bf20de34aa8802d7f80d34d673b0b67212 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 DIST font-arial-iso-8859-2.tar.bz2 222208 RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb SHA1 7b99bbe0e9ba89a57eccbea8f93c453c4f268181 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 -DIST mplayer2-build-2.0.tar.xz 7424672 RMD160 48193cf6a48e16cce7f74d8f0915e64dc4b7d1cd SHA1 951bc88cdaa486044a32e66293bdcb5bfd17f759 SHA256 e0a4dba087ba8c6a916d8bc9c7063bd2fd86d36bb08e31a2bd2d82e56b3c4058 -EBUILD mplayer2-2.0.ebuild 22585 RMD160 d5fdee8779939f28e538070404fec5a3974ea612 SHA1 ceff39455d7c640bebc00079a5c42c2653728b93 SHA256 4b2884a4ba5a38ee460c79ce2cc95d8139379d5f240e76ffc41be386fda674e2 -EBUILD mplayer2-9999.ebuild 22604 RMD160 24039c85968f3b9f0342f13a6a4b4ced08cf7074 SHA1 6ba5f540a354f4b6a97551fd631844e4e81675ce SHA256 8d41e13bb030cbd44bc3bb8a85b4a45b82d0d0818ec21a4db44b457c0d370d2f -MISC ChangeLog 3538 RMD160 d172fb5cc9a97608a09aa0fd0de6283cbe3ccfa5 SHA1 dc7c6959b2477ff99a829db924b2f3a03a2f17a7 SHA256 6a4756b2265c0185167a1456d0365257bd73d6236f42beff3d87a5be964850de -MISC metadata.xml 4274 RMD160 d6a87a6d3a184a696416ce544f95dfcb11496be7 SHA1 882fbce847d4c50b26622c951a367c2ea34c759f SHA256 143c9701860144ec5198d059c6355a5bbe405a08ca4383b40d68f5c6899c3508 +DIST mplayer2-2.0.tar.xz 3675080 RMD160 7dc37f0071a9a8bc348a40b26b480a365a904d62 SHA1 0df8d4e5484128b7b28029273b7704ab5d5419bc SHA256 f1d17397bbdfcff2220d8b4bc17e7de5b78488736e21dca2df0d8a3216c85910 +EBUILD mplayer2-2.0.ebuild 17862 RMD160 3cdfa4228fa9b044388248d9595b64c7d57bb4e9 SHA1 f13fb4bde28396a456e13f406bb81cfacc4a2b82 SHA256 635c094e35d07d72152522f8590dd90a389c3c529d2c033efeaf3491871144b7 +EBUILD mplayer2-9999.ebuild 17863 RMD160 dc6bf9c953a9c95c162bfbb0e8bbe39d49e58a9a SHA1 aa4feffadeaeaff41c5e4f6f149e9cddd0e1caa8 SHA256 d2105aa0bdce2863e48b57c31ad6478bd46760fa0181ce932838bc8d23d1bcde +MISC ChangeLog 3915 RMD160 ced8a4dcbf6b83682f763ff6044b8bd9ce64f10d SHA1 46a8f932d0a9c038fe7bd6502209f169dcb504ef SHA256 41db3b176992411d45d78d4a319d96900cbb9a64c9cc9343d24f8edc5df0a9df +MISC metadata.xml 3317 RMD160 b7bb3c0d9af36133d9d40bd1988e41e7752c807b SHA1 fabea84c83b76544d34dcb0485a36953f8e34c15 SHA256 1a47c851c0a8b62c097bde3e5ecb1b3ee4df398755908acdcb5c21b29d70e433 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk2R1CkACgkQHB6c3gNBRYeYxgCghu7aPX5IlL9e6h7nyMtWQQEj +354Aniw9NrdA8fZGjVeLSupWBOIIx6O7 +=ZfRM +-----END PGP SIGNATURE----- diff --git a/media-video/mplayer2/metadata.xml b/media-video/mplayer2/metadata.xml index dc83a656f8bb..2d9459dd3ce8 100644 --- a/media-video/mplayer2/metadata.xml +++ b/media-video/mplayer2/metadata.xml @@ -21,7 +21,6 @@ </longdescription> <use> <flag name="3dnowext">Enable 3dnowext cpu instructions</flag> - <flag name="amr">Enables Adaptive Multi-Rate format support</flag> <flag name="ass">SRT/SSA/ASS (SubRip / SubStation Alpha) subtitle support</flag> <flag name="bl">Blinkenlights video output</flag> <flag name="bluray">Enable playback of Blu-ray filesystems</flag> @@ -29,13 +28,10 @@ <flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag> <flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag> <flag name="custom-cpuopts">Fine-tune custom CPU optimizations (UNSUPPORTED)</flag> - <flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag> <flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag> <flag name="dxr3">Enable DXR3/H+ video output</flag> <flag name="enca">Enables support for charset discovery and conversion</flag> <flag name="faad">Use external faad library for AAC decoding</flag> - <flag name="ffmpeg-mt">Enable multithreaded ffmpeg</flag> - <flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag> <flag name="live">Enables live.com streaming media support</flag> <flag name="md5sum">Enables md5sum video output</flag> <flag name="mmxext">Enables mmx2 support</flag> @@ -50,14 +46,10 @@ <flag name="rar">Enable Unique RAR File Library</flag> <flag name="real">Adds real audo/video support</flag> <flag name="rtc">Enables usage of the linux real time clock. The alternative is software emulation of rtc</flag> - <flag name="rtmp">Enables RTMPDump Streaming Media support</flag> - <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag> <flag name="shm">Enable support for shm</flag> <flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag> - <flag name="system-ffmpeg">Use shared FFmpeg libraries instead of static bundled ones. May not have ffmpeg-mt.</flag> <flag name="tga">Enables Targa video output</flag> <flag name="vdpau">Enables experimental VDPAU support (requires nVidia video cards) to offload MPEG2/MPEG4/VC1/WMV CPU processing to video card</flag> - <flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag> <flag name="xanim">Enables support for xanim based codecs</flag> <flag name="xvmc">Enables X-Video Motion Compensation support</flag> </use> diff --git a/media-video/mplayer2/mplayer2-2.0.ebuild b/media-video/mplayer2/mplayer2-2.0.ebuild index 522ae5254689..6d4b49d519a5 100644 --- a/media-video/mplayer2/mplayer2-2.0.ebuild +++ b/media-video/mplayer2/mplayer2-2.0.ebuild @@ -1,26 +1,25 @@ # 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.1 2011/03/28 22:59:02 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-2.0.ebuild,v 1.2 2011/03/29 12:44:12 scarabeus Exp $ EAPI=4 -[[ ${PV} = *9999* ]] && VCS_ECLASS="git" || VCS_ECLASS="" +EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git" +[[ ${PV} = *9999* ]] && VCS_ECLASS="git" inherit toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS} namesuf="${PN/mplayer/}" IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray -bs2b +bzip2 cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga +dirac +bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon -ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa -libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 mpg123 nas -+network nut amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime -radio +rar +real +rtc rtmp samba +shm +schroedinger +hardcoded-tables sdl +speex sse sse2 ssse3 -tga +theora threads +truetype +unicode v4l v4l2 vdpau -+vorbis vpx win32codecs +X xanim xinerama +xscreensaver +xv xvmc -" -IUSE+=" system-ffmpeg symlink" +ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libcaca lirc +live mad md5sum +mmx mmxext mng mpg123 nas ++network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime +radio +rar +real +rtc samba +shm +symlink sdl +speex sse sse2 ssse3 +tga +theora +truetype +unicode v4l v4l2 vdpau ++vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvmc" VIDEO_CARDS="s3virge mga tdfx vesa" for x in ${VIDEO_CARDS}; do @@ -32,13 +31,8 @@ FONT_URI=" mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 " -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://repo.or.cz/mplayer-build.git" - EGIT_PROJECT="${PN}-build" - RELEASE_URI="" -else - RELEASE_URI="http://ftp.mplayer2.org/pub/release/${PN}-build-${PV/_/-}.tar.xz" -fi +[[ ${PV} == *9999* ]] || \ + RELEASE_URI="http://ftp.${PN}.org/pub/release/${P}.tar.xz" SRC_URI="${RELEASE_URI} !truetype? ( ${FONT_URI} ) " @@ -58,6 +52,7 @@ X_RDEPS=" # Rar: althrought -gpl version is nice, it cant do most functions normal rars can # nemesi? ( net-libs/libnemesi ) RDEPEND+=" + virtual/ffmpeg sys-libs/ncurses sys-libs/zlib !bindist? ( @@ -130,19 +125,6 @@ RDEPEND+=" truetype? ( ${FONT_RDEPS} ) vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) - system-ffmpeg? ( - >=media-video/ffmpeg-0.6_p25423[amr?,bzip2?,dirac?,gsm?,hardcoded-tables?,jpeg2k?,rtmp?,schroedinger?,threads?,vpx?] - ) - !system-ffmpeg? ( - amr? ( media-libs/opencore-amr ) - bzip2? ( app-arch/bzip2 ) - dirac? ( media-video/dirac ) - gsm? ( >=media-sound/gsm-1.0.12-r1 ) - jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) - rtmp? ( media-video/rtmpdump ) - schroedinger? ( media-libs/schroedinger ) - vpx? ( media-libs/libvpx ) - ) symlink? ( !media-video/mplayer ) " @@ -175,19 +157,11 @@ SLOT="0" LICENSE="GPL-3" if [[ ${PV} != *9999* ]]; then KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" - S="${WORKDIR}/${PN}-build-${PV}" else KEYWORDS="" fi -# bindist does not cope with amr codecs (#299405#c6), win32codecs are nonfree -# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio -# dvd navigation requires dvd read support -# ass and freetype font require iconv and ass requires freetype fonts -# unicode transformations are usefull only with iconv -# libvorbis require external tremor to work -# radio requires oss or alsa backend -# xvmc requires xvideo support +# bindist does not cope with win32codecs, which are nonfree REQUIRED_USE="bindist? ( !win32codecs )" PATCHES=( @@ -231,45 +205,13 @@ pkg_setup() { ewarn "3dnowext mmx mmxext sse sse2 ssse3) are properly set." fi - if use system-ffmpeg; then - ewarn "System ffmpeg will be used. If you want ffmpeg-mt, disable" - ewarn "\"system-ffmpeg\" or use ffmpeg package with \"ffmpeg-mt\" enabled." - else - ewarn "Internal ffmpeg-mt will be used. If you don't want it, enable \"system-ffmpeg\"." - 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_unpack() { if [[ ${PV} = *9999* ]]; then git_src_unpack - - EGIT_REPO_URI="git://repo.or.cz/mplayer.git" - EGIT_PROJECT="${PN}" - S+="/mplayer" - git_fetch - S="${WORKDIR}/${P}" - - if ! use system-ffmpeg; then - EGIT_BRANCH="mt" - EGIT_COMMIT="mt" - S+="/ffmpeg-mt" - EGIT_REPO_URI="git://repo.or.cz/FFMpeg-mirror/mplayer-patches.git" - EGIT_PROJECT="${PN}-ffmpeg" - git_fetch - EGIT_BRANCH="master" - unset EGIT_COMMIT - - cd "${S}" - EGIT_REPO_URI="git://git.mplayerhq.hu/libswscale" - EGIT_PROJECT="libswscale" - EGIT_COMMIT="$(git submodule status -- libswscale|sed -e 's/^-\(.*\) .*/\1/')" - S+="/${EGIT_PROJECT}" - git_fetch - - S="${WORKDIR}/${P}" - fi - - cd "${WORKDIR}" else unpack ${A} fi @@ -285,40 +227,18 @@ src_prepare() { if [[ ${PV} = *9999* ]]; then git_src_prepare # Set GIT version manually - pushd mplayer echo "GIT-r$(git rev-list HEAD|wc -l)-$(git describe --always)" \ > VERSION || die - popd - fi - - # remove internal libs and use system: - sed -e '/^mplayer: /s/libass//' \ - -i Makefile || die - rm -rf \ - libass \ - || die - - if use system-ffmpeg; then - sed -e '/^mplayer: /s/ffmpeg//' \ - -i Makefile || die - rm -rf ffmpeg-mt || die - else - sed -i \ - -e "/'--cpu=host',/d" \ - -e "/'--disable-debug',/d" \ - -e "/'--enable-pthreads',/d" \ - script/ffmpeg-config || die fi # fix path to bash executable in configure scripts - local bash_scripts="mplayer/configure mplayer/version.sh" - use system-ffmpeg || bash_scripts+=" ffmpeg*/configure ffmpeg*/version.sh" - sed -i -e "1c\#!${EPREFIX}/bin/bash" \ + local bash_scripts="configure version.sh" + sed -i \ + -e "1c\#!${EPREFIX}/bin/bash" \ ${bash_scripts} || die # We want mplayer${namesuf} - if [[ "${namesuf}" != "" ]]; then - pushd mplayer + if [[ -n ${namesuf} ]]; then sed -e "/elif linux ; then/a\ _exesuf=\"${namesuf}\"" \ -i configure || die sed -e "/ -m 644 DOCS\/man\/en\/mplayer/i\ mv DOCS\/man\/en\/mplayer.1 DOCS\/man\/en\/mplayer${namesuf}.1" \ @@ -327,7 +247,6 @@ src_prepare() { -i Makefile || die sed -e "s/mplayer/mplayer${namesuf}/" \ -i TOOLS/midentify.sh || die - popd fi base_src_prepare @@ -408,7 +327,6 @@ src_configure() { ############# # Subtitles # ############# - # # SRT/ASS/SSA (subtitles) requires freetype support # freetype support requires iconv # iconv optionally can use unicode @@ -462,12 +380,8 @@ src_configure() { # Codecs # ########## myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred + myconf+=" --disable-mp3lib" # internal so disable use dts || myconf+=" --disable-libdca" - if ! use mp3; then - myconf+=" - --disable-mp3lib - " - fi uses="a52 bs2b dv vorbis" for i in ${uses}; do use ${i} || myconf+=" --disable-lib${i}" @@ -646,107 +560,18 @@ src_configure() { " fi - common_options=" - --cc=$(tc-getCC) - --host-cc=$(tc-getBUILD_CC) - " - myconf+=" - --prefix="${EPREFIX}"/usr - --bindir="${EPREFIX}"/usr/bin - --libdir="${EPREFIX}"/usr/$(get_libdir) - --confdir="${EPREFIX}"/etc/mplayer - --datadir="${EPREFIX}"/usr/share/mplayer${namesuf} - --mandir="${EPREFIX}"/usr/share/man - --localedir="${EPREFIX}"/usr/share/locale - --enable-translation - " - - echo "${common_options}" > common_options - echo "${myconf}" > mplayer_options - - if ! use system-ffmpeg; then - local ffconf=" - --enable-gpl - --enable-version3 - --enable-postproc - --disable-stripping - " - - # enabled by default - use debug || ffconf+=" --disable-debug" - use network || ffconf+=" --disable-network" - use bzip2 || ffconf+=" --disable-bzlib" - - use custom-cflags && ffconf+=" --disable-optimizations" - use cpudetection && ffconf+=" --enable-runtime-cpudetect" - - # Threads; we only support pthread for now but ffmpeg supports more - use threads || ffconf+=" --disable-pthreads" - - # ffmpeg encoders - for i in faac mp3lame theora vorbis x264 xvid; do - ffconf+=" --disable-lib${i}" - done - - # ffmpeg decoders - use amr && ffconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb" - for i in gsm dirac rtmp schroedinger speex vpx; do - use ${i} && ffconf+=" --enable-lib${i}" - done - use jpeg2k && ffconf+=" --enable-libopenjpeg" - - # CPU features - for i in mmx ssse3 altivec ; do - use ${i} || ffconf+=" --disable-${i}" - done - use mmxext || ffconf+=" --disable-mmx2" - use 3dnow || ffconf+=" --disable-amd3dnow" - use 3dnowext || ffconf+=" --disable-amd3dnowext" - # disable mmx accelerated code if PIC is required - # as the provided asm decidedly is not PIC. - if gcc-specs-pie ; then - ffconf+=" --disable-mmx --disable-mmx2" - fi - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do - [ "${i}" = "native" ] && i="host" # bug #273421 - [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 - ffconf+=" --cpu=${i}" - break - done - - # cross compile support - if tc-is-cross-compiler ; then - ffconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-" - case ${CHOST} in - *freebsd*) - ffconf+=" --target-os=freebsd" - ;; - mingw32*) - ffconf+=" --target-os=mingw32" - ;; - *linux*) - ffconf+=" --target-os=linux" - ;; - esac - fi - - # Misc stuff - use hardcoded-tables && ffconf+=" --enable-hardcoded-tables" - - echo "${ffconf}" > ffmpeg_options - fi - - sed -i \ - -e 's/\t//g' \ - -e 's/ --/\n--/g' \ - -e '/^$/d' \ - *_options || die + ./configure \ + --cc=$(tc-getCC) \ + --host-cc=$(tc-getBUILD_CC) \ + --prefix="${EPREFIX}"/usr \ + --bindir="${EPREFIX}"/usr/bin \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --confdir="${EPREFIX}"/etc/mplayer${namesuf} \ + --datadir="${EPREFIX}"/usr/share/mplayer${namesuf} \ + --mandir="${EPREFIX}"/usr/share/man \ + --localedir="${EPREFIX}"/usr/share/locale \ + --enable-translation \ + ${myconf} || die } src_compile() { @@ -779,8 +604,6 @@ src_install() { INSTALLSTRIP="" \ install - S+="/mplayer" - cd "${S}" dodoc AUTHORS Copyright README etc/codecs.conf docinto tech/ @@ -809,43 +632,39 @@ src_install() { dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer${namesuf}/font fi - if use symlink; then - insinto /etc/mplayer - newins "${S}/etc/example.conf" mplayer.conf - doins "${S}/etc/input.conf" - if use osdmenu; then - doins "${S}/etc/menu.conf" - fi + insinto /etc/mplayer${namesuf} + newins "${S}/etc/example.conf" mplayer.conf + cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_ +# Config options can be section specific, global +# options should go in the default section +[default] +_EOF_ + doins "${S}/etc/input.conf" + if use osdmenu; then + doins "${S}/etc/menu.conf" + fi - if use ass || use truetype; then - cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ + if use ass || use truetype; then + cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_ fontconfig=1 subfont-osd-scale=4 subfont-text-scale=3 _EOF_ - fi + fi - # bug 256203 - if use rar; then - cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ + # bug 256203 + if use rar; then + cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_ unrarexec=${EPREFIX}/usr/bin/unrar _EOF_ - fi - - dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer${namesuf}/mplayer.conf fi + dosym ../../../etc/mplayer${namesuf}/mplayer.conf /usr/share/mplayer${namesuf}/mplayer.conf newbin "${S}/TOOLS/midentify.sh" midentify${namesuf} - if [[ "${namesuf}" != "" ]] && use symlink; then + if [[ -n ${namesuf} ]] && use symlink; then + dosym /etc/mplayer${namesuf} /etc/mplayer dosym "mplayer${namesuf}" /usr/bin/mplayer dosym "midentify${namesuf}" /usr/bin/midentify fi } - -pkg_postrm() { - # Cleanup stale symlinks - [ -L "${EROOT}/usr/share/mplayer${namesuf}/font" -a \ - ! -e "${EROOT}/usr/share/mplayer${namesuf}/font" ] && \ - rm -f "${EROOT}/usr/share/mplayer${namesuf}/font" -} diff --git a/media-video/mplayer2/mplayer2-9999.ebuild b/media-video/mplayer2/mplayer2-9999.ebuild index 91844d506168..9110ae97a197 100644 --- a/media-video/mplayer2/mplayer2-9999.ebuild +++ b/media-video/mplayer2/mplayer2-9999.ebuild @@ -1,26 +1,25 @@ # 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.1 2011/03/28 22:59:02 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer2/mplayer2-9999.ebuild,v 1.2 2011/03/29 12:44:12 scarabeus Exp $ EAPI=4 -[[ ${PV} = *9999* ]] && VCS_ECLASS="git" || VCS_ECLASS="" +EGIT_REPO_URI="git://git.mplayer2.org/mplayer2.git" +[[ ${PV} = *9999* ]] && VCS_ECLASS="git" inherit toolchain-funcs eutils flag-o-matic multilib base ${VCS_ECLASS} namesuf="${PN/mplayer/}" IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray -bs2b +bzip2 cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga +dirac +bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts custom-cflags debug dga directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca esd +faad fbcon -ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa -libcaca lirc +live mad md5sum +mmx mmxext mng +mp3 mpg123 nas -+network nut amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime -radio +rar +real +rtc rtmp samba +shm +schroedinger +hardcoded-tables sdl +speex sse sse2 ssse3 -tga +theora threads +truetype +unicode v4l v4l2 vdpau -+vorbis vpx win32codecs +X xanim xinerama +xscreensaver +xv xvmc -" -IUSE+=" +ffmpeg-mt -system-ffmpeg symlink" +ftp gif ggi +iconv ipv6 jack joystick jpeg kernel_linux ladspa +libcaca lirc +live mad md5sum +mmx mmxext mng mpg123 nas ++network nut +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime +radio +rar +real +rtc samba +shm +symlink sdl +speex sse sse2 ssse3 +tga +theora +truetype +unicode v4l v4l2 vdpau ++vorbis win32codecs +X xanim xinerama +xscreensaver +xv xvmc" VIDEO_CARDS="s3virge mga tdfx vesa" for x in ${VIDEO_CARDS}; do @@ -32,13 +31,8 @@ FONT_URI=" mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 " -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="git://repo.or.cz/mplayer-build.git" - EGIT_PROJECT="${PN}-build" - RELEASE_URI="" -else - RELEASE_URI="mirror://gentoo/${P}.tar.xz" -fi +[[ ${PV} == *9999* ]] || \ + RELEASE_URI="http://ftp.${PN}.org/pub/release/${P}.tar.xz" SRC_URI="${RELEASE_URI} !truetype? ( ${FONT_URI} ) " @@ -58,6 +52,7 @@ X_RDEPS=" # Rar: althrought -gpl version is nice, it cant do most functions normal rars can # nemesi? ( net-libs/libnemesi ) RDEPEND+=" + virtual/ffmpeg sys-libs/ncurses sys-libs/zlib !bindist? ( @@ -130,19 +125,6 @@ RDEPEND+=" truetype? ( ${FONT_RDEPS} ) vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) - system-ffmpeg? ( - >=media-video/ffmpeg-0.6_p25423[amr?,bzip2?,dirac?,gsm?,hardcoded-tables?,jpeg2k?,rtmp?,schroedinger?,threads?,vpx?] - ) - !system-ffmpeg? ( - amr? ( media-libs/opencore-amr ) - bzip2? ( app-arch/bzip2 ) - dirac? ( media-video/dirac ) - gsm? ( >=media-sound/gsm-1.0.12-r1 ) - jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) - rtmp? ( media-video/rtmpdump ) - schroedinger? ( media-libs/schroedinger ) - vpx? ( media-libs/libvpx ) - ) symlink? ( !media-video/mplayer ) " @@ -179,14 +161,7 @@ else KEYWORDS="" fi -# bindist does not cope with amr codecs (#299405#c6), win32codecs are nonfree -# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio -# dvd navigation requires dvd read support -# ass and freetype font require iconv and ass requires freetype fonts -# unicode transformations are usefull only with iconv -# libvorbis require external tremor to work -# radio requires oss or alsa backend -# xvmc requires xvideo support +# bindist does not cope with win32codecs, which are nonfree REQUIRED_USE="bindist? ( !win32codecs )" PATCHES=( @@ -230,46 +205,13 @@ pkg_setup() { ewarn "3dnowext mmx mmxext sse sse2 ssse3) are properly set." fi - if use ffmpeg-mt && use system-ffmpeg; then - ewarn "USE flags ffmpeg-mt and system-ffmpeg are not compatible, system-ffmpeg will be used." - 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_unpack() { if [[ ${PV} = *9999* ]]; then git_src_unpack - - EGIT_REPO_URI="git://repo.or.cz/mplayer.git" - EGIT_PROJECT="${PN}" - S+="/mplayer" - git_fetch - S="${WORKDIR}/${P}" - - if ! use system-ffmpeg; then - if use ffmpeg-mt; then - EGIT_BRANCH="mt" - EGIT_COMMIT="mt" - S+="/ffmpeg-mt" - else - S+="/ffmpeg" - fi - EGIT_REPO_URI="git://repo.or.cz/FFMpeg-mirror/mplayer-patches.git" - EGIT_PROJECT="${PN}-ffmpeg" - git_fetch - EGIT_BRANCH="master" - unset EGIT_COMMIT - - cd "${S}" - EGIT_REPO_URI="git://git.mplayerhq.hu/libswscale" - EGIT_PROJECT="libswscale" - EGIT_COMMIT="$(git submodule status -- libswscale|sed -e 's/^-\(.*\) .*/\1/')" - S+="/${EGIT_PROJECT}" - git_fetch - - S="${WORKDIR}/${P}" - fi - - cd "${WORKDIR}" else unpack ${A} fi @@ -285,46 +227,18 @@ src_prepare() { if [[ ${PV} = *9999* ]]; then git_src_prepare # Set GIT version manually - pushd mplayer echo "GIT-r$(git rev-list HEAD|wc -l)-$(git describe --always)" \ > VERSION || die - popd - fi - - # remove internal libs and use system: - sed -e '/^mplayer: /s/libass//' \ - -i Makefile || die - rm -rf \ - libass \ - || die - - if use system-ffmpeg; then - sed -e '/^mplayer: /s/ffmpeg//' \ - -i Makefile || die - rm -rf ffmpeg ffmpeg-mt || die - else - if use ffmpeg-mt; then - touch ffmpeg-mt-enabled || die "enable-mt failed" - rm -rf ffmpeg || die - else - rm -rf ffmpeg-mt || die - fi - sed -i \ - -e "/'--cpu=host',/d" \ - -e "/'--disable-debug',/d" \ - -e "/'--enable-pthreads',/d" \ - script/ffmpeg-config || die fi # fix path to bash executable in configure scripts - local bash_scripts="mplayer/configure mplayer/version.sh" - use system-ffmpeg || bash_scripts+=" ffmpeg*/configure ffmpeg*/version.sh" - sed -i -e "1c\#!${EPREFIX}/bin/bash" \ + local bash_scripts="configure version.sh" + sed -i \ + -e "1c\#!${EPREFIX}/bin/bash" \ ${bash_scripts} || die # We want mplayer${namesuf} - if [[ "${namesuf}" != "" ]]; then - pushd mplayer + if [[ -n ${namesuf} ]]; then sed -e "/elif linux ; then/a\ _exesuf=\"${namesuf}\"" \ -i configure || die sed -e "/ -m 644 DOCS\/man\/en\/mplayer/i\ mv DOCS\/man\/en\/mplayer.1 DOCS\/man\/en\/mplayer${namesuf}.1" \ @@ -333,7 +247,6 @@ src_prepare() { -i Makefile || die sed -e "s/mplayer/mplayer${namesuf}/" \ -i TOOLS/midentify.sh || die - popd fi base_src_prepare @@ -414,7 +327,6 @@ src_configure() { ############# # Subtitles # ############# - # # SRT/ASS/SSA (subtitles) requires freetype support # freetype support requires iconv # iconv optionally can use unicode @@ -468,12 +380,8 @@ src_configure() { # Codecs # ########## myconf+=" --disable-musepack" # deprecated, libavcodec Musepack decoder is preferred + myconf+=" --disable-mp3lib" # internal so disable use dts || myconf+=" --disable-libdca" - if ! use mp3; then - myconf+=" - --disable-mp3lib - " - fi uses="a52 bs2b dv vorbis" for i in ${uses}; do use ${i} || myconf+=" --disable-lib${i}" @@ -652,107 +560,18 @@ src_configure() { " fi - common_options=" - --cc=$(tc-getCC) - --host-cc=$(tc-getBUILD_CC) - " - myconf+=" - --prefix="${EPREFIX}"/usr - --bindir="${EPREFIX}"/usr/bin - --libdir="${EPREFIX}"/usr/$(get_libdir) - --confdir="${EPREFIX}"/etc/mplayer - --datadir="${EPREFIX}"/usr/share/mplayer${namesuf} - --mandir="${EPREFIX}"/usr/share/man - --localedir="${EPREFIX}"/usr/share/locale - --enable-translation - " - - echo "${common_options}" > common_options - echo "${myconf}" > mplayer_options - - if ! use system-ffmpeg; then - local ffconf=" - --enable-gpl - --enable-version3 - --enable-postproc - --disable-stripping - " - - # enabled by default - use debug || ffconf+=" --disable-debug" - use network || ffconf+=" --disable-network" - use bzip2 || ffconf+=" --disable-bzlib" - - use custom-cflags && ffconf+=" --disable-optimizations" - use cpudetection && ffconf+=" --enable-runtime-cpudetect" - - # Threads; we only support pthread for now but ffmpeg supports more - use threads || ffconf+=" --disable-pthreads" - - # ffmpeg encoders - for i in faac mp3lame theora vorbis x264 xvid; do - ffconf+=" --disable-lib${i}" - done - - # ffmpeg decoders - use amr && ffconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb" - for i in gsm dirac rtmp schroedinger speex vpx; do - use ${i} && ffconf+=" --enable-lib${i}" - done - use jpeg2k && ffconf+=" --enable-libopenjpeg" - - # CPU features - for i in mmx ssse3 altivec ; do - use ${i} || ffconf+=" --disable-${i}" - done - use mmxext || ffconf+=" --disable-mmx2" - use 3dnow || ffconf+=" --disable-amd3dnow" - use 3dnowext || ffconf+=" --disable-amd3dnowext" - # disable mmx accelerated code if PIC is required - # as the provided asm decidedly is not PIC. - if gcc-specs-pie ; then - ffconf+=" --disable-mmx --disable-mmx2" - fi - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do - [ "${i}" = "native" ] && i="host" # bug #273421 - [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 - ffconf+=" --cpu=${i}" - break - done - - # cross compile support - if tc-is-cross-compiler ; then - ffconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-" - case ${CHOST} in - *freebsd*) - ffconf+=" --target-os=freebsd" - ;; - mingw32*) - ffconf+=" --target-os=mingw32" - ;; - *linux*) - ffconf+=" --target-os=linux" - ;; - esac - fi - - # Misc stuff - use hardcoded-tables && ffconf+=" --enable-hardcoded-tables" - - echo "${ffconf}" > ffmpeg_options - fi - - sed -i \ - -e 's/\t//g' \ - -e 's/ --/\n--/g' \ - -e '/^$/d' \ - *_options || die + ./configure \ + --cc=$(tc-getCC) \ + --host-cc=$(tc-getBUILD_CC) \ + --prefix="${EPREFIX}"/usr \ + --bindir="${EPREFIX}"/usr/bin \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --confdir="${EPREFIX}"/etc/mplayer${namesuf} \ + --datadir="${EPREFIX}"/usr/share/mplayer${namesuf} \ + --mandir="${EPREFIX}"/usr/share/man \ + --localedir="${EPREFIX}"/usr/share/locale \ + --enable-translation \ + ${myconf} || die } src_compile() { @@ -785,8 +604,6 @@ src_install() { INSTALLSTRIP="" \ install - S+="/mplayer" - cd "${S}" dodoc AUTHORS Copyright README etc/codecs.conf docinto tech/ @@ -815,43 +632,39 @@ src_install() { dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer${namesuf}/font fi - if use symlink; then - insinto /etc/mplayer - newins "${S}/etc/example.conf" mplayer.conf - doins "${S}/etc/input.conf" - if use osdmenu; then - doins "${S}/etc/menu.conf" - fi + insinto /etc/mplayer${namesuf} + newins "${S}/etc/example.conf" mplayer.conf + cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_ +# Config options can be section specific, global +# options should go in the default section +[default] +_EOF_ + doins "${S}/etc/input.conf" + if use osdmenu; then + doins "${S}/etc/menu.conf" + fi - if use ass || use truetype; then - cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ + if use ass || use truetype; then + cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_ fontconfig=1 subfont-osd-scale=4 subfont-text-scale=3 _EOF_ - fi + fi - # bug 256203 - if use rar; then - cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_ + # bug 256203 + if use rar; then + cat >> "${ED}/etc/mplayer${namesuf}/mplayer.conf" << _EOF_ unrarexec=${EPREFIX}/usr/bin/unrar _EOF_ - fi - - dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer${namesuf}/mplayer.conf fi + dosym ../../../etc/mplayer${namesuf}/mplayer.conf /usr/share/mplayer${namesuf}/mplayer.conf newbin "${S}/TOOLS/midentify.sh" midentify${namesuf} - if [[ "${namesuf}" != "" ]] && use symlink; then + if [[ -n ${namesuf} ]] && use symlink; then + dosym /etc/mplayer${namesuf} /etc/mplayer dosym "mplayer${namesuf}" /usr/bin/mplayer dosym "midentify${namesuf}" /usr/bin/midentify fi } - -pkg_postrm() { - # Cleanup stale symlinks - [ -L "${EROOT}/usr/share/mplayer${namesuf}/font" -a \ - ! -e "${EROOT}/usr/share/mplayer${namesuf}/font" ] && \ - rm -f "${EROOT}/usr/share/mplayer${namesuf}/font" -} diff --git a/media-video/vmaid/Manifest b/media-video/vmaid/Manifest index d7752f23986d..813f9b097f48 100644 --- a/media-video/vmaid/Manifest +++ b/media-video/vmaid/Manifest @@ -1,4 +1,14 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST vmaid-2.2.0.tar.gz 1267631 RMD160 46e03069c77c22add4f49b9d04368553f966677d SHA1 c0c443ba35eb74603d0b234fcb036e497ba479c6 SHA256 433e9aefe7b9b45308e76ce0f0cb7b63ab35f4c290f38ecdec5ce5889238ec2a -EBUILD vmaid-2.2.0.ebuild 1090 RMD160 9899338a3a76acfb45d85814462bb58a45d0cfff SHA1 c802a563826dc6f18b4028b3d5ea5a0a1086e18b SHA256 25723cd4f2aec61aa22ef4b2ffd44ae04482603c294ec58af850f0d59fe9c31e -MISC ChangeLog 1257 RMD160 27c78488319d14e41fe7bda680ef84699280eb92 SHA1 110db7f786c2e58a62191f4cd46904606e38bf73 SHA256 3f155a94f624aef183288f3e6f54452478939d7705413f466518c1137d859a45 +EBUILD vmaid-2.2.0.ebuild 1097 RMD160 f6516639df042acf5edbbaaa7815ac7b90428f46 SHA1 a7def82e913437b2818e9e91f464a3dcb22b9076 SHA256 99791f0d87117a5fe08278768016b87ee2bd2d9d1bd046bd9678b84844ea8f94 +MISC ChangeLog 1352 RMD160 e2d900ae39479238da2fa7940e1ce6c081fc098f SHA1 d597876ed1004f4854a83829fca36015ee103abf SHA256 0d5f4e5529fe5c47ae1b49e20429b2279391051cd27eb72ab6d3500eaf92b93c MISC metadata.xml 525 RMD160 fcc2ea7bf49afeb37771664b2298cde0e33d2ee1 SHA1 902c036cf731ca0387d66c9035d75745bad4d2bf SHA256 0da5742cf2320e0bb4eae084acb9f0f70bd30899d3cec199274a7a6a46874a83 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iF4EAREIAAYFAk2R1FsACgkQmWq1bYTyC0M5tQEAhyByk8LgT0fR5pJxoPC4iQRX +S3I8t7MAHnTCDDuqtK8BAMMtMQWu0d353FyAS3rKGgURm3VGdvqc/s7IfFme9QLR +=mNQ4 +-----END PGP SIGNATURE----- |