1 |
scarabeus 10/11/02 13:39:21 |
2 |
|
3 |
Modified: ChangeLog avidemux-2.5.4-r1.ebuild |
4 |
Log: |
5 |
Use cmake-utils eclass more extensively. |
6 |
|
7 |
(Portage version: 2.2_rc98/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.178 media-video/avidemux/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?rev=1.178&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?rev=1.178&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?r1=1.177&r2=1.178 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v |
19 |
retrieving revision 1.177 |
20 |
retrieving revision 1.178 |
21 |
diff -u -r1.177 -r1.178 |
22 |
--- ChangeLog 28 Oct 2010 11:03:42 -0000 1.177 |
23 |
+++ ChangeLog 2 Nov 2010 13:39:21 -0000 1.178 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for media-video/avidemux |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.177 2010/10/28 11:03:42 hwoarang Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.178 2010/11/02 13:39:21 scarabeus Exp $ |
29 |
+ |
30 |
+ 02 Nov 2010; Tomáš Chvátal <scarabeus@g.o> |
31 |
+ avidemux-2.5.4-r1.ebuild: |
32 |
+ Use cmake-utils eclass more extensively. |
33 |
|
34 |
*avidemux-2.5.4-r1 (28 Oct 2010) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.2 media-video/avidemux/avidemux-2.5.4-r1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.5.4-r1.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.5.4-r1.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.5.4-r1.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: avidemux-2.5.4-r1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.4-r1.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- avidemux-2.5.4-r1.ebuild 28 Oct 2010 11:03:42 -0000 1.1 |
52 |
+++ avidemux-2.5.4-r1.ebuild 2 Nov 2010 13:39:21 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $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 $ |
57 |
+# $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 $ |
58 |
|
59 |
EAPI="2" |
60 |
|
61 |
@@ -19,9 +19,11 @@ |
62 |
pulseaudio +sdl +truetype +vorbis +x264 +xv +xvid gtk +qt4" |
63 |
|
64 |
RDEPEND="dev-libs/libxml2 |
65 |
- aac? ( media-libs/faac |
66 |
- media-libs/faad2 ) |
67 |
- aften? ( media-libs/aften ) |
68 |
+ aac? ( |
69 |
+ media-libs/faac |
70 |
+ media-libs/faad2 |
71 |
+ ) |
72 |
+ aften? ( media-libs/aften[cxx] ) |
73 |
alsa? ( media-libs/alsa-lib ) |
74 |
amr? ( media-libs/opencore-amr ) |
75 |
dts? ( media-libs/libdca ) |
76 |
@@ -31,8 +33,10 @@ |
77 |
libsamplerate? ( media-libs/libsamplerate ) |
78 |
pulseaudio? ( media-sound/pulseaudio ) |
79 |
sdl? ( media-libs/libsdl ) |
80 |
- truetype? ( media-libs/freetype:2 |
81 |
- media-libs/fontconfig ) |
82 |
+ truetype? ( |
83 |
+ media-libs/freetype:2 |
84 |
+ media-libs/fontconfig |
85 |
+ ) |
86 |
vorbis? ( media-libs/libvorbis ) |
87 |
x264? ( media-libs/x264 ) |
88 |
xv? ( x11-libs/libXv ) |
89 |
@@ -41,8 +45,7 @@ |
90 |
qt4? ( x11-libs/qt-gui:4 )" |
91 |
DEPEND="${RDEPEND} |
92 |
nls? ( sys-devel/gettext ) |
93 |
- dev-util/pkgconfig |
94 |
- dev-util/cmake" |
95 |
+ dev-util/pkgconfig" |
96 |
|
97 |
S=${WORKDIR}/${MY_P} |
98 |
BUILD_S=${WORKDIR}/${P}_build |
99 |
@@ -93,46 +96,33 @@ |
100 |
append-cflags "-flax-vector-conversions" |
101 |
fi |
102 |
|
103 |
- mycmakeargs="${mycmakeargs} |
104 |
+ mycmakeargs+=" |
105 |
-DAVIDEMUX_SOURCE_DIR='${S}' |
106 |
-DAVIDEMUX_INSTALL_PREFIX='${BUILD_S}' |
107 |
- -DAVIDEMUX_CORECONFIG_DIR='${BUILD_S}/config'" |
108 |
- |
109 |
- # CMakeLists.txt |
110 |
- use gtk || mycmakeargs="${mycmakeargs} -DGTK=0" |
111 |
- use qt4 || mycmakeargs="${mycmakeargs} -DQT4=0" |
112 |
- |
113 |
- # cmake/admCheckMiscLibs.cmake |
114 |
- use nls || mycmakeargs="${mycmakeargs} -DGETTEXT=0" |
115 |
- use sdl || mycmakeargs="${mycmakeargs} -DSDL=0" |
116 |
- use xv || mycmakeargs="${mycmakeargs} -DXVIDEO=0" |
117 |
- |
118 |
- # cmake/admCheckAudioDeviceLibs.cmake |
119 |
- use alsa || mycmakeargs="${mycmakeargs} -DALSA=0" |
120 |
- use esd || mycmakeargs="${mycmakeargs} -DESD=0" |
121 |
- use jack || mycmakeargs="${mycmakeargs} -DJACK=0" |
122 |
- use oss || mycmakeargs="${mycmakeargs} -DOSS=0" |
123 |
- use pulseaudio || mycmakeargs="${mycmakeargs} -DPULSEAUDIOSIMPLE=0" |
124 |
- |
125 |
- # cmake/admCheckAudioEncoderLibs.cmake |
126 |
- use aften || mycmakeargs="${mycmakeargs} -DAFTEN=0" |
127 |
- use mp3 || mycmakeargs="${mycmakeargs} -DLAME=0" |
128 |
- use aac || mycmakeargs="${mycmakeargs} -DFAAC=0" |
129 |
- use vorbis || mycmakeargs="${mycmakeargs} -DVORBIS=0" |
130 |
- |
131 |
- # plugins/ADM_audioDecoders |
132 |
- use aac || mycmakeargs="${mycmakeargs} -DFAAD=0" |
133 |
- use dts || mycmakeargs="${mycmakeargs} -DLIBDCA=0" |
134 |
- |
135 |
- # opencore |
136 |
- use amr || mycmakeargs="${mycmakeargs} -DOPENCORE_AMRNB=0 -DOPENCORE_AMRWB=0" |
137 |
- |
138 |
- # plugins/ADM_videoFilters |
139 |
- use truetype || mycmakeargs="${mycmakeargs} -DFREETYPE2=0 -DFONTCONFIG=0" |
140 |
- |
141 |
- # plugins/ADM_videoEncoder |
142 |
- use xvid || mycmakeargs="${mycmakeargs} -DXVID=0" |
143 |
- use x264 || mycmakeargs="${mycmakeargs} -DX264=0" |
144 |
+ -DAVIDEMUX_CORECONFIG_DIR='${BUILD_S}/config' |
145 |
+ $(cmake-utils_use gtk) |
146 |
+ $(cmake-utils_use qt4) |
147 |
+ $(cmake-utils_use nls GETTEXT) |
148 |
+ $(cmake-utils_use sdl) |
149 |
+ $(cmake-utils_use xv XVIDEO) |
150 |
+ $(cmake-utils_use alsa) |
151 |
+ $(cmake-utils_use esd) |
152 |
+ $(cmake-utils_use jack) |
153 |
+ $(cmake-utils_use oss) |
154 |
+ $(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE) |
155 |
+ $(cmake-utils_use aften) |
156 |
+ $(cmake-utils_use mp3 LAME) |
157 |
+ $(cmake-utils_use aac FAAC) |
158 |
+ $(cmake-utils_use aac FAAD) |
159 |
+ $(cmake-utils_use vorbis) |
160 |
+ $(cmake-utils_use dts LIBDCA) |
161 |
+ $(cmake-utils_use amr OPENCORE_AMRNB) |
162 |
+ $(cmake-utils_use amr OPENCORE_AMRWB) |
163 |
+ $(cmake-utils_use truetype FREETYPE2) |
164 |
+ $(cmake-utils_use truetype FONTCONFIG) |
165 |
+ $(cmake-utils_use xvid) |
166 |
+ $(cmake-utils_use x264) |
167 |
+ " |
168 |
|
169 |
cmake-utils_src_configure |
170 |
} |