1 |
tomwij 13/09/01 18:54:38 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: avidemux-2.6.5-r1.ebuild |
5 |
Log: |
6 |
Revision bump. Import the install fix I did for avidemux-plugins to bring back avidemux3_cli, as that executable went lost after making more use of the eclass; the cmake-utils.eclass currently doesn't support calling cmake-utils_src_install multiple times with different BUILD_DIR locations, see bug #483294 for more details. Thanks to Nikoli on IRC for reporting the missing executable. |
7 |
|
8 |
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.226 media-video/avidemux/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?rev=1.226&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?rev=1.226&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?r1=1.225&r2=1.226 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v |
20 |
retrieving revision 1.225 |
21 |
retrieving revision 1.226 |
22 |
diff -u -r1.225 -r1.226 |
23 |
--- ChangeLog 1 Sep 2013 11:53:13 -0000 1.225 |
24 |
+++ ChangeLog 1 Sep 2013 18:54:38 -0000 1.226 |
25 |
@@ -1,6 +1,16 @@ |
26 |
# ChangeLog for media-video/avidemux |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.225 2013/09/01 11:53:13 tomwij Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.226 2013/09/01 18:54:38 tomwij Exp $ |
30 |
+ |
31 |
+*avidemux-2.6.5-r1 (01 Sep 2013) |
32 |
+ |
33 |
+ 01 Sep 2013; Tom Wijsman <TomWij@g.o> +avidemux-2.6.5-r1.ebuild: |
34 |
+ Revision bump. Import the install fix I did for avidemux-plugins to bring back |
35 |
+ avidemux3_cli, as that executable went lost after making more use of the |
36 |
+ eclass; the cmake-utils.eclass currently doesn't support calling cmake- |
37 |
+ utils_src_install multiple times with different BUILD_DIR locations, see bug |
38 |
+ #483294 for more details. Thanks to Nikoli on IRC for reporting the missing |
39 |
+ executable. |
40 |
|
41 |
*avidemux-2.6.5 (01 Sep 2013) |
42 |
|
43 |
|
44 |
|
45 |
|
46 |
1.1 media-video/avidemux/avidemux-2.6.5-r1.ebuild |
47 |
|
48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.5-r1.ebuild?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.6.5-r1.ebuild?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: avidemux-2.6.5-r1.ebuild |
52 |
=================================================================== |
53 |
# Copyright 1999-2013 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.5-r1.ebuild,v 1.1 2013/09/01 18:54:38 tomwij Exp $ |
56 |
|
57 |
EAPI="5" |
58 |
|
59 |
PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr" |
60 |
|
61 |
inherit cmake-utils eutils flag-o-matic l10n |
62 |
|
63 |
SLOT="2.6" |
64 |
|
65 |
DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks." |
66 |
HOMEPAGE="http://fixounet.free.fr/${PN}" |
67 |
|
68 |
# Multiple licenses because of all the bundled stuff. |
69 |
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" |
70 |
IUSE="debug opengl nls qt4 sdl vaapi vdpau video_cards_fglrx xv" |
71 |
KEYWORDS="~amd64 ~x86" |
72 |
|
73 |
if [[ ${PV} == *9999* ]] ; then |
74 |
KEYWORDS="" |
75 |
EGIT_REPO_URI="git://gitorious.org/${PN}2-6/${PN}2-6.git https://git.gitorious.org/${PN}2-6/${PN}2-6.git" |
76 |
|
77 |
inherit git-2 |
78 |
else |
79 |
MY_P="${PN}_${PV}" |
80 |
SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz" |
81 |
fi |
82 |
|
83 |
DEPEND=" |
84 |
~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,video_cards_fglrx?,xv?] |
85 |
opengl? ( virtual/opengl:0 ) |
86 |
qt4? ( >=dev-qt/qtgui-4.8.3:4 ) |
87 |
vaapi? ( x11-libs/libva:0 ) |
88 |
video_cards_fglrx? ( x11-libs/xvba-video:0 ) |
89 |
" |
90 |
RDEPEND="$DEPEND" |
91 |
PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]" |
92 |
|
93 |
S="${WORKDIR}/${MY_P}" |
94 |
|
95 |
processes="buildCli:avidemux/cli" |
96 |
use qt4 && processes+=" buildQt4:avidemux/qt4" |
97 |
|
98 |
src_prepare() { |
99 |
cmake-utils_src_prepare |
100 |
|
101 |
# Fix icon name -> avidemux-2.6.png |
102 |
sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed." |
103 |
|
104 |
# The desktop file is broken. It uses avidemux2 instead of avidemux3 |
105 |
# so it will actually launch avidemux-2.5 if it is installed. |
106 |
sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed." |
107 |
sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}2.desktop || die "Desktop file fix failed." |
108 |
|
109 |
# Fix QA warnings that complain a trailing ; is missing and Application is deprecated. |
110 |
sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed." |
111 |
|
112 |
# Now rename the desktop file to not collide with 2.5. |
113 |
mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed." |
114 |
|
115 |
# Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628) |
116 |
sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog." |
117 |
} |
118 |
|
119 |
src_configure() { |
120 |
local mycmakeargs=" |
121 |
-DAVIDEMUX_SOURCE_DIR='${S}' |
122 |
$(cmake-utils_use nls GETTEXT) |
123 |
$(cmake-utils_use sdl) |
124 |
$(cmake-utils_use vaapi LIBVA) |
125 |
$(cmake-utils_use vdpau) |
126 |
$(cmake-utils_use video_cards_fglrx XVBA) |
127 |
$(cmake-utils_use xv XVIDEO) |
128 |
" |
129 |
|
130 |
if use debug ; then |
131 |
mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1" |
132 |
fi |
133 |
|
134 |
for process in ${processes} ; do |
135 |
local build="${process%%:*}" |
136 |
|
137 |
mkdir "${S}"/${build} || die "Can't create build folder." |
138 |
cd "${S}"/${build} || die "Can't enter build folder." |
139 |
CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure |
140 |
done |
141 |
|
142 |
# Add lax vector typing for PowerPC. |
143 |
if use ppc || use ppc64 ; then |
144 |
append-cflags -flax-vector-conversions |
145 |
fi |
146 |
|
147 |
# See bug 432322. |
148 |
use x86 && replace-flags -O0 -O1 |
149 |
} |
150 |
|
151 |
src_compile() { |
152 |
for process in ${processes} ; do |
153 |
BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile |
154 |
done |
155 |
} |
156 |
|
157 |
DOCS=( AUTHORS README ) |
158 |
|
159 |
src_install() { |
160 |
for process in ${processes} ; do |
161 |
# cmake-utils_src_install doesn't respect BUILD_DIR |
162 |
# and there sometimes is a preinstall phase present. |
163 |
pushd "${S}/${process%%:*}" > /dev/null || die |
164 |
grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast |
165 |
grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast |
166 |
popd > /dev/null || die |
167 |
done |
168 |
|
169 |
if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then |
170 |
fperms +x /usr/bin/avidemux3_cli |
171 |
fi |
172 |
|
173 |
if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then |
174 |
fperms +x /usr/bin/avidemux3_jobs |
175 |
fi |
176 |
|
177 |
cd "${S}" || die "Can't enter source folder." |
178 |
newicon ${PN}_icon.png ${PN}-2.6.png |
179 |
|
180 |
if use qt4 ; then |
181 |
fperms +x /usr/bin/avidemux3_qt4 |
182 |
domenu ${PN}-2.6.desktop |
183 |
fi |
184 |
} |