Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andreas Schuerch <nativemad@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
Date: Thu, 29 Oct 2015 08:14:13
Message-Id: 1446106398.ec446f4f5f86d175bbae92c95c16678f57e1b5c2.nativemad@gentoo
1 commit: ec446f4f5f86d175bbae92c95c16678f57e1b5c2
2 Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 29 08:13:18 2015 +0000
4 Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 29 08:13:18 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec446f4f
7
8 media-sound/ardour: Bump to 4.4 and changes how cflags get set
9
10 Package-Manager: portage-2.2.20.1
11
12 media-sound/ardour/Manifest | 1 +
13 .../{ardour-9999.ebuild => ardour-4.4.ebuild} | 125 ++++++++++-----------
14 media-sound/ardour/ardour-9999.ebuild | 125 ++++++++++-----------
15 3 files changed, 115 insertions(+), 136 deletions(-)
16
17 diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
18 index d7c5459..6470b94 100644
19 --- a/media-sound/ardour/Manifest
20 +++ b/media-sound/ardour/Manifest
21 @@ -7,3 +7,4 @@ DIST ardour-3.5.403.tar.gz 8583763 SHA256 46490623479d9a25e2ab98b817c1f5c42b1d04
22 DIST ardour-4.0.tar.gz 9189038 SHA256 ea1131a24774d5f8dcab4ac7ea3b36bd427b1e4d0bef6f3db0681bc4ca131cf1 SHA512 2317c5818fe89386319f12062f0af0d08b07f569d6f775b7ecfa4f3a4bb1f565e05f3ff32f05f591c5628bdd402eda5bce4be4f8fa89da6c2092d5edb2c9ae7a WHIRLPOOL 854145ed135f6b23222ab2d6022e31b09221cac0d326fa17c5ee88e4e8ebd033e69c447fcbac35a925ff23974cc8b2b13c076014118977bbc88836124a912ad4
23 DIST ardour-4.1.tar.gz 9247567 SHA256 1d5eac009f3c84aee11c4e7d1c548747cb5a43eddac92b4e640342b79cc808b9 SHA512 5e13301ca5d8140498256d43729d770c6222b220d2c817651304746a7cc20fe8450b094d978bc9559b9ec7b5a7a95ca1c5131be5b51c78835e75b3b7bbb1be82 WHIRLPOOL 3699ea7f29c9df30ddfa3ad9a1e05f6a3cbccddaf5ae1804679b6c1a50e8b800e14f06760e8d9d44a4ac2631f32db595048640c01b9c967f060bfaee11f28a73
24 DIST ardour-4.2.tar.gz 9484009 SHA256 c8af454e974be3222bceb374d5b3d126af6c9766326f7e276acb8ef2fa21cfa4 SHA512 cb1d8144216ff959dac1b371c5ec2b99e0fc2137c105fda5c38460c7f148d7f575761453b24ea5ab7c58139a6839b92ee863c6a5485ab4a009da7c362471a2b3 WHIRLPOOL f9d7df4687c4d1a402c43ba43acee9f3b1423f8dcc691ef69590554f49530be5df0ef57f0f20b67ba0efb50690cdc744015f1917bb2051857d496c5cf000f948
25 +DIST ardour-4.4.tar.gz 9511090 SHA256 d567e99c4476c0122006c85d09a8e4eab93db28be7be99d338ea66be8581bfcf SHA512 8df3e4552b0ccdd76c5ccf06224594325bb8c02f897bb79bd983531a2f4f56c60185b6080e2f8eddb6a274b9d48dc93a47ddc5471e05b253d492c09be816dde0 WHIRLPOOL 86e298b7defa5249c0632368bae64ddde2175e5f5ece66b4932485a4216ae0613b81e2f736f54e7f00a600be5e238fe41559fe2290f3aebbb36b208184aefc25
26
27 diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-4.4.ebuild
28 similarity index 59%
29 copy from media-sound/ardour/ardour-9999.ebuild
30 copy to media-sound/ardour/ardour-4.4.ebuild
31 index e91dce0..edeb9ed 100644
32 --- a/media-sound/ardour/ardour-9999.ebuild
33 +++ b/media-sound/ardour/ardour-4.4.ebuild
34 @@ -3,19 +3,16 @@
35 # $Id$
36
37 EAPI=5
38 -
39 PYTHON_COMPAT=( python2_7 )
40 PYTHON_REQ_USE='threads(+)'
41 -
42 inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
43
44 DESCRIPTION="Digital Audio Workstation"
45 HOMEPAGE="http://ardour.org/"
46
47 -if [ ${PV} = 9999 ]; then
48 - KEYWORDS=""
49 +if [[ ${PV} == *9999* ]]; then
50 EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
51 - inherit git-2
52 + inherit git-r3
53 else
54 KEYWORDS="~amd64 ~x86"
55 SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
56 @@ -23,37 +20,38 @@ fi
57
58 LICENSE="GPL-2"
59 SLOT="4"
60 -IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
61 +IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
62
63 -RDEPEND="media-libs/aubio
64 - media-libs/liblo
65 - sci-libs/fftw:3.0
66 - media-libs/freetype:2
67 - >=dev-libs/glib-2.10.1:2
68 +RDEPEND="
69 >=dev-cpp/glibmm-2.32.0
70 - >=x11-libs/gtk+-2.8.1:2
71 - >=dev-libs/libxml2-2.6:2
72 - >=media-libs/libsndfile-1.0.18
73 - >=media-libs/libsamplerate-0.1
74 - >=media-libs/rubberband-1.6.0
75 - >=media-libs/libsoundtouch-1.6.0
76 - media-libs/flac
77 - media-libs/raptor:2
78 - >=media-libs/liblrdf-0.4.0-r20
79 - >=gnome-base/libgnomecanvas-2
80 - media-libs/vamp-plugin-sdk
81 - dev-libs/libxslt
82 - dev-libs/libsigc++:2
83 >=dev-cpp/gtkmm-2.16:2.4
84 >=dev-cpp/libgnomecanvasmm-2.26:2.6
85 + dev-libs/boost:=
86 + >=dev-libs/glib-2.10.1:2
87 + dev-libs/libsigc++:2
88 + >=dev-libs/libxml2-2.6:2
89 + dev-libs/libxslt
90 + >=gnome-base/libgnomecanvas-2
91 media-libs/alsa-lib
92 - x11-libs/pango
93 - x11-libs/cairo
94 + media-libs/aubio
95 + media-libs/flac
96 + media-libs/freetype:2
97 media-libs/libart_lgpl
98 - virtual/libusb:0
99 - dev-libs/boost
100 + media-libs/liblo
101 + >=media-libs/liblrdf-0.4.0-r20
102 + >=media-libs/libsamplerate-0.1
103 + >=media-libs/libsndfile-1.0.18
104 + >=media-libs/libsoundtouch-1.6.0
105 + media-libs/raptor:2
106 + >=media-libs/rubberband-1.6.0
107 >=media-libs/taglib-1.7
108 + media-libs/vamp-plugin-sdk
109 net-misc/curl
110 + sci-libs/fftw:3.0
111 + virtual/libusb:0
112 + x11-libs/cairo
113 + >=x11-libs/gtk+-2.8.1:2
114 + x11-libs/pango
115 jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
116 lv2? (
117 >=media-libs/slv2-0.6.1
118 @@ -66,63 +64,54 @@ RDEPEND="media-libs/aubio
119
120 DEPEND="${RDEPEND}
121 ${PYTHON_DEPS}
122 - virtual/pkgconfig
123 >=media-sound/jack-audio-connection-kit-0.120
124 sys-devel/gettext
125 + virtual/pkgconfig
126 doc? ( app-doc/doxygen[dot] )"
127 - if ! [ ${PV} = 9999 ]; then
128 - DEPEND="${DEPEND}"
129 - fi
130 -
131 -src_unpack() {
132 - if [ ${PV} = 9999 ]; then
133 - git-2_src_unpack
134 - else
135 - unpack ${A}
136 - fi
137 -}
138
139 src_prepare(){
140 - if ! [ ${PV} = 9999 ]; then
141 - epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
142 + if ! [[ ${PV} == *9999* ]]; then
143 + epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
144 touch "${S}/libs/ardour/revision.cc"
145 fi
146 - $(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
147 - epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
148 - sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
149 - sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
150 - sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript
151 + use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
152 + sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript
153 + MARCH=$(get-flag march)
154 + if use cpu_flags_x86_sse; then
155 + if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
156 + elog "You enabled sse but use an march that does not support sse!"
157 + elog "We add sse to the flags now, but please consider switching your march in make.conf!"
158 + fi
159 + OPTFLAGS="sse"
160 + fi
161 + if use cpu_flags_x86_mmx; then
162 + if [[ ${MARCH} == "i486" ]]; then
163 + elog "You enabled mmx with i486 set as march! You have been warned!"
164 + fi
165 + OPTFLAGS="${OPTFLAGS} mmx"
166 + fi
167 + if use cpu_flags_x86_3dnow; then
168 + OPTFLAGS="${OPTFLAGS} 3dnow"
169 + fi
170 + sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '${OPTFLAGS}' just some place holders\"/' \
171 + -i "${S}"/wscript
172 + sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
173 append-flags "-lboost_system"
174 }
175
176 src_configure() {
177 - if use cpu_flags_x86_sse; then
178 - MARCH=$(get-flag march)
179 - for ARCHWOSSE in i686 i486; do
180 - if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
181 - for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
182 - is-flag ${SSEOPT} && SSEON="yes"
183 - done
184 - if [ -z ${SSEON} ]; then
185 - append-flags -msse
186 - elog "You enabled sse but use an march that does not support sse!"
187 - elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
188 - fi
189 - fi
190 - done
191 - fi
192 tc-export CC CXX
193 mkdir -p "${D}"
194 waf-utils_src_configure \
195 --destdir="${D}" \
196 --prefix=/usr \
197 --configdir=/etc \
198 - --optimize \
199 --nls \
200 - $(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --libjack=weak") \
201 - $(use lv2 && echo "--lv2" || echo "--no-lv2") \
202 - $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
203 - $(use doc && echo "--docs")
204 + --optimize \
205 + $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
206 + $(usex lv2 "--lv2" "--no-lv2") \
207 + $(usex doc "--docs" '') \
208 + $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
209 }
210
211 src_install() {
212 @@ -135,5 +124,5 @@ src_install() {
213
214 pkg_postinst() {
215 elog "If you are using Ardour and want to keep its development alive"
216 - elog "then please consider to do a donation upstream at ardour.org. Thanks!"
217 + elog "then please consider to make a donation upstream at ${HOMEPAGE}"
218 }
219
220 diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
221 index e91dce0..da43984 100644
222 --- a/media-sound/ardour/ardour-9999.ebuild
223 +++ b/media-sound/ardour/ardour-9999.ebuild
224 @@ -3,19 +3,16 @@
225 # $Id$
226
227 EAPI=5
228 -
229 PYTHON_COMPAT=( python2_7 )
230 PYTHON_REQ_USE='threads(+)'
231 -
232 inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
233
234 DESCRIPTION="Digital Audio Workstation"
235 HOMEPAGE="http://ardour.org/"
236
237 -if [ ${PV} = 9999 ]; then
238 - KEYWORDS=""
239 +if [[ ${PV} == *9999* ]]; then
240 EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
241 - inherit git-2
242 + inherit git-r3
243 else
244 KEYWORDS="~amd64 ~x86"
245 SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
246 @@ -23,37 +20,38 @@ fi
247
248 LICENSE="GPL-2"
249 SLOT="4"
250 -IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
251 +IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
252
253 -RDEPEND="media-libs/aubio
254 - media-libs/liblo
255 - sci-libs/fftw:3.0
256 - media-libs/freetype:2
257 - >=dev-libs/glib-2.10.1:2
258 +RDEPEND="
259 >=dev-cpp/glibmm-2.32.0
260 - >=x11-libs/gtk+-2.8.1:2
261 - >=dev-libs/libxml2-2.6:2
262 - >=media-libs/libsndfile-1.0.18
263 - >=media-libs/libsamplerate-0.1
264 - >=media-libs/rubberband-1.6.0
265 - >=media-libs/libsoundtouch-1.6.0
266 - media-libs/flac
267 - media-libs/raptor:2
268 - >=media-libs/liblrdf-0.4.0-r20
269 - >=gnome-base/libgnomecanvas-2
270 - media-libs/vamp-plugin-sdk
271 - dev-libs/libxslt
272 - dev-libs/libsigc++:2
273 >=dev-cpp/gtkmm-2.16:2.4
274 >=dev-cpp/libgnomecanvasmm-2.26:2.6
275 + dev-libs/boost:=
276 + >=dev-libs/glib-2.10.1:2
277 + dev-libs/libsigc++:2
278 + >=dev-libs/libxml2-2.6:2
279 + dev-libs/libxslt
280 + >=gnome-base/libgnomecanvas-2
281 media-libs/alsa-lib
282 - x11-libs/pango
283 - x11-libs/cairo
284 + media-libs/aubio
285 + media-libs/flac
286 + media-libs/freetype:2
287 media-libs/libart_lgpl
288 - virtual/libusb:0
289 - dev-libs/boost
290 + media-libs/liblo
291 + >=media-libs/liblrdf-0.4.0-r20
292 + >=media-libs/libsamplerate-0.1
293 + >=media-libs/libsndfile-1.0.18
294 + >=media-libs/libsoundtouch-1.6.0
295 + media-libs/raptor:2
296 + >=media-libs/rubberband-1.6.0
297 >=media-libs/taglib-1.7
298 + media-libs/vamp-plugin-sdk
299 net-misc/curl
300 + sci-libs/fftw:3.0
301 + virtual/libusb:0
302 + x11-libs/cairo
303 + >=x11-libs/gtk+-2.8.1:2
304 + x11-libs/pango
305 jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
306 lv2? (
307 >=media-libs/slv2-0.6.1
308 @@ -66,63 +64,54 @@ RDEPEND="media-libs/aubio
309
310 DEPEND="${RDEPEND}
311 ${PYTHON_DEPS}
312 - virtual/pkgconfig
313 >=media-sound/jack-audio-connection-kit-0.120
314 sys-devel/gettext
315 + virtual/pkgconfig
316 doc? ( app-doc/doxygen[dot] )"
317 - if ! [ ${PV} = 9999 ]; then
318 - DEPEND="${DEPEND}"
319 - fi
320 -
321 -src_unpack() {
322 - if [ ${PV} = 9999 ]; then
323 - git-2_src_unpack
324 - else
325 - unpack ${A}
326 - fi
327 -}
328
329 src_prepare(){
330 - if ! [ ${PV} = 9999 ]; then
331 - epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
332 + if ! [[ ${PV} == *9999* ]]; then
333 + epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
334 touch "${S}/libs/ardour/revision.cc"
335 fi
336 - $(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
337 - epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
338 - sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
339 - sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
340 - sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript
341 + use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
342 + sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript
343 + MARCH=$(get-flag march)
344 + if use cpu_flags_x86_sse; then
345 + if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
346 + elog "You enabled sse but use an march that does not support sse!"
347 + elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
348 + fi
349 + OPTFLAGS="sse"
350 + fi
351 + if use cpu_flags_x86_mmx; then
352 + if [[ ${MARCH} == "i486" ]]; then
353 + elog "You enabled mmx with i486 set as march! You have been warned!"
354 + fi
355 + OPTFLAGS="${OPTFLAGS} mmx"
356 + fi
357 + if use cpu_flags_x86_3dnow; then
358 + OPTFLAGS="${OPTFLAGS} 3dnow"
359 + fi
360 + sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '${OPTFLAGS}' just some place holders\"/' \
361 + -i "${S}"/wscript
362 + sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
363 append-flags "-lboost_system"
364 }
365
366 src_configure() {
367 - if use cpu_flags_x86_sse; then
368 - MARCH=$(get-flag march)
369 - for ARCHWOSSE in i686 i486; do
370 - if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
371 - for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
372 - is-flag ${SSEOPT} && SSEON="yes"
373 - done
374 - if [ -z ${SSEON} ]; then
375 - append-flags -msse
376 - elog "You enabled sse but use an march that does not support sse!"
377 - elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
378 - fi
379 - fi
380 - done
381 - fi
382 tc-export CC CXX
383 mkdir -p "${D}"
384 waf-utils_src_configure \
385 --destdir="${D}" \
386 --prefix=/usr \
387 --configdir=/etc \
388 - --optimize \
389 --nls \
390 - $(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --libjack=weak") \
391 - $(use lv2 && echo "--lv2" || echo "--no-lv2") \
392 - $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
393 - $(use doc && echo "--docs")
394 + --optimize \
395 + $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
396 + $(usex lv2 "--lv2" "--no-lv2") \
397 + $(usex doc "--docs" '') \
398 + $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
399 }
400
401 src_install() {
402 @@ -135,5 +124,5 @@ src_install() {
403
404 pkg_postinst() {
405 elog "If you are using Ardour and want to keep its development alive"
406 - elog "then please consider to do a donation upstream at ardour.org. Thanks!"
407 + elog "then please consider to make a donation upstream at ${HOMEPAGE}"
408 }
Report Message
Find on MARC Find on Google Groups