From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1MAXeK-00033F-91 for garchives@archives.gentoo.org; Sat, 30 May 2009 23:07:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1F9EE0297; Sat, 30 May 2009 23:07:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5CE04E0297 for ; Sat, 30 May 2009 23:07:35 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 04D90642CC for ; Sat, 30 May 2009 23:07:35 +0000 (UTC) Received: from scarabeus by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1MAXeF-0000g4-5w for gentoo-commits@lists.gentoo.org; Sat, 30 May 2009 23:07:34 +0000 From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-video/mplayer: ChangeLog mplayer-9999.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog mplayer-9999.ebuild X-VCS-Directories: media-video/mplayer X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: Sender: Tomas Chvatal Date: Sat, 30 May 2009 23:07:31 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b78e8dc6-bd00-46b1-b675-07f0fbf958cd X-Archives-Hash: 6296e98728014f597ffb921f9a6fd3be scarabeus 09/05/30 23:07:31 Modified: ChangeLog mplayer-9999.ebuild Log: Update live ebuild. Reorder the DEPS to be alphabetic and more logicaly= separated. Update ebuild to work as snapshot version if properly renamed= . Minor whitespace updates. Use src_prepare function. (Portage version: 2.2_rc33/cvs/Linux i686) Revision Changes Path 1.636 media-video/mplayer/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/ChangeLog?rev=3D1.636&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/ChangeLog?rev=3D1.636&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/ChangeLog?r1=3D1.635&r2=3D1.636 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v retrieving revision 1.635 retrieving revision 1.636 diff -u -r1.635 -r1.636 --- ChangeLog 30 May 2009 21:53:39 -0000 1.635 +++ ChangeLog 30 May 2009 23:07:31 -0000 1.636 @@ -1,6 +1,11 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.635= 2009/05/30 21:53:39 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.636= 2009/05/30 23:07:31 scarabeus Exp $ + + 30 May 2009; Tom=C3=A1=C5=A1 Chv=C3=A1tal mplay= er-9999.ebuild: + Update live ebuild. Reorder the DEPS to be alphabetic and more logical= y + separated. Update ebuild to work as snapshot version if properly renam= ed. + Minor whitespace updates. Use src_prepare function. =20 *mplayer-1.0_rc2_p20090530 (30 May 2009) =20 1.5 media-video/mplayer/mplayer-9999.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/mplayer-9999.ebuild?rev=3D1.5&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/mplayer-9999.ebuild?rev=3D1.5&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/mplaye= r/mplayer-9999.ebuild?r1=3D1.4&r2=3D1.5 Index: mplayer-9999.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild= ,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mplayer-9999.ebuild 30 May 2009 21:31:18 -0000 1.4 +++ mplayer-9999.ebuild 30 May 2009 23:07:31 -0000 1.5 @@ -1,21 +1,24 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebui= ld,v 1.4 2009/05/30 21:31:18 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebui= ld,v 1.5 2009/05/30 23:07:31 scarabeus Exp $ =20 EAPI=3D"2" =20 ESVN_REPO_URI=3D"svn://svn.mplayerhq.hu/mplayer/trunk" +[[ ${PV} =3D *9999* ]] && SVN_ECLASS=3D"subversion" || SVN_ECLASS=3D"" =20 -inherit eutils flag-o-matic multilib subversion +inherit eutils flag-o-matic multilib ${SVN_ECLASS} =20 -IUSE=3D"3dnow 3dnowext +a52 +aac aalib +alsa altivec +amrnb +amrwb arts = +ass +[[ ${PV} !=3D *9999* ]] && MPLAYER_REVISION=3D29330 + +IUSE=3D"3dnow 3dnowext +a52 +aac aalib +alsa altivec +amrnb +amrwb +ass bidi bindist bl +cddb +cdio cdparanoia cpudetection custom-cflags custom-cpuopts debug dga +dirac directfb doc +dts +dv dvb +dvd +dvdnav d= xr3 +enca +encode esd +faac +faad fbcon ftp gif ggi -gmplayer +iconv ipv6 ja= ck joystick jpeg kernel_linux ladspa libcaca lirc +live lzo mad md5sum +mmx mmxext mng +mp2 +mp3 musepack nas +nemesi +network nut openal +opengl +o= sdmenu -oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba -+schroedinger sdl +shm +speex sse sse2 ssse3 svga teletext tga +theora += tremor +oss png pnm pulseaudio pvr +quicktime radio +rar +real +rtc samba +shm ++schroedinger sdl +speex sse sse2 ssse3 svga teletext tga +theora +tremo= r +truetype +unicode v4l v4l2 vdpau vidix +vorbis win32codecs +X +x264 xan= im xinerama +xscreensaver +xv +xvid xvmc zoran" =20 @@ -28,32 +31,46 @@ BLUV=3D"1.7" SVGV=3D"1.9.17" AMR_URI=3D"http://www.3gpp.org/ftp/Specs/archive" -SRC_URI=3D"!truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8= 859-1.tar.bz2 - mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 - mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 ) - !iconv? ( 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 ) +FONT_URI=3D" + 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} =3D *9999* ]]; then + RELEASE_URI=3D"" +else + RELEASE_URI=3D"mirror://gentoo/${P}.tar.bz2" +fi +SRC_URI=3D"${RELEASE_URI} + !truetype? ( ${FONT_URI} ) gmplayer? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 ) - svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz= 2 )" + svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz= 2 ) +" =20 DESCRIPTION=3D"Media Player for Linux" HOMEPAGE=3D"http://www.mplayerhq.hu/" =20 +FONT_RDEPS=3D" + media-libs/fontconfig + media-libs/freetype:2 +" +X_RDEPS=3D" + x11-libs/libXext + x11-libs/libXxf86vm +" +# Rar: althrought -gpl version is nice, it cant do most functions normal= rar can RDEPEND=3D"sys-libs/ncurses !bindist? ( x86? ( win32codecs? ( media-libs/win32codecs ) - ) + ) ) + X? ( ${X_RDEPS} ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) amrnb? ( media-libs/amrnb ) amrwb? ( media-libs/amrwb ) - arts? ( kde-base/arts ) - ass? ( media-libs/freetype:2 - media-libs/fontconfig ) - openal? ( media-libs/openal ) + ass? ( ${FONT_RDEPS} ) bidi? ( dev-libs/fribidi ) cdio? ( dev-libs/libcdio ) cdparanoia? ( media-sound/cdparanoia ) @@ -64,92 +81,105 @@ dv? ( media-libs/libdv ) dvb? ( media-tv/linuxtv-dvb-headers ) encode? ( + faac? ( media-libs/faac ) mp2? ( media-sound/twolame ) mp3? ( media-sound/lame ) - faac? ( media-libs/faac ) x264? ( >=3Dmedia-libs/x264-0.0.20081006 ) xvid? ( media-libs/xvid ) - ) + ) esd? ( media-sound/esound ) enca? ( app-i18n/enca ) faad? ( !aac? ( media-libs/faad2 ) ) gif? ( media-libs/giflib ) - ggi? ( media-libs/libggi - media-libs/libggiwmh ) - gmplayer? ( media-libs/libpng - x11-libs/libXxf86vm - x11-libs/libXext + ggi? ( + media-libs/libggi + media-libs/libggiwmh + ) + gmplayer? ( + media-libs/libpng + x11-libs/gtk+:2 x11-libs/libXi - x11-libs/gtk+:2 ) + ${X_RDEPS} + ) 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? ( >=3Ddev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) musepack? ( >=3Dmedia-libs/libmpcdec-1.2.2 ) nas? ( media-libs/nas ) nut? ( >=3Dmedia-libs/libnut-661 ) + openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) - rar? ( || ( app-arch/unrar-gpl - app-arch/unrar - app-arch/rar ) ) + rar? ( + || ( + app-arch/unrar + app-arch/unrar-gpl + 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 ) - live? ( media-plugins/live ) - truetype? ( media-libs/freetype:2 - media-libs/fontconfig ) + truetype? ( ${FONT_RDEPS} ) video_cards_nvidia? ( vdpau? ( >=3Dx11-drivers/nvidia-drivers-180.51 ) ) - vidix? ( x11-libs/libXxf86vm - x11-libs/libXext ) + vidix? ( ${X_RDEPS} ) vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) - xinerama? ( x11-libs/libXinerama - x11-libs/libXxf86vm - x11-libs/libXext ) + xinerama? ( + x11-libs/libXinerama + ${X_RDEPS} + ) xscreensaver? ( x11-libs/libXScrnSaver ) - xv? ( x11-libs/libXv - x11-libs/libXxf86vm - x11-libs/libXext - xvmc? ( x11-libs/libXvMC ) ) - X? ( x11-libs/libXxf86vm - x11-libs/libXext - )" + xv? ( + ${X_RDEPS} + x11-libs/libXv + xvmc? ( x11-libs/libXvMC ) + ) +" =20 +X_DEPS=3D" + x11-proto/videoproto + x11-proto/xf86vidmodeproto +" +ASM_DEP=3D"dev-lang/yasm" DEPEND=3D"${RDEPEND} - amd64? ( dev-lang/yasm ) - doc? ( dev-libs/libxslt ) + X? ( ${X_DEPS} ) + amd64? ( ${ASM_DEP} ) dga? ( x11-proto/xf86dgaproto ) + doc? ( dev-libs/libxslt ) dxr3? ( media-video/em8300-libraries ) + gmplayer? ( ${X_DEPS} ) + iconv? ( virtual/libiconv ) + xv? ( ${X_DEPS} ) + x86? ( ${ASM_DEP} ) + x86-fbsd? ( ${ASM_DEP} ) xinerama? ( x11-proto/xineramaproto ) - xv? ( x11-proto/videoproto - x11-proto/xf86vidmodeproto ) - gmplayer? ( x11-proto/xextproto - x11-proto/xf86vidmodeproto ) - X? ( x11-proto/xextproto - x11-proto/xf86vidmodeproto ) - x86? ( dev-lang/yasm ) - x86-fbsd? ( dev-lang/yasm ) xscreensaver? ( x11-proto/scrnsaverproto ) - iconv? ( virtual/libiconv )" + xv? ( ${X_DEPS} ) +" =20 SLOT=3D"0" LICENSE=3D"GPL-2" -KEYWORDS=3D"" +if [[ ${PV} !=3D *9999* ]]; then + KEYWORDS=3D"~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x8= 6-fbsd" +else + KEYWORDS=3D"" +fi =20 pkg_setup() { - elog "" elog "This is a live ebuild which installs the latest from upstream's" elog "subversion repository, and is unsupported by Gentoo." @@ -210,26 +240,27 @@ } =20 src_unpack() { - subversion_src_unpack + [[ ${PV} =3D *9999* ]] && subversion_src_unpack || unpack ${A} =20 - if ! use truetype ; then + 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 =20 - - cd "${WORKDIR}" - use gmplayer && unpack "Blue-${BLUV}.tar.bz2" - use svga && unpack "svgalib_helper-${SVGV}-mplayer.tar.bz2" +} =20 - cd "${S}" - - # Set SVN version manually - subversion_wc_info - sed -i s/UNKNOWN/${ESVN_WC_REVISION}/ "${S}/version.sh" +src_prepare() { + if [[ ${PV} =3D *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 =20 if use svga; then echo @@ -243,7 +274,6 @@ } =20 src_configure() { - local myconf=3D"" =20 # MPlayer reads in the LINGUAS variable from make.conf, and sets @@ -259,7 +289,10 @@ ################ #Optional features# ############### - myconf=3D"${myconf} $(use_enable network)" + myconf=3D"${myconf} + --disable-arts + $(use_enable network) + " use ass || myconf=3D"${myconf} --disable-ass" use bidi || myconf=3D"${myconf} --disable-fribidi" use bl && myconf=3D"${myconf} --enable-bl" @@ -471,7 +504,7 @@ ############# # Audio Output # ############# - for x in alsa arts esd jack ladspa nas openal; do + for x in alsa esd jack ladspa nas openal; do use ${x} || myconf=3D"${myconf} --disable-${x}" done use pulseaudio || myconf=3D"${myconf} --disable-pulse" @@ -523,7 +556,6 @@ =20 #echo "CFLAGS=3D\"${CFLAGS}\" ./configure ${myconf}" CFLAGS=3D"${CFLAGS}" ./configure ${myconf} || die "configure died" - } =20 src_compile() { @@ -532,7 +564,6 @@ } =20 src_install() { - make prefix=3D"${D}/usr" \ BINDIR=3D"${D}/usr/bin" \ LIBDIR=3D"${D}/usr/$(get_libdir)" \ @@ -612,15 +643,11 @@ } =20 pkg_preinst() { - - if [[ -d ${ROOT}/usr/share/mplayer/Skin/default ]] - then + [[ -d ${ROOT}/usr/share/mplayer/Skin/default ]] && \ rm -rf "${ROOT}/usr/share/mplayer/Skin/default" - fi } =20 pkg_postrm() { - # Cleanup stale symlinks if [ -L "${ROOT}/usr/share/mplayer/font" -a \ ! -e "${ROOT}/usr/share/mplayer/font" ]