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 1PDH5G-00028t-4l for garchives@archives.gentoo.org; Tue, 02 Nov 2010 13:39:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0A46E0671; Tue, 2 Nov 2010 13:39:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 807B1E0671 for ; Tue, 2 Nov 2010 13:39:23 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF96E1B40CB for ; Tue, 2 Nov 2010 13:39:22 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id 5E39720051; Tue, 2 Nov 2010 13:39:21 +0000 (UTC) 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/avidemux: ChangeLog avidemux-2.5.4-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog avidemux-2.5.4-r1.ebuild X-VCS-Directories: media-video/avidemux X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: <20101102133921.5E39720051@flycatcher.gentoo.org> Date: Tue, 2 Nov 2010 13:39:21 +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: c701ed1a-f3dd-4b30-83e2-88ec4e26029b X-Archives-Hash: d503a503dbe84eada604e768e701afd0 scarabeus 10/11/02 13:39:21 Modified: ChangeLog avidemux-2.5.4-r1.ebuild Log: Use cmake-utils eclass more extensively. =20 (Portage version: 2.2_rc98/cvs/Linux x86_64) Revision Changes Path 1.178 media-video/avidemux/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidem= ux/ChangeLog?rev=3D1.178&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidem= ux/ChangeLog?rev=3D1.178&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidem= ux/ChangeLog?r1=3D1.177&r2=3D1.178 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/avidemux/ChangeLog,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- ChangeLog 28 Oct 2010 11:03:42 -0000 1.177 +++ ChangeLog 2 Nov 2010 13:39:21 -0000 1.178 @@ -1,6 +1,10 @@ # ChangeLog for media-video/avidemux # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.17= 7 2010/10/28 11:03:42 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.17= 8 2010/11/02 13:39:21 scarabeus Exp $ + + 02 Nov 2010; Tom=C3=A1=C5=A1 Chv=C3=A1tal + avidemux-2.5.4-r1.ebuild: + Use cmake-utils eclass more extensively. =20 *avidemux-2.5.4-r1 (28 Oct 2010) =20 1.2 media-video/avidemux/avidemux-2.5.4-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidem= ux/avidemux-2.5.4-r1.ebuild?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidem= ux/avidemux-2.5.4-r1.ebuild?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidem= ux/avidemux-2.5.4-r1.ebuild?r1=3D1.1&r2=3D1.2 Index: avidemux-2.5.4-r1.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/avidemux/avidemux-2.5.4-r1.= ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- avidemux-2.5.4-r1.ebuild 28 Oct 2010 11:03:42 -0000 1.1 +++ avidemux-2.5.4-r1.ebuild 2 Nov 2010 13:39:21 -0000 1.2 @@ -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/avidemux/avidemux-2.5.4-r= 1.ebuild,v 1.1 2010/10/28 11:03:42 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.4-r= 1.ebuild,v 1.2 2010/11/02 13:39:21 scarabeus Exp $ =20 EAPI=3D"2" =20 @@ -19,9 +19,11 @@ pulseaudio +sdl +truetype +vorbis +x264 +xv +xvid gtk +qt4" =20 RDEPEND=3D"dev-libs/libxml2 - aac? ( media-libs/faac - media-libs/faad2 ) - aften? ( media-libs/aften ) + aac? ( + media-libs/faac + media-libs/faad2 + ) + aften? ( media-libs/aften[cxx] ) alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) dts? ( media-libs/libdca ) @@ -31,8 +33,10 @@ libsamplerate? ( media-libs/libsamplerate ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) - truetype? ( media-libs/freetype:2 - media-libs/fontconfig ) + truetype? ( + media-libs/freetype:2 + media-libs/fontconfig + ) vorbis? ( media-libs/libvorbis ) x264? ( media-libs/x264 ) xv? ( x11-libs/libXv ) @@ -41,8 +45,7 @@ qt4? ( x11-libs/qt-gui:4 )" DEPEND=3D"${RDEPEND} nls? ( sys-devel/gettext ) - dev-util/pkgconfig - dev-util/cmake" + dev-util/pkgconfig" =20 S=3D${WORKDIR}/${MY_P} BUILD_S=3D${WORKDIR}/${P}_build @@ -93,46 +96,33 @@ append-cflags "-flax-vector-conversions" fi =20 - mycmakeargs=3D"${mycmakeargs} + mycmakeargs+=3D" -DAVIDEMUX_SOURCE_DIR=3D'${S}' -DAVIDEMUX_INSTALL_PREFIX=3D'${BUILD_S}' - -DAVIDEMUX_CORECONFIG_DIR=3D'${BUILD_S}/config'" - - # CMakeLists.txt - use gtk || mycmakeargs=3D"${mycmakeargs} -DGTK=3D0" - use qt4 || mycmakeargs=3D"${mycmakeargs} -DQT4=3D0" - - # cmake/admCheckMiscLibs.cmake - use nls || mycmakeargs=3D"${mycmakeargs} -DGETTEXT=3D0" - use sdl || mycmakeargs=3D"${mycmakeargs} -DSDL=3D0" - use xv || mycmakeargs=3D"${mycmakeargs} -DXVIDEO=3D0" - - # cmake/admCheckAudioDeviceLibs.cmake - use alsa || mycmakeargs=3D"${mycmakeargs} -DALSA=3D0" - use esd || mycmakeargs=3D"${mycmakeargs} -DESD=3D0" - use jack || mycmakeargs=3D"${mycmakeargs} -DJACK=3D0" - use oss || mycmakeargs=3D"${mycmakeargs} -DOSS=3D0" - use pulseaudio || mycmakeargs=3D"${mycmakeargs} -DPULSEAUDIOSIMPLE=3D0" - - # cmake/admCheckAudioEncoderLibs.cmake - use aften || mycmakeargs=3D"${mycmakeargs} -DAFTEN=3D0" - use mp3 || mycmakeargs=3D"${mycmakeargs} -DLAME=3D0" - use aac || mycmakeargs=3D"${mycmakeargs} -DFAAC=3D0" - use vorbis || mycmakeargs=3D"${mycmakeargs} -DVORBIS=3D0" - - # plugins/ADM_audioDecoders - use aac || mycmakeargs=3D"${mycmakeargs} -DFAAD=3D0" - use dts || mycmakeargs=3D"${mycmakeargs} -DLIBDCA=3D0" - - # opencore - use amr || mycmakeargs=3D"${mycmakeargs} -DOPENCORE_AMRNB=3D0 -DOPENCOR= E_AMRWB=3D0" - - # plugins/ADM_videoFilters - use truetype || mycmakeargs=3D"${mycmakeargs} -DFREETYPE2=3D0 -DFONTCON= FIG=3D0" - - # plugins/ADM_videoEncoder - use xvid || mycmakeargs=3D"${mycmakeargs} -DXVID=3D0" - use x264 || mycmakeargs=3D"${mycmakeargs} -DX264=3D0" + -DAVIDEMUX_CORECONFIG_DIR=3D'${BUILD_S}/config' + $(cmake-utils_use gtk) + $(cmake-utils_use qt4) + $(cmake-utils_use nls GETTEXT) + $(cmake-utils_use sdl) + $(cmake-utils_use xv XVIDEO) + $(cmake-utils_use alsa) + $(cmake-utils_use esd) + $(cmake-utils_use jack) + $(cmake-utils_use oss) + $(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE) + $(cmake-utils_use aften) + $(cmake-utils_use mp3 LAME) + $(cmake-utils_use aac FAAC) + $(cmake-utils_use aac FAAD) + $(cmake-utils_use vorbis) + $(cmake-utils_use dts LIBDCA) + $(cmake-utils_use amr OPENCORE_AMRNB) + $(cmake-utils_use amr OPENCORE_AMRWB) + $(cmake-utils_use truetype FREETYPE2) + $(cmake-utils_use truetype FONTCONFIG) + $(cmake-utils_use xvid) + $(cmake-utils_use x264) + " =20 cmake-utils_src_configure }