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 1OJql3-0005Zo-VR for garchives@archives.gentoo.org; Wed, 02 Jun 2010 16:25:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF31DE0CB9; Wed, 2 Jun 2010 16:25:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 73F92E0CB9 for ; Wed, 2 Jun 2010 16:25:31 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id F0C561B4018 for ; Wed, 2 Jun 2010 16:25:30 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 591) id 4AA132CE14; Wed, 2 Jun 2010 16:25:29 +0000 (UTC) From: "Luca Barbato (lu_zero)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, lu_zero@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: lu_zero X-VCS-Committer-Name: Luca Barbato Content-Type: text/plain; charset=utf8 Message-Id: <20100602162529.4AA132CE14@corvid.gentoo.org> Date: Wed, 2 Jun 2010 16:25:29 +0000 (UTC) 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: e9d418a9-6f69-4672-a053-e595a5535796 X-Archives-Hash: 4675580138d62fcc348dec234301b48c lu_zero 10/06/02 16:25:29 Modified: ChangeLog mplayer-9999.ebuild Log: Ebuild improvements from Nikoli (Portage version: 2.1.8.3/cvs/Linux x86_64) Revision Changes Path 1.744 media-video/mplayer/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplaye= r/ChangeLog?rev=3D1.744&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplaye= r/ChangeLog?rev=3D1.744&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplaye= r/ChangeLog?r1=3D1.743&r2=3D1.744 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.743 retrieving revision 1.744 diff -u -r1.743 -r1.744 --- ChangeLog 1 Jun 2010 00:27:28 -0000 1.743 +++ ChangeLog 2 Jun 2010 16:25:28 -0000 1.744 @@ -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.743= 2010/06/01 00:27:28 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.744= 2010/06/02 16:25:28 lu_zero Exp $ + + 02 Jun 2010; Luca Barbato mplayer-9999.ebuild: + Ebuild improvements from Nikoli see bug #322377 =20 01 Jun 2010; Luca Barbato mplayer-9999.ebuild: Change doc deps as reported in bug #317559 1.62 media-video/mplayer/mplayer-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplaye= r/mplayer-9999.ebuild?rev=3D1.62&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplaye= r/mplayer-9999.ebuild?rev=3D1.62&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplaye= r/mplayer-9999.ebuild?r1=3D1.61&r2=3D1.62 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.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- mplayer-9999.ebuild 1 Jun 2010 04:31:51 -0000 1.61 +++ mplayer-9999.ebuild 2 Jun 2010 16:25:28 -0000 1.62 @@ -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.ebui= ld,v 1.61 2010/06/01 04:31:51 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebui= ld,v 1.62 2010/06/02 16:25:28 lu_zero Exp $ =20 EAPI=3D"2" =20 @@ -62,6 +62,8 @@ # nemesi? ( net-libs/libnemesi ) RDEPEND+=3D" sys-libs/ncurses + app-arch/bzip2 + sys-libs/zlib !bindist? ( x86? ( win32codecs? ( media-libs/win32codecs ) @@ -142,7 +144,7 @@ sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) svga? ( media-libs/svgalib ) - theora? ( media-libs/libtheora ) + theora? ( media-libs/libtheora[encode?] ) truetype? ( ${FONT_RDEPS} ) vorbis? ( media-libs/libvorbis ) xanim? ( media-video/xanim ) @@ -228,7 +230,13 @@ } =20 src_unpack() { - [[ ${PV} =3D *9999* ]] && subversion_src_unpack || unpack ${A} + if [[ ${PV} =3D *9999* ]]; then + subversion_src_unpack + + cd "${WORKDIR}" + else + unpack ${A} + fi =20 if ! use truetype; then unpack font-arial-iso-8859-1.tar.bz2 \ @@ -291,7 +299,6 @@ use ${i} || myconf+=3D" --disable-${i}" done use bidi || myconf+=3D" --disable-fribidi" - use encode || myconf+=3D" --disable-mencoder" use ipv6 || myconf+=3D" --disable-inet6" use nut || myconf+=3D" --disable-libnut" use rar || myconf+=3D" --disable-unrarexec" @@ -394,15 +401,10 @@ ########## # Codecs # ########## - # Use internal musepack codecs for SV7 and SV8 support - myconf+=3D" --disable-musepack" - - use a52 || myconf+=3D" --disable-liba52" + myconf+=3D" --disable-musepack" # Use internal musepack codecs for SV7 = and SV8 support myconf+=3D" --disable-faad-internal" # always use system media-libs/faa= d2 use dirac || myconf+=3D" --disable-libdirac-lavc" use dts || myconf+=3D" --disable-libdca" - use dv || myconf+=3D" --disable-libdv" - use lzo || myconf+=3D" --disable-liblzo" if ! use mp3; then myconf+=3D" --disable-mp3lame @@ -410,7 +412,10 @@ --disable-mp3lib " fi - use bs2b || myconf+=3D" --disable-libbs2b" + uses=3D"a52 bs2b dv lzo" + for i in ${uses}; do + use ${i} || myconf+=3D" --disable-lib${i}" + done use schroedinger || myconf+=3D" --disable-libschroedinger-lavc" # Disable opencore-amr with bindist # https://bugs.gentoo.org/show_bug.cgi?id=3D299405#c6 @@ -435,25 +440,17 @@ " fi # Encoding + uses=3D"faac x264 xvid toolame twolame" if use encode; then - uses=3D"faac x264 xvid toolame twolame" for i in ${uses}; do use ${i} || myconf+=3D" --disable-${i}" done use faac || myconf+=3D" --disable-faac-lavc" else - myconf+=3D" - --disable-faac-lavc - --disable-faac - --disable-x264 - --disable-xvid - --disable-x264-lavc - --disable-xvid-lavc - --disable-twolame - --disable-toolame - " - uses=3D"faac x264 xvid toolame twolame" + myconf+=3D" --disable-mencoder" + myconf+=3D"--disable-faac-lavc" for i in ${uses}; do + myconf+=3D" --disable-${i}" use ${i} && elog "Useflag \"${i}\" require \"encode\" useflag enabled= to work." done fi @@ -606,6 +603,7 @@ --disable-xss --disable-xv --disable-xvmc + --disable-x11 " uses=3D"dga dxr3 ggi opengl osdmenu vdpau vidix xinerama xscreensaver = xv" for i in ${uses}; do @@ -640,14 +638,14 @@ local ALLOWED_LINGUAS=3D"cs de en es fr hu it pl ru zh_CN" local BUILT_DOCS=3D"" for i in ${LINGUAS} ; do - hasq $i ${ALLOWED_LINGUAS} && BUILT_DOCS+=3D" $i" + hasq ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=3D" ${i}" done if [[ -z $BUILT_DOCS ]] then emake -j1 -C DOCS/xml html-chunked || die "Failed to generate html do= cs" else for i in ${BUILT_DOCS} ; do - emake -j1 -C DOCS/xml html-chunked-$i || die "Failed to generate htm= l docs for $i" + emake -j1 -C DOCS/xml html-chunked-${i} || die "Failed to generate h= tml docs for ${i}" done fi fi