1 |
tomwij 13/03/04 16:34:51 |
2 |
|
3 |
Modified: avidemux-2.6.1.ebuild ChangeLog |
4 |
Log: |
5 |
Split magic powder function into EAPI 5 appropriate src_configure, src_compile and src_install functions; cleaned up the ebuild as a first step in preparation of unmasking it. |
6 |
|
7 |
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 media-video/avidemux/avidemux-2.6.1.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: avidemux-2.6.1.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- avidemux-2.6.1.ebuild 2 Mar 2013 22:06:56 -0000 1.2 |
23 |
+++ avidemux-2.6.1.ebuild 4 Mar 2013 16:34:51 -0000 1.3 |
24 |
@@ -1,89 +1,71 @@ |
25 |
# Copyright 1999-2013 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild,v 1.2 2013/03/02 22:06:56 hwoarang Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild,v 1.3 2013/03/04 16:34:51 tomwij Exp $ |
29 |
+ |
30 |
+EAPI="5" |
31 |
|
32 |
-EAPI=4 |
33 |
PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr" |
34 |
inherit cmake-utils eutils flag-o-matic l10n toolchain-funcs |
35 |
|
36 |
-MY_P=${PN}_${PV} |
37 |
+SLOT="2.6" |
38 |
+MY_P="${PN}_${PV}" |
39 |
|
40 |
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks" |
41 |
-HOMEPAGE="http://fixounet.free.fr/avidemux" |
42 |
+HOMEPAGE="http://fixounet.free.fr/${PN}" |
43 |
SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz" |
44 |
|
45 |
-# Multiple licenses because of all the bundled stuff |
46 |
-LICENSE="GPL-2 MIT GPL-1 public-domain PSF-2" |
47 |
-SLOT="2.6" |
48 |
+# Multiple licenses because of all the bundled stuff. |
49 |
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" |
50 |
KEYWORDS="~amd64 ~x86" |
51 |
-IUSE="aften a52 alsa amr debug dts fontconfig gtk jack |
52 |
- lame libsamplerate mmx nls qt4 sdl vorbis truetype xvid xv oss x264" |
53 |
+IUSE="aften a52 alsa amr debug dts fontconfig gtk jack lame libsamplerate mmx nls qt4 sdl vorbis truetype xvid xv oss x264" |
54 |
|
55 |
RDEPEND=" |
56 |
- virtual/libiconv |
57 |
+ >=dev-lang/spidermonkey-1.5-r2 |
58 |
dev-libs/libxml2 |
59 |
media-libs/libpng |
60 |
- >=dev-lang/spidermonkey-1.5-r2 |
61 |
- gtk? ( >=x11-libs/gtk+-2.6.0:2 ) |
62 |
- qt4? ( >=dev-qt/qtgui-4.8.3:4 ) |
63 |
- x264? ( media-libs/x264 ) |
64 |
- xvid? ( media-libs/xvid ) |
65 |
+ x11-libs/libX11 |
66 |
+ x11-libs/libXext |
67 |
+ x11-libs/libXrender |
68 |
+ virtual/libiconv |
69 |
aften? ( media-libs/aften ) |
70 |
+ alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 ) |
71 |
amr? ( media-libs/opencore-amr ) |
72 |
- lame? ( media-sound/lame ) |
73 |
dts? ( media-libs/libdca ) |
74 |
- vorbis? ( media-libs/libvorbis ) |
75 |
- alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 ) |
76 |
+ fontconfig? ( media-libs/fontconfig ) |
77 |
+ gtk? ( >=x11-libs/gtk+-2.6.0:2 ) |
78 |
jack? ( |
79 |
media-sound/jack-audio-connection-kit |
80 |
libsamplerate? ( media-libs/libsamplerate ) |
81 |
) |
82 |
- truetype? ( >=media-libs/freetype-2.1.5 ) |
83 |
- fontconfig? ( media-libs/fontconfig ) |
84 |
+ lame? ( media-sound/lame ) |
85 |
+ qt4? ( >=dev-qt/qtgui-4.8.3:4 ) |
86 |
sdl? ( media-libs/libsdl ) |
87 |
+ truetype? ( >=media-libs/freetype-2.1.5 ) |
88 |
+ x264? ( media-libs/x264 ) |
89 |
xv? ( x11-libs/libXv ) |
90 |
- x11-libs/libX11 |
91 |
- x11-libs/libXext |
92 |
- x11-libs/libXrender |
93 |
+ xvid? ( media-libs/xvid ) |
94 |
+ vorbis? ( media-libs/libvorbis ) |
95 |
" |
96 |
DEPEND=" |
97 |
$RDEPEND |
98 |
oss? ( virtual/os-headers ) |
99 |
- virtual/pkgconfig |
100 |
nls? ( sys-devel/gettext ) |
101 |
+ virtual/pkgconfig |
102 |
" |
103 |
-S=${WORKDIR}/${MY_P} |
104 |
-BUILD_S=${WORKDIR}/${P}_build |
105 |
|
106 |
-avidemux_build_process() { |
107 |
- local BUILDDIR="${1}" |
108 |
- local SOURCEDIR="${2}" |
109 |
- local mycmakeargs="${3}" |
110 |
- EXTRA="${mycmakeargs}" |
111 |
- BUILDER="Unix Makefiles" |
112 |
- FAKEROOT_DIR="${S}"/gentoo-install |
113 |
- SOURCEDIR="${2}" |
114 |
- mkdir ${BUILDDIR} && cd "${BUILDDIR}" |
115 |
- einfo "Configuring: ${BUILDDIR}" |
116 |
- cmake -DFAKEROOT="${FAKEROOT_DIR}" -DAVIDEMUX_SOURCE_DIR="${S}" \ |
117 |
- -DCMAKE_INSTALL_PREFIX="/usr" \ |
118 |
- ${EXTRA} -G "${BUILDER}" ../"${SOURCEDIR}/" |
119 |
- # for some reason, core needs -j1. That's what they do in their |
120 |
- # script as well |
121 |
- if [[ ${BUILDDIR} == "buildCore" ]]; then |
122 |
- extra_opts="-j1" |
123 |
- else |
124 |
- unset extra_opts |
125 |
- fi |
126 |
- einfo "Building: ${BUILDDIR}" |
127 |
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${extra_opts} |
128 |
+S="${WORKDIR}/${MY_P}" |
129 |
+BUILD_S="${WORKDIR}/${P}_build" |
130 |
|
131 |
- einfo "Fake install: ${BUILDDIR}" |
132 |
- # pretend that you installed it somewhere |
133 |
- emake DESTDIR="${FAKEROOT_DIR}" ${extra_opts} install |
134 |
+PROCESSES="buildCore:avidemux_core${POSTFIX} |
135 |
+ buildCli:avidemux/cli${POSTFIX} |
136 |
+ buildPluginsCommon:avidemux_plugins${POSTFIX} |
137 |
+ buildPluginsCLI:avidemux_plugins${POSTFIX}" |
138 |
|
139 |
- cd .. |
140 |
-} |
141 |
+use qt4 && PROCESSES+=" buildQt4:avidemux/qt4${POSTFIX} |
142 |
+ buildPluginsQt4:avidemux_plugins${POSTFIX}" |
143 |
+ |
144 |
+use gtk && PROCESSES+=" buildGtk:avidemux/gtk${POSTFIX} |
145 |
+ buildPluginsGtk:avidemux_plugins${POSTFIX}" |
146 |
|
147 |
src_prepare() { |
148 |
base_src_prepare |
149 |
@@ -105,43 +87,33 @@ |
150 |
done |
151 |
|
152 |
sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \ |
153 |
- "${S}/cmake/Po.cmake" || die "sed failed" |
154 |
+ "${S}/cmake/Po.cmake" || die "po_files sed failed" |
155 |
+ |
156 |
sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \ |
157 |
-e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \ |
158 |
- "${S}/cmake/Ts.cmake" || die "sed failed" |
159 |
+ "${S}/cmake/Ts.cmake" || die "ts_files sed failed" |
160 |
|
161 |
# Fix icon name -> avidemux-2.6.png |
162 |
- sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die |
163 |
- # the desktop file is broken. It uses avidemux2 instead of avidemux3 |
164 |
- # so it will actually launch avidemux-2.5 if it is installed |
165 |
- sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die |
166 |
- # Now rename to not collide with 2.5 |
167 |
- mv ${PN}2.desktop ${PN}-2.6.desktop |
168 |
- # fix major issues in desktop files wrt bugs #291453, #316599, #430500 |
169 |
- # duplicate desktop file |
170 |
- cp ${PN}-2.6.desktop ${PN}-2.6-gtk.desktop || die |
171 |
- # the desktop file is broken. It uses avidemux2 instead of avidemux3 |
172 |
- # so it will actually launch avidemux-2.5 if it is installed |
173 |
- sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.desktop || die |
174 |
-} |
175 |
+ sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed." |
176 |
|
177 |
-src_configure() { |
178 |
- true; |
179 |
+ # The desktop file is broken. It uses avidemux2 instead of avidemux3 |
180 |
+ # so it will actually launch avidemux-2.5 if it is installed. |
181 |
+ sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed." |
182 |
+ |
183 |
+ # Now rename the desktop file to not collide with 2.5. |
184 |
+ mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed." |
185 |
+ |
186 |
+ # Fix major issues in desktop files wrt bugs #291453, #316599, #430500 |
187 |
+ # duplicate desktop file. |
188 |
+ cp ${PN}-2.6.desktop ${PN}-2.6-gtk.desktop || die "Desktop file copy failed." |
189 |
+ |
190 |
+ # The desktop file is broken. It uses avidemux2 instead of avidemux3 |
191 |
+ # so it will actually launch avidemux-2.5 if it is installed. |
192 |
+ sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.desktop || die "Desktop file fix failed." |
193 |
} |
194 |
|
195 |
-src_compile() { |
196 |
- # add lax vector typing for PowerPC |
197 |
- if use ppc || use ppc64; then |
198 |
- append-cflags -flax-vector-conversions |
199 |
- fi |
200 |
- # bug 432322 |
201 |
- use x86 && replace-flags -O0 -O1 |
202 |
- |
203 |
- local x mycmakeargs |
204 |
- # default args |
205 |
- use debug \ |
206 |
- && POSTFIX="_debug" \ |
207 |
- && mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug" |
208 |
+src_configure() { |
209 |
+ local x mycmakeargs plugin_ui |
210 |
|
211 |
mycmakeargs=" |
212 |
$(for x in ${IUSE}; do cmake-utils_use $x; done) |
213 |
@@ -152,41 +124,79 @@ |
214 |
$(cmake-utils_use amr OPENCORE_AMRWB) |
215 |
$(cmake-utils_use amr OPENCORE_AMRNB) |
216 |
" |
217 |
+ use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug" |
218 |
|
219 |
- # Lets try to do all the s**t that bootStrap.bash is |
220 |
- # trying to do |
221 |
- use qt4 && with_qt4=1 |
222 |
- use gtk && with_gtk=1 |
223 |
- |
224 |
- avidemux_build_process buildCore avidemux_core${POSTFIX} "${mycmakeargs}" |
225 |
- avidemux_build_process buildCli avidemux/cli${POSTFIX} "${mycmakeargs}" |
226 |
- mycmakeargs+="-DPLUGIN_UI=COMMON " |
227 |
- avidemux_build_process buildPluginsCommon avidemux_plugins${POSTFIX} "${mycmakeargs}" |
228 |
- mycmakeargs+="-DPLUGIN_UI=CLI " |
229 |
- avidemux_build_process buildPluginsCLI avidemux_plugins${POSTFIX} "${mycmakeargs}" |
230 |
- |
231 |
- if use qt4; then |
232 |
- avidemux_build_process buildQt4 avidemux/qt4${POSTFIX} "${mycmakeargs}" |
233 |
- mycmakeargs+="-DPLUGIN_UI=QT4 " |
234 |
- avidemux_build_process buildPluginsQt4 avidemux_plugins${POSTFIX} "${mycmakeargs}" |
235 |
- fi |
236 |
- if use gtk; then |
237 |
- avidemux_build_process buildGtk avidemux/gtk${POSTFIX} "${mycmakeargs}" |
238 |
- mycmakeargs+="-DPLUGIN_UI=GTK " |
239 |
- avidemux_build_process buildPluginsGtk avidemux_plugins${POSTFIX} "${mycmakeargs}" |
240 |
+ for PROCESS in ${PROCESSES} ; do |
241 |
+ SOURCE="${PROCESS%%:*}" |
242 |
+ DEST="${PROCESS#*:}" |
243 |
+ |
244 |
+ cd "${S}" || die "Can't enter source folder." |
245 |
+ mkdir "${SOURCE}" || die "Can't create build folder." |
246 |
+ cd "${SOURCE}" || die "Can't enter build folder." |
247 |
+ |
248 |
+ if [[ "${SOURCE}" == "buildPluginsCommon" ]] ; then |
249 |
+ plugin_ui="-DPLUGIN_UI=COMMON" |
250 |
+ elif [[ "${SOURCE}" == "buildPluginsCLI" ]] ; then |
251 |
+ plugin_ui="-DPLUGIN_UI=CLI" |
252 |
+ elif [[ "${SOURCE}" == "buildPluginsQt4" ]] ; then |
253 |
+ plugin_ui="-DPLUGIN_UI=QT4" |
254 |
+ elif [[ "${SOURCE}" == "buildPluginsGtk" ]]; then |
255 |
+ plugin_ui="-DPLUGIN_UI=GTK" |
256 |
+ fi |
257 |
+ |
258 |
+ cmake -DAVIDEMUX_SOURCE_DIR="${S}" \ |
259 |
+ -DCMAKE_INSTALL_PREFIX="/usr" \ |
260 |
+ ${mycmakeargs} ${plugin_ui} -G "Unix Makefiles" ../"${DEST}/" |
261 |
+ done |
262 |
+} |
263 |
+ |
264 |
+src_compile() { |
265 |
+ # Add lax vector typing for PowerPC. |
266 |
+ if use ppc || use ppc64 ; then |
267 |
+ append-cflags -flax-vector-conversions |
268 |
fi |
269 |
+ |
270 |
+ # See bug 432322. |
271 |
+ use x86 && replace-flags -O0 -O1 |
272 |
+ |
273 |
+ for PROCESS in ${PROCESSES} ; do |
274 |
+ SOURCE="${PROCESS%%:*}" |
275 |
+ |
276 |
+ cd "${S}/${SOURCE}" || die "Can't enter build folder." |
277 |
+ |
278 |
+ if [[ "${SOURCE}" == "buildCore" ]] ; then |
279 |
+ # TODO: Report this upstream, seems to be within ffmpeg code. |
280 |
+ emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" |
281 |
+ else |
282 |
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" |
283 |
+ fi |
284 |
+ done |
285 |
} |
286 |
|
287 |
src_install() { |
288 |
- # everything is installed(?) in ${S}/gentoo-install. |
289 |
- # Move it to ${D}. |
290 |
- insinto / |
291 |
- doins -r "${S}"/gentoo-install/* |
292 |
- # Mark executables with +x |
293 |
- find "${ED}"/usr/bin -exec chmod a+x {} \; |
294 |
+ for PROCESS in ${PROCESSES} ; do |
295 |
+ SOURCE="${PROCESS%%:*}" |
296 |
+ |
297 |
+ cd "${S}/${SOURCE}" || die "Can't enter build folder." |
298 |
+ |
299 |
+ if [[ "${SOURCE}" == "buildCore" ]] ; then |
300 |
+ # TODO: Report this upstream, seems to be within ffmpeg code. |
301 |
+ emake DESTDIR="${ED}" -j1 install |
302 |
+ else |
303 |
+ emake DESTDIR="${ED}" install |
304 |
+ fi |
305 |
+ done |
306 |
+ |
307 |
+ cd "${S}" || die "Can't enter source folder." |
308 |
+ |
309 |
+ fperms +x /usr/bin/avidemux3_cli |
310 |
+ fperms +x /usr/bin/avidemux3_jobs |
311 |
+ use gtk && fperms +x /usr/bin/avidemux3_gtk |
312 |
+ use qt4 && fperms +x /usr/bin/avidemux3_qt4 |
313 |
|
314 |
newicon ${PN}_icon.png ${PN}-2.6.png |
315 |
use gtk && domenu ${PN}-2.6-gtk.desktop |
316 |
use qt4 && domenu ${PN}-2.6.desktop |
317 |
+ |
318 |
dodoc AUTHORS README |
319 |
} |
320 |
|
321 |
|
322 |
|
323 |
1.206 media-video/avidemux/ChangeLog |
324 |
|
325 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?rev=1.206&view=markup |
326 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?rev=1.206&content-type=text/plain |
327 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?r1=1.205&r2=1.206 |
328 |
|
329 |
Index: ChangeLog |
330 |
=================================================================== |
331 |
RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v |
332 |
retrieving revision 1.205 |
333 |
retrieving revision 1.206 |
334 |
diff -u -r1.205 -r1.206 |
335 |
--- ChangeLog 2 Mar 2013 22:06:56 -0000 1.205 |
336 |
+++ ChangeLog 4 Mar 2013 16:34:51 -0000 1.206 |
337 |
@@ -1,6 +1,11 @@ |
338 |
# ChangeLog for media-video/avidemux |
339 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
340 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.205 2013/03/02 22:06:56 hwoarang Exp $ |
341 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.206 2013/03/04 16:34:51 tomwij Exp $ |
342 |
+ |
343 |
+ 04 Mar 2013; Tom Wijsman <TomWij@g.o> avidemux-2.6.1.ebuild: |
344 |
+ Split magic powder function into EAPI 5 appropriate src_configure, src_compile |
345 |
+ and src_install functions; cleaned up the ebuild as a first step in |
346 |
+ preparation of unmasking it. |
347 |
|
348 |
02 Mar 2013; Markos Chandras <hwoarang@g.o> avidemux-2.5.6-r2.ebuild, |
349 |
avidemux-2.6.0.ebuild, avidemux-2.6.1.ebuild: |