summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2010-11-02 13:39:21 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2010-11-02 13:39:21 +0000
commitdf4be7594bd1b35a3e95c3aaddf1622c18d44b75 (patch)
treeac494bb634cc841a1a66ae208eccc703c8bbeaed /media-video
parentRemoving -2.2.11 and -2.2.13 (diff)
downloadgentoo-2-df4be7594bd1b35a3e95c3aaddf1622c18d44b75.tar.gz
gentoo-2-df4be7594bd1b35a3e95c3aaddf1622c18d44b75.tar.bz2
gentoo-2-df4be7594bd1b35a3e95c3aaddf1622c18d44b75.zip
Use cmake-utils eclass more extensively.
(Portage version: 2.2_rc98/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/avidemux/ChangeLog6
-rw-r--r--media-video/avidemux/avidemux-2.5.4-r1.ebuild82
2 files changed, 41 insertions, 47 deletions
diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 2c1d4e8283f4..2e27a42a080e 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -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.177 2010/10/28 11:03:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.178 2010/11/02 13:39:21 scarabeus Exp $
+
+ 02 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+ avidemux-2.5.4-r1.ebuild:
+ Use cmake-utils eclass more extensively.
*avidemux-2.5.4-r1 (28 Oct 2010)
diff --git a/media-video/avidemux/avidemux-2.5.4-r1.ebuild b/media-video/avidemux/avidemux-2.5.4-r1.ebuild
index d7ed61639af2..0875a4d77993 100644
--- a/media-video/avidemux/avidemux-2.5.4-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.5.4-r1.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/avidemux/avidemux-2.5.4-r1.ebuild,v 1.1 2010/10/28 11:03:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.4-r1.ebuild,v 1.2 2010/11/02 13:39:21 scarabeus Exp $
EAPI="2"
@@ -19,9 +19,11 @@ IUSE="+aac +aften +alsa amr +dts esd jack libsamplerate +mp3 nls oss
pulseaudio +sdl +truetype +vorbis +x264 +xv +xvid gtk +qt4"
RDEPEND="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 @@ RDEPEND="dev-libs/libxml2
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 @@ RDEPEND="dev-libs/libxml2
qt4? ( x11-libs/qt-gui:4 )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
- dev-util/pkgconfig
- dev-util/cmake"
+ dev-util/pkgconfig"
S=${WORKDIR}/${MY_P}
BUILD_S=${WORKDIR}/${P}_build
@@ -93,46 +96,33 @@ src_configure() {
append-cflags "-flax-vector-conversions"
fi
- mycmakeargs="${mycmakeargs}
+ mycmakeargs+="
-DAVIDEMUX_SOURCE_DIR='${S}'
-DAVIDEMUX_INSTALL_PREFIX='${BUILD_S}'
- -DAVIDEMUX_CORECONFIG_DIR='${BUILD_S}/config'"
-
- # CMakeLists.txt
- use gtk || mycmakeargs="${mycmakeargs} -DGTK=0"
- use qt4 || mycmakeargs="${mycmakeargs} -DQT4=0"
-
- # cmake/admCheckMiscLibs.cmake
- use nls || mycmakeargs="${mycmakeargs} -DGETTEXT=0"
- use sdl || mycmakeargs="${mycmakeargs} -DSDL=0"
- use xv || mycmakeargs="${mycmakeargs} -DXVIDEO=0"
-
- # cmake/admCheckAudioDeviceLibs.cmake
- use alsa || mycmakeargs="${mycmakeargs} -DALSA=0"
- use esd || mycmakeargs="${mycmakeargs} -DESD=0"
- use jack || mycmakeargs="${mycmakeargs} -DJACK=0"
- use oss || mycmakeargs="${mycmakeargs} -DOSS=0"
- use pulseaudio || mycmakeargs="${mycmakeargs} -DPULSEAUDIOSIMPLE=0"
-
- # cmake/admCheckAudioEncoderLibs.cmake
- use aften || mycmakeargs="${mycmakeargs} -DAFTEN=0"
- use mp3 || mycmakeargs="${mycmakeargs} -DLAME=0"
- use aac || mycmakeargs="${mycmakeargs} -DFAAC=0"
- use vorbis || mycmakeargs="${mycmakeargs} -DVORBIS=0"
-
- # plugins/ADM_audioDecoders
- use aac || mycmakeargs="${mycmakeargs} -DFAAD=0"
- use dts || mycmakeargs="${mycmakeargs} -DLIBDCA=0"
-
- # opencore
- use amr || mycmakeargs="${mycmakeargs} -DOPENCORE_AMRNB=0 -DOPENCORE_AMRWB=0"
-
- # plugins/ADM_videoFilters
- use truetype || mycmakeargs="${mycmakeargs} -DFREETYPE2=0 -DFONTCONFIG=0"
-
- # plugins/ADM_videoEncoder
- use xvid || mycmakeargs="${mycmakeargs} -DXVID=0"
- use x264 || mycmakeargs="${mycmakeargs} -DX264=0"
+ -DAVIDEMUX_CORECONFIG_DIR='${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)
+ "
cmake-utils_src_configure
}