From 967f13cd48e7ae8abbbcf0b6cf3a3eb35b37d9f9 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 26 Feb 2010 23:19:14 +0000 Subject: [PATCH] media-video/mplayer: Copy latest to 9999 before proceeding Package-Manager: portage-2.2_rc61/cvs/Linux i686 --- media-video/mplayer/ChangeLog | 5 ++++- media-video/mplayer/Manifest | 4 ++-- media-video/mplayer/mplayer-9999.ebuild | 14 +++++++++----- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 560f2d21f234..6257d4b4a9a0 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,9 @@ # 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.710 2010/02/13 21:50:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.711 2010/02/26 23:19:14 sping Exp $ + + 26 Feb 2010; Sebastian Pipping mplayer-9999.ebuild: + Copy latest to 9999 before proceeding 13 Feb 2010; Samuli Suominen mplayer-1.0_rc4_p20100213.ebuild, metadata.xml: diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 4f904df55dce..cc67b313889d 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -12,6 +12,6 @@ DIST mplayer-1.0_rc4_p20100213.tbz2 8811960 RMD160 b6991ef2dde9497bcffa32687f484 DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e48208173d98b3d1d1b SHA1 bf789706d1d79c695f781644c7ea6d57c3eed4c3 SHA256 a6f803f3df4cd4544751d3a3ee936a8bf0e20e32a452639b3f7c7d9e73e65938 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 19027 RMD160 5f5ae2bb3393c56d8e75a8523e491abd5264f086 SHA1 2754307d5bbc40e2c3043a66b16511d629b9b02f SHA256 4b41e26da8111aeb8229b57b2f5453c11a37c9b4382938fff03a72db8815120f EBUILD mplayer-1.0_rc4_p20100213.ebuild 19855 RMD160 fba44643404203ed19cdd09ee53883e58b46223a SHA1 8017b6c6b7122392af47d98183a7b6783e0903a8 SHA256 05327b4dfa2279a6487bcf303d20f73e25d4766d646a403d2a3c680622ae8d4e -EBUILD mplayer-9999.ebuild 19681 RMD160 61f24d616a085623a8795898f0dd50778948e695 SHA1 7b2246199a6b41cac7decfc3c239a1f0e42dfe30 SHA256 a114fdd9a65c89123b9c9ad82474ab6e90f0dd2802969a4be46e7b0ec4a55883 -MISC ChangeLog 125482 RMD160 c766544b4c9fbc6ae4b8392d2ac3a9f87cf060e0 SHA1 b593d065a996ca45589c76c2696b0bfd6e7ae4d4 SHA256 bb2a9b713df43e07ecef3dbc03d8fe8935e04a047a4a6b65b9085fc398e7b806 +EBUILD mplayer-9999.ebuild 19839 RMD160 07fa894093e016cc49869312a21a38c756e87e63 SHA1 7b38a56f6bf79fb2d934e4fac4662fc77d02dcb9 SHA256 38dcd65d35b8df74629453c92500c99a7bdcf93dbd23fdfcee72fa8fa8deee94 +MISC ChangeLog 125592 RMD160 9b75eb8186c48ed2fd5b45d84cfc3bf9e3139b47 SHA1 4c2f810a865a3529d199d2dcb8e9de46e2e3b924 SHA256 886806c90f943840b093c1cb322feb5069d290713a75d1880580ba883524292f MISC metadata.xml 3591 RMD160 883e9161526d98f546d5b790a76da78ae6b03b94 SHA1 bf3ab6509cfa4a72a088ba005c9a92e44bac6df1 SHA256 956383713923533a4caa6e39fbe8067b2afa7c7aecc3e52c9dd0715435226ef8 diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index eabf2990cd79..18053a48d674 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.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-9999.ebuild,v 1.22 2010/02/13 19:46:16 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.23 2010/02/26 23:19:14 sping Exp $ EAPI="2" @@ -9,13 +9,13 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" inherit eutils flag-o-matic multilib base ${SVN_ECLASS} -[[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r29964 +[[ ${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 kernel_linux ladspa libcaca -lirc +live lzo mad md5sum +mmx mmxext mng +mp3 nas +network nut openal +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 +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 @@ -128,6 +128,7 @@ RDEPEND+=" nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) + jpeg2k? ( media-libs/openjpeg ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) @@ -279,14 +280,16 @@ src_configure() { ################### myconf+=" --disable-arts + --disable-kai $(use_enable network) $(use_enable joystick) " - uses="ass bl enca ftp rtc" # nemesi <- not working with in-tree ebuild + 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" @@ -426,6 +429,7 @@ src_configure() { 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" -- 2.26.2