From a5c74211d528c633785d1cec8ce3dcf7b65d9593 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Thu, 6 May 2010 13:38:12 +0000 Subject: [PATCH] Rollup new snapshot. Drop old. This should be stable candidate. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-video/mplayer/ChangeLog | 13 +- media-video/mplayer/Manifest | 20 +- ..._rc2_p20090322-fix-undeclared-spudec.patch | 24 - ...090530-fix-mp3lib-use-local-labels-2.patch | 40 - .../mplayer-1.0_rc2_p20090731-linguas.patch | 14 - ...layer-1.0_rc4_p20091124-r1-libtheora.patch | 39 - .../mplayer-1.0_rc4_p20100213-r1.ebuild | 740 ------------------ ...build => mplayer-1.0_rc4_p20100506.ebuild} | 3 +- 8 files changed, 20 insertions(+), 873 deletions(-) delete mode 100644 media-video/mplayer/files/mplayer-1.0_rc2_p20090322-fix-undeclared-spudec.patch delete mode 100644 media-video/mplayer/files/mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch delete mode 100644 media-video/mplayer/files/mplayer-1.0_rc2_p20090731-linguas.patch delete mode 100644 media-video/mplayer/files/mplayer-1.0_rc4_p20091124-r1-libtheora.patch delete mode 100644 media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild rename media-video/mplayer/{mplayer-1.0_rc4_p20100427.ebuild => mplayer-1.0_rc4_p20100506.ebuild} (99%) diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index c10f50b9049a..c42df11b3581 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.737 2010/05/05 08:37:34 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.738 2010/05/06 13:38:12 scarabeus Exp $ + +*mplayer-1.0_rc4_p20100506 (06 May 2010) + + 06 May 2010; Tomáš Chvátal + -files/mplayer-1.0_rc2_p20090322-fix-undeclared-spudec.patch, + -files/mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch, + -files/mplayer-1.0_rc2_p20090731-linguas.patch, + -mplayer-1.0_rc4_p20100213-r1.ebuild, -mplayer-1.0_rc4_p20100427.ebuild, + +mplayer-1.0_rc4_p20100506.ebuild, + -files/mplayer-1.0_rc4_p20091124-r1-libtheora.patch: + Rollup new snapshot. Drop old. This should be stable candidate. 05 May 2010; Tomáš Chvátal mplayer-9999.ebuild: Remove emake call from src_compile, is already run by base eclass. diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 64a3579466a9..713a7bde9ac3 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,29 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX mplayer-1.0_rc2_p20090322-fix-undeclared-spudec.patch 689 RMD160 a2a26ad4129bcfb4330ed6f1ee35e6ee1b73fb0d SHA1 918dee2cdff42297376d1afcb9eb9cff6f6f4094 SHA256 54b129ae19a1728981fef5530ba12828f163079201bb479afba7a74d4425e847 -AUX mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch 986 RMD160 4ff6e06c604c3d609d1f4cbdd560577d89f3eabc SHA1 cf26d0c5a6b5ab9a36864cfdfb34106e2676ab2f SHA256 63e43820838365fec77e53d7f2b70091045b350c5c4e7c304c5ca692c20551d7 -AUX mplayer-1.0_rc2_p20090731-linguas.patch 699 RMD160 eccde57fe14b664e962ca5c997fa6b72ebadc763 SHA1 0f036a975250a7ef6429f9c6dce036453c3a1d25 SHA256 c0939c548249afbc45905570c99bb6593175ebaf6e34bfceda284253600d9d22 AUX mplayer-1.0_rc4_p20091026-arm_neon.patch 591 RMD160 339c545419fd815a4b2aa1db9214620ce1b90f85 SHA1 219300d43e567fb3a0df9388798015bef09ddc01 SHA256 71d95820bc0d61a16469e42fa2fe42d4c46ca5339876f926259ed390cbbc899c -AUX mplayer-1.0_rc4_p20091124-r1-libtheora.patch 1067 RMD160 58c172ffa186d616462405cec7cbc17e085e7d8e SHA1 0c4154a7ee429f8bc4b28204b9b3385d2c949e64 SHA256 bde37379b335a0505addc15697d807f3536843747556b61591333dded1a05be5 DIST Blue-1.7.tar.bz2 222567 RMD160 1f8c539ccadc54eea5e6678839bcc8ae1e16e6eb SHA1 45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9 SHA256 8bcd39a5755c44df778ebca3119c922347abfdadb101dcef011ce2566c1fb1d8 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 mplayer-1.0_rc4_p20091026.tbz2 15508762 RMD160 f4a6b4253cfbea8d3f7d6e1ac1c5a0d2a0775289 SHA1 dcd55d37d2866ef43b626db62572d7b03a8ca0d9 SHA256 bea714010cf4b0b4f1003716b36d03b73b694dc81a68785c11ef0a9bcafbaa3a -DIST mplayer-1.0_rc4_p20100213.tbz2 8811960 RMD160 b6991ef2dde9497bcffa32687f484598956db983 SHA1 350d39f2b42f5c5065abe7d64a4d759a9efa56f4 SHA256 59c09f6388ad15d12f74ae18ebe07945392e40d9096d5598bd496f857722bcb0 -DIST mplayer-1.0_rc4_p20100427.tar.bz2 16247617 RMD160 435eb69a406e2d53e92fd65cb2cdcbe31a469a94 SHA1 e6a8999652b9c60ed8dd209f5aae4c4ae9a0083f SHA256 f96075c4dacb7114f777e8055a6dc16659cd06023de1988c16b5dfe95860e563 +DIST mplayer-1.0_rc4_p20100506.tar.bz2 8966725 RMD160 3355600313ac6e6e661acfcdec761551f0372b53 SHA1 385291b01a5af25279a9b2f432afef6dfa8260de SHA256 c64be54f58d266d93fe6c0fa1819228c22a433c0ad8ff019ca319a2076051a66 DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18927 RMD160 c7309c7c6ede6bac97c11cad1cc7b0e22aefbd51 SHA1 c86f4c9aaa6988514567767bc956e13990604bce SHA256 33f3781cb30c8fa255720858dca723597a4e58aef5fa2ab61c22dcc295b9b070 -EBUILD mplayer-1.0_rc4_p20100213-r1.ebuild 19858 RMD160 5f77503100806ab35de8133fa488d965438b73f6 SHA1 2d24955936312f05e7c21e0121ca0140d2fc2f0e SHA256 1655621f8bd99ed913f5e3b3104645c2c4fb6644a0de4dcc26b28c71ef1b5fd8 -EBUILD mplayer-1.0_rc4_p20100427.ebuild 20242 RMD160 48f29cd100c754ef2ec959c49854a3c580cfd1bd SHA1 a20b43304ca84e28cc04a08896a6993fb733a99c SHA256 d3ce9ec7a9b5ba1d817b51e0a63e3c06f3d98a6f9f6b7c91fed90416f4ad9497 +EBUILD mplayer-1.0_rc4_p20100506.ebuild 20201 RMD160 3e41cf9ad5ce3765d2a926306af22fcc1e030ae4 SHA1 d0c1f0726bcb4cf84b3362bc9d73adade6c36d64 SHA256 309efb0404b25189ac3082576d1e437acec8ecd30dc8db1d7e4e6e7941940927 EBUILD mplayer-9999.ebuild 20223 RMD160 023de2de57daad2923edcb675728c63c5f502db4 SHA1 faf6662a382438d3ef9123fd7861a6a9b72bc704 SHA256 cc65f3d51cff0826da0d3d2790888658fbd74ca044283a94be0a401c9034e7a8 -MISC ChangeLog 130080 RMD160 571759a95b05147a44503d72c606974126aeefbb SHA1 1c006fe2991c2759f8fac8e3b97dfb741f63caf5 SHA256 9c89e98e1f98ee299943dfb796a0df396aa0e6196943c1c8a3569e1d337b685b +MISC ChangeLog 130597 RMD160 b33628d4458e7f5d4a1c391aa889bad1961eb8a0 SHA1 12d7e1247551bf303e71da1765e9d7a29a0b227c SHA256 a319fe2a936f05fa8c24042dcfe0099f23a5ac9b570dd062af9f1102d4b58ccf MISC metadata.xml 3586 RMD160 b9cb0e6ff486e5d3cc87e4d23bf0facb1bfa9b5b SHA1 9e082b1c3ff16683a7f7a3b0fd57eaad70673f24 SHA256 5a31e1c7c36addd4653af26afeacdf5cf527c03c55b1636fe0d9aad19215766e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvhLk8ACgkQHB6c3gNBRYcBWQCdH33q1cT6RLBSGwVnVmYV6BCe -XAcAni6T+fHo4bKUevi2XgAgxnUjyLTK -=95eh +iEYEARECAAYFAkvixlEACgkQHB6c3gNBRYfHXACeMiRGvnW812rOWgUb27+2uRsS +CY8AnjpYHCiIXArx/stMKrTVutrP46ID +=5r8g -----END PGP SIGNATURE----- diff --git a/media-video/mplayer/files/mplayer-1.0_rc2_p20090322-fix-undeclared-spudec.patch b/media-video/mplayer/files/mplayer-1.0_rc2_p20090322-fix-undeclared-spudec.patch deleted file mode 100644 index 2af4af5bf356..000000000000 --- a/media-video/mplayer/files/mplayer-1.0_rc2_p20090322-fix-undeclared-spudec.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 32173c61625b49e8e99c9abee6fda3034ede8f64 -Author: diego -Date: Tue May 5 17:27:36 2009 +0000 - - Remove pointless #ifdef around spudec.h #include. - Fixes the build with dvdread disabled. - - - git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29262 b3059339-0415-0410-9bf9-f77b7e298cf2 - -diff --git a/mencoder.c b/mencoder.c -index bd2ca83..fca7dfb 100644 ---- a/mencoder.c -+++ b/mencoder.c -@@ -285,9 +285,7 @@ static int edl_seek(edl_record_ptr next_edl_record, demuxer_t* demuxer, demux_st - - #include "cfg-mencoder.h" - --#ifdef CONFIG_DVDREAD - #include "spudec.h" --#endif - #include "vobsub.h" - - #include "libao2/audio_out.h" diff --git a/media-video/mplayer/files/mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch b/media-video/mplayer/files/mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch deleted file mode 100644 index be56a445085b..000000000000 --- a/media-video/mplayer/files/mplayer-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: mp3lib/decode_mmx.c -=================================================================== ---- mp3lib/decode_mmx.c (revision 29321) -+++ mp3lib/decode_mmx.c (working copy) -@@ -219,7 +219,7 @@ - //printf("DEBUG: channel %d, bo %d, off %d\n", channel, bo, 16 - bo1); - __asm__ volatile( - ASMALIGN(4) --".L03:\n\t" -+"0:\n\t" - "movq (%1),%%mm0\n\t" - "movq 64(%1),%%mm4\n\t" - "pmaddwd (%2),%%mm0\n\t" -@@ -265,7 +265,7 @@ - "add $8,%3\n\t" - - "decl %0\n\t" -- "jnz .L03\n\t" -+ "jnz 0b\n\t" - - "movq (%1),%%mm0\n\t" - "pmaddwd (%2),%%mm0\n\t" -@@ -291,7 +291,7 @@ - - "movl $7,%0\n\t" - ASMALIGN(4) --".L04:\n\t" -+"1:\n\t" - "movq (%1),%%mm0\n\t" - "movq 64(%1),%%mm4\n\t" - "pmaddwd (%2),%%mm0\n\t" -@@ -340,7 +340,7 @@ - "add $128,%1\n\t" - "add $8,%3\n\t" - "decl %0\n\t" -- "jnz .L04\n\t" -+ "jnz 1b\n\t" - - "movq (%1),%%mm0\n\t" - "pmaddwd (%2),%%mm0\n\t" diff --git a/media-video/mplayer/files/mplayer-1.0_rc2_p20090731-linguas.patch b/media-video/mplayer/files/mplayer-1.0_rc2_p20090731-linguas.patch deleted file mode 100644 index 6c0dcbe2865f..000000000000 --- a/media-video/mplayer/files/mplayer-1.0_rc2_p20090731-linguas.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur mplayer-1.0_rc2_p20090731.orig/configure mplayer-1.0_rc2_p20090731/configure ---- mplayer-1.0_rc2_p20090731.orig/configure 2009-07-31 23:22:31.000000000 +0300 -+++ mplayer-1.0_rc2_p20090731/configure 2009-08-03 10:02:18.000000000 +0300 -@@ -2838,8 +2838,9 @@ - test -z "$language_man" && language_man=en - - for lang in $language_msg ; do -- test -f "help/help_mp-${lang}.h" && language_msg=$lang && break -+ test -f "help/help_mp-${lang}.h" && language_msg_tmp=$lang && break - done -+language_msg=$language_msg_tmp - test -z "$language_msg" && language_msg=en - _mp_help="help/help_mp-${language_msg}.h" - echores "messages: $language_msg - man pages: $language_man - documentation: $language_doc" diff --git a/media-video/mplayer/files/mplayer-1.0_rc4_p20091124-r1-libtheora.patch b/media-video/mplayer/files/mplayer-1.0_rc4_p20091124-r1-libtheora.patch deleted file mode 100644 index baec435eba9f..000000000000 --- a/media-video/mplayer/files/mplayer-1.0_rc4_p20091124-r1-libtheora.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- libavcodec/libtheoraenc.c.orig 2009-11-25 20:55:18.000000000 -0700 -+++ libavcodec/libtheoraenc.c 2009-11-25 20:55:21.000000000 -0700 -@@ -86,6 +86,7 @@ - - static int get_stats(AVCodecContext *avctx, int eos) - { -+#ifdef TH_ENCCTL_2PASS_OUT - TheoraContext *h = avctx->priv_data; - uint8_t *buf; - int bytes; -@@ -108,12 +109,17 @@ - av_base64_encode(avctx->stats_out, b64_size, h->stats, h->stats_offset); - } - return 0; -+#else -+ av_log(avctx, AV_LOG_ERROR, "libtheora too old to support 2pass\n"); -+ return -1; -+#endif - } - - // libtheora won't read the entire buffer we give it at once, so we have to - // repeatedly submit it... - static int submit_stats(AVCodecContext *avctx) - { -+#ifdef TH_ENCCTL_2PASS_IN - TheoraContext *h = avctx->priv_data; - int bytes; - if (!h->stats) { -@@ -138,6 +144,10 @@ - h->stats_offset += bytes; - } - return 0; -+#else -+ av_log(avctx, AV_LOG_ERROR, "libtheora too old to support 2pass\n"); -+ return -1; -+#endif - } - - static av_cold int encode_init(AVCodecContext* avc_context) diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild deleted file mode 100644 index 6521e5e87dc3..000000000000 --- a/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild +++ /dev/null @@ -1,740 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100213-r1.ebuild,v 1.9 2010/04/23 13:04:43 ssuominen Exp $ - -EAPI="2" - -ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" -[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion" || SVN_ECLASS="" - -inherit eutils flag-o-matic multilib base ${SVN_ECLASS} - -[[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r30554 - -IUSE="3dnow 3dnowext +a52 +aac aalib +alsa altivec +ass bidi bindist bl bs2b -+cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac directfb -doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon ftp -gif ggi -gmplayer +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa -libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal -amr +opengl +osdmenu oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc -samba +shm +schroedinger sdl +speex sse sse2 ssse3 svga tga +theora +tremor -+truetype +toolame +twolame +unicode v4l v4l2 vdpau vidix +vorbis win32codecs -+X +x264 xanim xinerama +xscreensaver +xv +xvid xvmc zoran" -[[ ${PV} == *9999* ]] && IUSE+=" external-ffmpeg" - -VIDEO_CARDS="s3virge mga tdfx vesa" -for x in ${VIDEO_CARDS}; do - IUSE+=" video_cards_${x}" -done - -BLUV="1.7" -SVGV="1.9.17" -AMR_URI="http://www.3gpp.org/ftp/Specs/archive" -FONT_URI=" - 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 -" -if [[ ${PV} == *9999* ]]; then - RELEASE_URI="" -else - RELEASE_URI="mirror://gentoo/${P}.tbz2" -fi -SRC_URI="${RELEASE_URI} - !truetype? ( ${FONT_URI} ) - gmplayer? ( mirror://mplayer/skins/Blue-${BLUV}.tar.bz2 ) - svga? ( mirror://gentoo/svgalib_helper-${SVGV}-mplayer.tar.gz )" -# svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 ) - -DESCRIPTION="Media Player for Linux" -HOMEPAGE="http://www.mplayerhq.hu/" - -FONT_RDEPS=" - virtual/ttf-fonts - media-libs/fontconfig - media-libs/freetype:2 -" -X_RDEPS=" - x11-libs/libXext - x11-libs/libXxf86vm -" -[[ ${PV} == *9999* ]] && RDEPEND+=" external-ffmpeg? ( media-video/ffmpeg )" -# Rar: althrought -gpl version is nice, it cant do most functions normal rars can -# nemesi? ( net-libs/libnemesi ) -RDEPEND+=" - sys-libs/ncurses - !bindist? ( - x86? ( - win32codecs? ( media-libs/win32codecs ) - ) - ) - X? ( - ${X_RDEPS} - ass? ( ${FONT_RDEPS} ) - dga? ( x11-libs/libXxf86dga ) - ggi? ( - media-libs/libggi - media-libs/libggiwmh - ) - gmplayer? ( - media-libs/libpng - x11-libs/gtk+:2 - x11-libs/libXi - ) - opengl? ( virtual/opengl ) - truetype? ( ${FONT_RDEPS} ) - vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) ) - xinerama? ( x11-libs/libXinerama ) - xscreensaver? ( x11-libs/libXScrnSaver ) - xv? ( - x11-libs/libXv - xvmc? ( x11-libs/libXvMC ) - ) - ) - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - bidi? ( dev-libs/fribidi ) - bs2b? ( media-libs/libbs2b ) - cdio? ( dev-libs/libcdio ) - cdparanoia? ( media-sound/cdparanoia ) - dirac? ( media-video/dirac ) - directfb? ( dev-libs/DirectFB ) - dts? ( media-libs/libdca ) - dv? ( media-libs/libdv ) - dvb? ( media-tv/linuxtv-dvb-headers ) - encode? ( - !twolame? ( toolame? ( media-sound/toolame ) ) - twolame? ( media-sound/twolame ) - faac? ( media-libs/faac ) - mp3? ( media-sound/lame ) - x264? ( >=media-libs/x264-0.0.20091124 ) - xvid? ( media-libs/xvid ) - ) - esd? ( media-sound/esound ) - enca? ( app-i18n/enca ) - faad? ( !aac? ( media-libs/faad2 ) ) - gif? ( media-libs/giflib ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg? ( media-libs/jpeg ) - ladspa? ( media-libs/ladspa-sdk ) - libcaca? ( media-libs/libcaca ) - lirc? ( app-misc/lirc ) - live? ( media-plugins/live ) - lzo? ( >=dev-libs/lzo-2 ) - mad? ( media-libs/libmad ) - mng? ( media-libs/libmng ) - nas? ( media-libs/nas ) - nut? ( >=media-libs/libnut-661 ) - openal? ( media-libs/openal ) - amr? ( media-libs/opencore-amr ) - jpeg2k? ( media-libs/openjpeg ) - png? ( media-libs/libpng ) - pnm? ( media-libs/netpbm ) - pulseaudio? ( media-sound/pulseaudio ) - rar? ( - || ( - app-arch/unrar - app-arch/rar - ) - ) - samba? ( net-fs/samba ) - schroedinger? ( media-libs/schroedinger ) - sdl? ( media-libs/libsdl ) - speex? ( media-libs/speex ) - svga? ( media-libs/svgalib ) - theora? ( media-libs/libtheora ) - vorbis? ( media-libs/libvorbis ) - xanim? ( media-video/xanim ) -" - -X_DEPS=" - x11-proto/videoproto - x11-proto/xf86vidmodeproto -" -ASM_DEP="dev-lang/yasm" -DEPEND="${RDEPEND} - dev-util/pkgconfig - X? ( - ${X_DEPS} - dga? ( x11-proto/xf86dgaproto ) - dxr3? ( media-video/em8300-libraries ) - gmplayer? ( x11-proto/xextproto ) - xinerama? ( x11-proto/xineramaproto ) - xscreensaver? ( x11-proto/scrnsaverproto ) - ) - amd64? ( ${ASM_DEP} ) - doc? ( dev-libs/libxslt ) - iconv? ( virtual/libiconv ) - x86? ( ${ASM_DEP} ) - x86-fbsd? ( ${ASM_DEP} ) -" - -SLOT="0" -LICENSE="GPL-2" -if [[ ${PV} != *9999* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -else - KEYWORDS="" -fi - -PATCHES=( -) - -pkg_setup() { - if [[ ${PV} == *9999* ]]; then - elog "" - elog "This is a live ebuild which installs the latest from upstream's" - elog "subversion repository, and is unsupported by Gentoo." - elog "Everything but bugs in the ebuild itself will be ignored." - elog "" - fi - - if use gmplayer; then - ewarn "" - ewarn "GMPlayer is no longer actively developed upstream" - ewarn "and is not supported by Gentoo. There are alternatives" - ewarn "for a GUI frontend: smplayer, gnome-mplayer or kmplayer." - 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 - - if use custom-cpuopts; then - ewarn "" - ewarn "You are using the custom-cpuopts flag which will" - ewarn "specifically allow you to enable / disable certain" - ewarn "CPU optimizations." - ewarn "" - ewarn "Most desktop users won't need this functionality, but it" - ewarn "is included for corner cases like cross-compiling and" - ewarn "certain profiles. If unsure, disable this flag and MPlayer" - ewarn "will automatically detect and use your available CPU" - ewarn "optimizations." - ewarn "" - ewarn "Using this flag means your build is unsupported, so" - ewarn "please make sure your CPU optimization use flags (3dnow" - ewarn "3dnowext mmx mmxext sse sse2 ssse3) are properly set." - fi -} - -src_unpack() { - [[ ${PV} = *9999* ]] && subversion_src_unpack || unpack ${A} - - if ! use truetype; then - unpack font-arial-iso-8859-1.tar.bz2 \ - font-arial-iso-8859-2.tar.bz2 \ - font-arial-cp1250.tar.bz2 - fi - - use gmplayer && unpack "Blue-${BLUV}.tar.bz2" - use svga && unpack "svgalib_helper-${SVGV}-mplayer.tar.gz" -} - -src_prepare() { - if [[ ${PV} = *9999* ]]; then - # Set SVN version manually - subversion_wc_info - sed -i s/UNKNOWN/${ESVN_WC_REVISION}/ "${S}/version.sh" - else - # Set version # - sed -i s/UNKNOWN/${MPLAYER_REVISION}/ "${S}/version.sh" - fi - - if use svga; then - echo - einfo "Enabling vidix non-root mode." - einfo "(You need a proper svgalib_helper.o module for your kernel" - einfo "to actually use this)" - echo - - mv "${WORKDIR}/svgalib_helper" "${S}/libdha" - 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# - ################### - myconf+=" - --disable-arts - --disable-kai - $(use_enable network) - $(use_enable joystick) - " - uses="bl enca ftp 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 ass || myconf+=" --disable-ass --disable-ass-internal" - use bidi || myconf+=" --disable-fribidi" - use encode || myconf+=" --disable-mencoder" - 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 - - # libcdio support: prefer libcdio over cdparanoia - # don't check for cddb w/cdio - if use cdio; then - myconf+=" --disable-cdparanoia" - else - myconf+=" --disable-libcdio" - use cdparanoia || myconf+=" --disable-cdparanoia" - use cddb || myconf+=" --disable-cddb" - fi - - ################################ - # DVD read, navigation support # - ################################ - # - # dvdread - accessing a DVD - # dvdnav - navigation of menus - # - # internal dvdread and dvdnav use flags enable internal - # versions of the libraries, which are snapshots of the fork. - # - # Only check for disabled a52 use flag inside the DVD check, - # since many users were getting confused why there was no - # audio stream. - - if use dvd; then - use dvdnav || myconf+=" --disable-dvdnav" - else - myconf+=" - --disable-dvdnav - --disable-dvdread - --disable-dvdread-internal - --disable-libdvdcss-internal - " - use a52 || myconf+=" --disable-liba52-internal" - fi - - ############# - # Subtitles # - ############# - # - # SRT/ASS/SSA (subtitles) requires freetype support - # freetype support requires iconv - # iconv optionally can use unicode - - if ! use ass; then - if ! use truetype; then - myconf+=" --disable-freetype" - if ! use iconv; then - myconf+=" - --disable-iconv - --charset=noconv - " - fi - fi - fi - 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" - if { use dvb || use v4l || use v4l2 || use pvr || use radio; }; then - use dvb || myconf+=" --disable-dvb --disable-dvbhead" - use pvr || myconf+=" --disable-pvr" - use v4l || myconf+=" --disable-tv-v4l1" - use v4l2 || myconf+=" --disable-tv-v4l2" - if use radio && { use dvb || use v4l || use v4l2; }; then - myconf+=" - --enable-radio - $(use_enable encode radio-capture) - " - else - myconf+=" - --disable-radio-v4l2 - --disable-radio-bsdbt848 - " - fi - else - myconf+=" - --disable-tv - --disable-tv-v4l1 - --disable-tv-v4l2 - --disable-radio - --disable-radio-v4l2 - --disable-radio-bsdbt848 - --disable-dvb - --disable-dvbhead - --disable-v4l2 - --disable-pvr" - fi - - ########## - # Codecs # - ########## - # Won't work with external liba52 - myconf+=" --disable-liba52" - # Use internal musepack codecs for SV7 and SV8 support - myconf+=" --disable-musepack" - - use aac || myconf+=" --disable-faad-internal" - use dirac || myconf+=" --disable-libdirac-lavc" - use dts || myconf+=" --disable-libdca" - use dv || myconf+=" --disable-libdv" - use faad || myconf+=" --disable-faad" - use lzo || myconf+=" --disable-liblzo" - if ! use mp3; then - myconf+=" - --disable-mp3lame - --disable-mp3lame-lavc - --disable-mp3lib - " - fi - use bs2b || myconf+=" --disable-libbs2b" - use schroedinger || myconf+=" --disable-libschroedinger-lavc" - use xanim && myconf+=" --xanimcodecsdir=/usr/lib/xanim/mods" - if ! use png && ! use gmplayer; then - myconf+=" --disable-png" - fi - - uses="gif jpeg live mad mng pnm speex tga theora xanim" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use jpeg2k || myconf+=" --disable-libopenjpeg" - if use vorbis || use tremor; then - use tremor || myconf+=" --disable-tremor-internal" - use vorbis || myconf+=" --disable-libvorbis" - else - myconf+=" - --disable-tremor-internal - --disable-tremor - --disable-libvorbis - " - fi - # Encoding - if use encode; then - uses="faac x264 xvid toolame twolame" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use aac || myconf+=" --disable-faac-lavc" - else - myconf+=" - --disable-faac-lavc - --disable-faac - --disable-x264 - --disable-xvid - --disable-x264-lavc - --disable-xvid-lavc - --disable-twolame - --disable-toolame - " - uses="aac faac x264 xvid toolame twolame" - for i in ${uses}; do - use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled to work." - done - fi - - ################# - # 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+=" --realcodecsdir=/opt/RealPlayer/codecs" - use amd64 && myconf+=" --realcodecsdir=/usr/$(get_libdir)/codecs" - elif ! use bindist; then - myconf+=" $(use_enable win32codecs win32dll)" - fi - - ################ - # 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 zoran || myconf+=" --disable-zr" - - 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 - - ################ - # Audio Output # - ################ - uses="alsa esd jack ladspa nas openal" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - 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) - if use cpudetection; then - myconf+=" --enable-runtime-cpudetection" - fi - - # Turning off CPU optimizations usually will break the build. - # However, this use flag, if enabled, will allow users to completely - # specify which ones to use. If disabled, mplayer will automatically - # enable all CPU optimizations that the host build supports. - if use custom-cpuopts; then - uses="3dnow 3dnowext altivec mmx mmxext shm sse sse2 ssse3" - for i in ${uses}; do - myconf+=" $(use_enable ${i})" - done - fi - - use debug && myconf+=" --enable-debug=3" - - if use x86; then - filter-flags -fPIC -fPIE - append-ldflags -nopie - fi - - append-flags -D__STDC_LIMIT_MACROS - is-flag -O? || append-flags -O2 - if use x86 || use x86-fbsd; then - use debug || append-flags -fomit-frame-pointer - fi - - ########################### - # X enabled configuration # - ########################### - if use X; then - uses="dxr3 ggi xinerama" - for i in ${uses}; do - use ${i} || myconf+=" --disable-${i}" - done - use dga || myconf+=" --disable-dga1 --disable-dga2" - use opengl || myconf+=" --disable-gl" - use osdmenu && myconf+=" --enable-menu" - use vdpau || myconf+=" --disable-vdpau" - use video_cards_vesa || myconf+=" --disable-vesa" - use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb" - use xscreensaver || myconf+=" --disable-xss" - - # GTK gmplayer gui - # Unsupported by Gentoo, upstream has dropped development - myconf+=" $(use_enable gmplayer gui)" - - if use xv; then - if use xvmc; then - myconf+=" --enable-xvmc --with-xvmclib=XvMCW" - else - myconf+=" --disable-xvmc" - fi - else - myconf+=" - --disable-xv - --disable-xvmc - " - use xvmc && elog "Disabling xvmc because it requires \"xv\" useflag enabled." - fi - else - myconf+=" - --disable-dga1 - --disable-dga2 - --disable-dxr3 - --disable-ggi - --disable-gl - --disable-vdpau - --disable-vidix - --disable-vidix-pcidb - --disable-xinerama - --disable-xss - --disable-xv - --disable-xvmc - " - uses="dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver xv" - for i in ${uses}; do - use ${i} && elog "Useflag \"${i}\" require \"X\" useflag enabled to work." - done - fi - - if [[ ${PV} == *9999* ]]; then - ################### - # External FFmpeg # - ################### - use external-ffmpeg && myconf+=" --disable-libavutil_a --disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a --disable-libswscale_a" - fi - - myconf="--cc=$(tc-getCC) \ - --host-cc=$(tc-getBUILD_CC) \ - --prefix=/usr \ - --confdir=/etc/mplayer \ - --datadir=/usr/share/mplayer \ - --libdir=/usr/$(get_libdir) \ - ${myconf}" - - CFLAGS="${CFLAGS}" ./configure ${myconf} || die "configure died" -} - -src_compile() { - base_src_compile - emake || die "Failed to build MPlayer!" - use doc && make -C DOCS/xml html-chunked -} - -src_install() { - local i - - emake prefix="${D}/usr" \ - BINDIR="${D}/usr/bin" \ - LIBDIR="${D}/usr/$(get_libdir)" \ - CONFDIR="${D}/etc/mplayer" \ - DATADIR="${D}/usr/share/mplayer" \ - MANDIR="${D}/usr/share/man" \ - INSTALLSTRIP="" \ - install || die "emake install failed" - - dodoc AUTHORS Changelog Copyright README etc/codecs.conf || die - - docinto tech/ - dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist} || die - docinto TOOLS/ - dodoc TOOLS/* || die - if use real; then - docinto tech/realcodecs/ - dodoc DOCS/tech/realcodecs/* || die - docinto TOOLS/realcodecs/ - dodoc TOOLS/realcodecs/* || die - fi - docinto tech/mirrors/ - dodoc DOCS/tech/mirrors/* || die - - if use doc; then - dohtml -r "${S}"/DOCS/HTML/* || die - fi - - # Install the default Skin and Gnome menu entry - if use gmplayer; then - dodir /usr/share/mplayer/skins - cp -r "${WORKDIR}/Blue" \ - "${D}/usr/share/mplayer/skins/default" || die "cp skins died" - - # Fix the symlink - rm -rf "${D}/usr/bin/gmplayer" - dosym mplayer /usr/bin/gmplayer - fi - - if ! use ass && ! use truetype; then - dodir /usr/share/mplayer/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}" "${D}/usr/share/mplayer/fonts" - done - # Fix the font symlink ... - rm -rf "${D}/usr/share/mplayer/font" - dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font - fi - - insinto /etc/mplayer - newins "${S}/etc/example.conf" mplayer.conf || die - doins "${S}/etc/input.conf" || die - if use osdmenu; then - doins "${S}/etc/menu.conf" || die - fi - - if use ass || use truetype; then - cat >> "${D}/etc/mplayer/mplayer.conf" << _EOF_ -fontconfig=1 -subfont-osd-scale=4 -subfont-text-scale=3 -_EOF_ - fi - - # bug 256203 - if use rar; then - cat >> "${D}/etc/mplayer/mplayer.conf" << _EOF_ -unrarexec=/usr/bin/unrar -_EOF_ - fi - - dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf - newbin "${S}/TOOLS/midentify.sh" midentify || die -} - -pkg_preinst() { - [[ -d ${ROOT}/usr/share/mplayer/Skin/default ]] && \ - rm -rf "${ROOT}/usr/share/mplayer/Skin/default" -} - -pkg_postrm() { - # Cleanup stale symlinks - [ -L "${ROOT}/usr/share/mplayer/font" -a \ - ! -e "${ROOT}/usr/share/mplayer/font" ] && \ - rm -f "${ROOT}/usr/share/mplayer/font" - - [ -L "${ROOT}/usr/share/mplayer/subfont.ttf" -a \ - ! -e "${ROOT}/usr/share/mplayer/subfont.ttf" ] && \ - rm -f "${ROOT}/usr/share/mplayer/subfont.ttf" -} diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20100506.ebuild similarity index 99% rename from media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild rename to media-video/mplayer/mplayer-1.0_rc4_p20100506.ebuild index 1a1698f8633b..d4ded3aa2542 100644 --- a/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild +++ b/media-video/mplayer/mplayer-1.0_rc4_p20100506.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100427.ebuild,v 1.4 2010/04/29 17:08:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20100506.ebuild,v 1.1 2010/05/06 13:38:12 scarabeus Exp $ EAPI="2" @@ -633,7 +633,6 @@ src_configure() { src_compile() { base_src_compile - emake || die "Failed to build MPlayer!" # Build only user-requested docs if they're available. if use doc ; then # select available languages from $LINGUAS -- 2.26.2