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

Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/qmmp-plugin-pack/, media-sound/qmmp/, media-sound/musescore/, ...
Date: Tue, 31 Dec 2019 14:34:59
Message-Id: 1577802650.9587e4463685465b87d12026397e84586a109838.asturm@gentoo
1 commit: 9587e4463685465b87d12026397e84586a109838
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 30 18:13:38 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 31 14:30:50 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9587e446
7
8 */*: Switch sound proj packages to cmake.eclass
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 media-libs/alure/alure-1.2-r1.ebuild | 6 +++---
13 media-libs/chromaprint/chromaprint-1.4.3.ebuild | 3 ++-
14 media-libs/codec2/codec2-0.8.1.ebuild | 3 ++-
15 media-libs/libcue/libcue-2.2.1.ebuild | 2 +-
16 media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild | 4 ++--
17 media-libs/openal/openal-1.20.0.ebuild | 3 ++-
18 media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild | 2 +-
19 media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild | 4 ++--
20 media-sound/milkytracker/milkytracker-1.0.0.ebuild | 11 +++++------
21 media-sound/musescore/musescore-3.3.3.ebuild | 10 +++++-----
22 media-sound/musescore/musescore-3.3.4.ebuild | 10 +++++-----
23 media-sound/musescore/musescore-3.3.ebuild | 10 +++++-----
24 media-sound/musescore/musescore-9999.ebuild | 10 +++++-----
25 media-sound/qmmp/qmmp-1.3.2.ebuild | 6 +++---
26 media-sound/qmmp/qmmp-1.3.4.ebuild | 6 +++---
27 media-sound/qmmp/qmmp-1.3.5.ebuild | 6 +++---
28 media-sound/qmmp/qmmp-9999.ebuild | 6 +++---
29 media-sound/yoshimi/yoshimi-1.5.10.2.ebuild | 6 +++---
30 18 files changed, 55 insertions(+), 53 deletions(-)
31
32 diff --git a/media-libs/alure/alure-1.2-r1.ebuild b/media-libs/alure/alure-1.2-r1.ebuild
33 index 24092bba44b..69166861c89 100644
34 --- a/media-libs/alure/alure-1.2-r1.ebuild
35 +++ b/media-libs/alure/alure-1.2-r1.ebuild
36 @@ -3,7 +3,7 @@
37
38 EAPI=7
39
40 -inherit cmake-utils
41 +inherit cmake
42
43 DESCRIPTION="The OpenAL Utility Toolkit"
44 HOMEPAGE="https://kcat.strangesoft.net/alure.html"
45 @@ -27,7 +27,7 @@ DEPEND="${RDEPEND}"
46 PATCHES=( "${FILESDIR}/${P}-include-unistd.patch" )
47
48 src_prepare() {
49 - cmake-utils_src_prepare
50 + cmake_src_prepare
51
52 sed -i -e "/DESTINATION/s:doc/alure:doc/${PF}:" CMakeLists.txt || die
53 }
54 @@ -46,5 +46,5 @@ src_configure() {
55 -DVORBIS=$(usex vorbis)
56 )
57
58 - cmake-utils_src_configure
59 + cmake_src_configure
60 }
61
62 diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
63 index 943c2de4042..cd4a0daac61 100644
64 --- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
65 +++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
66 @@ -3,6 +3,7 @@
67
68 EAPI=7
69
70 +CMAKE_ECLASS=cmake
71 GTEST_VERSION="1.8.0"
72 inherit cmake-multilib
73
74 @@ -43,7 +44,7 @@ multilib_src_configure() {
75 -DFFT_LIB=avfft
76 -DAUDIO_PROCESSOR_LIB=$(usex libav avresample swresample)
77 )
78 - cmake-utils_src_configure
79 + cmake_src_configure
80 }
81
82 multilib_src_test() {
83
84 diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
85 index 29f29b27f09..9660f28e09b 100644
86 --- a/media-libs/codec2/codec2-0.8.1.ebuild
87 +++ b/media-libs/codec2/codec2-0.8.1.ebuild
88 @@ -3,6 +3,7 @@
89
90 EAPI=7
91
92 +CMAKE_ECLASS=cmake
93 inherit cmake-multilib
94
95 DESCRIPTION="Low bit rate speech codec"
96 @@ -18,7 +19,7 @@ PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
97
98 multilib_src_configure() {
99 local mycmakeargs=( -DUNITTEST=OFF )
100 - cmake-utils_src_configure
101 + cmake_src_configure
102 }
103
104 src_install() {
105
106 diff --git a/media-libs/libcue/libcue-2.2.1.ebuild b/media-libs/libcue/libcue-2.2.1.ebuild
107 index c6aa7b57564..9d485704f6c 100644
108 --- a/media-libs/libcue/libcue-2.2.1.ebuild
109 +++ b/media-libs/libcue/libcue-2.2.1.ebuild
110 @@ -3,7 +3,7 @@
111
112 EAPI=7
113
114 -inherit cmake-utils
115 +inherit cmake
116
117 DESCRIPTION="CUE Sheet Parser Library"
118 HOMEPAGE="https://github.com/lipnitsk/libcue"
119
120 diff --git a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
121 index 2e6fa31892f..55b84538167 100644
122 --- a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
123 +++ b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild
124 @@ -3,7 +3,7 @@
125
126 EAPI=7
127
128 -inherit cmake-utils
129 +inherit cmake
130
131 DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice"
132 HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"
133 @@ -38,5 +38,5 @@ src_configure() {
134 -DMYGPO_BUILD_TESTS=$(usex test)
135 )
136
137 - cmake-utils_src_configure
138 + cmake_src_configure
139 }
140
141 diff --git a/media-libs/openal/openal-1.20.0.ebuild b/media-libs/openal/openal-1.20.0.ebuild
142 index ba3fa775890..6f24d010fd5 100644
143 --- a/media-libs/openal/openal-1.20.0.ebuild
144 +++ b/media-libs/openal/openal-1.20.0.ebuild
145 @@ -3,6 +3,7 @@
146
147 EAPI=7
148
149 +CMAKE_ECLASS=cmake
150 inherit cmake-multilib
151
152 MY_P="${PN}-soft-${PV}"
153 @@ -60,7 +61,7 @@ src_configure() {
154
155 use cpu_flags_arm_neon && mycmakeargs+=( -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) )
156
157 - cmake-utils_src_configure
158 + cmake_src_configure
159 }
160
161 multilib_parallel_foreach_abi my_configure
162
163 diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
164 index 3dce469db1a..1cbdb39bcfb 100644
165 --- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
166 +++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild
167 @@ -3,7 +3,7 @@
168
169 EAPI=7
170
171 -inherit cmake-utils
172 +inherit cmake
173
174 DESCRIPTION="A set of extra plugins for Qmmp"
175 HOMEPAGE="http://qmmp.ylsoftware.com/"
176
177 diff --git a/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild b/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
178 index 8184eff54ff..de8b8d6c52d 100644
179 --- a/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
180 +++ b/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
181 @@ -3,7 +3,7 @@
182
183 EAPI=7
184
185 -inherit cmake-utils
186 +inherit cmake
187
188 DESCRIPTION="Fast and light music player"
189 HOMEPAGE="https://gogglesmm.github.io"
190 @@ -41,5 +41,5 @@ src_configure() {
191 -DWITH_NLS="$(usex nls)"
192 -DWITH_CFOX=OFF
193 )
194 - cmake-utils_src_configure
195 + cmake_src_configure
196 }
197
198 diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
199 index f2fac2cf642..3d5f9f04861 100644
200 --- a/media-sound/milkytracker/milkytracker-1.0.0.ebuild
201 +++ b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
202 @@ -3,7 +3,7 @@
203
204 EAPI=7
205
206 -inherit cmake-utils desktop
207 +inherit cmake desktop
208
209 DESCRIPTION="FastTracker 2 inspired music tracker"
210 HOMEPAGE="https://milkytracker.titandemo.org/"
211 @@ -31,15 +31,14 @@ S="${WORKDIR}/MilkyTracker-${PV}"
212
213 src_configure() {
214 local mycmakeargs=(
215 - -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
216 - $(cmake-utils_use_find_package alsa ALSA)
217 - $(cmake-utils_use_find_package jack JACK)
218 + $(cmake_use_find_package alsa ALSA)
219 + $(cmake_use_find_package jack JACK)
220 )
221 - cmake-utils_src_configure
222 + cmake_src_configure
223 }
224
225 src_install() {
226 - cmake-utils_src_install
227 + cmake_src_install
228
229 newicon resources/pictures/carton.png ${PN}.png
230 make_desktop_entry ${PN} MilkyTracker ${PN} \
231
232 diff --git a/media-sound/musescore/musescore-3.3.3.ebuild b/media-sound/musescore/musescore-3.3.3.ebuild
233 index 3055267da6e..cd4bca0639e 100644
234 --- a/media-sound/musescore/musescore-3.3.3.ebuild
235 +++ b/media-sound/musescore/musescore-3.3.3.ebuild
236 @@ -5,7 +5,7 @@ EAPI=7
237
238 CMAKE_MAKEFILE_GENERATOR="emake"
239 CHECKREQS_DISK_BUILD=3500M
240 -inherit cmake-utils xdg check-reqs
241 +inherit cmake xdg check-reqs
242
243 DESCRIPTION="WYSIWYG Music Score Typesetter"
244 HOMEPAGE="https://musescore.org/"
245 @@ -59,7 +59,7 @@ PATCHES=(
246 S="${WORKDIR}/MuseScore-${PV}"
247
248 src_prepare() {
249 - cmake-utils_src_prepare
250 + cmake_src_prepare
251
252 # Move soundfonts to the correct directory
253 mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
254 @@ -81,11 +81,11 @@ src_configure() {
255 -DSOUNDFONT3="$(usex vorbis)"
256 -DBUILD_WEBENGINE="$(usex webengine)"
257 )
258 - cmake-utils_src_configure
259 + cmake_src_configure
260 }
261
262 src_compile() {
263 cd "${BUILD_DIR}" || die
264 - cmake-utils_src_make -j1 lrelease manpages
265 - cmake-utils_src_compile
266 + cmake_build -j1 lrelease manpages
267 + cmake_src_compile
268 }
269
270 diff --git a/media-sound/musescore/musescore-3.3.4.ebuild b/media-sound/musescore/musescore-3.3.4.ebuild
271 index 3055267da6e..cd4bca0639e 100644
272 --- a/media-sound/musescore/musescore-3.3.4.ebuild
273 +++ b/media-sound/musescore/musescore-3.3.4.ebuild
274 @@ -5,7 +5,7 @@ EAPI=7
275
276 CMAKE_MAKEFILE_GENERATOR="emake"
277 CHECKREQS_DISK_BUILD=3500M
278 -inherit cmake-utils xdg check-reqs
279 +inherit cmake xdg check-reqs
280
281 DESCRIPTION="WYSIWYG Music Score Typesetter"
282 HOMEPAGE="https://musescore.org/"
283 @@ -59,7 +59,7 @@ PATCHES=(
284 S="${WORKDIR}/MuseScore-${PV}"
285
286 src_prepare() {
287 - cmake-utils_src_prepare
288 + cmake_src_prepare
289
290 # Move soundfonts to the correct directory
291 mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
292 @@ -81,11 +81,11 @@ src_configure() {
293 -DSOUNDFONT3="$(usex vorbis)"
294 -DBUILD_WEBENGINE="$(usex webengine)"
295 )
296 - cmake-utils_src_configure
297 + cmake_src_configure
298 }
299
300 src_compile() {
301 cd "${BUILD_DIR}" || die
302 - cmake-utils_src_make -j1 lrelease manpages
303 - cmake-utils_src_compile
304 + cmake_build -j1 lrelease manpages
305 + cmake_src_compile
306 }
307
308 diff --git a/media-sound/musescore/musescore-3.3.ebuild b/media-sound/musescore/musescore-3.3.ebuild
309 index 0533ecb9ffb..f697f370677 100644
310 --- a/media-sound/musescore/musescore-3.3.ebuild
311 +++ b/media-sound/musescore/musescore-3.3.ebuild
312 @@ -5,7 +5,7 @@ EAPI=7
313
314 CMAKE_MAKEFILE_GENERATOR="emake"
315 CHECKREQS_DISK_BUILD=3500M
316 -inherit cmake-utils xdg check-reqs
317 +inherit cmake xdg check-reqs
318
319 DESCRIPTION="WYSIWYG Music Score Typesetter"
320 HOMEPAGE="https://musescore.org/"
321 @@ -59,7 +59,7 @@ PATCHES=(
322 S="${WORKDIR}/MuseScore-${PV}"
323
324 src_prepare() {
325 - cmake-utils_src_prepare
326 + cmake_src_prepare
327
328 # Move soundfonts to the correct directory
329 mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
330 @@ -81,11 +81,11 @@ src_configure() {
331 -DSOUNDFONT3="$(usex vorbis)"
332 -DBUILD_WEBENGINE="$(usex webengine)"
333 )
334 - cmake-utils_src_configure
335 + cmake_src_configure
336 }
337
338 src_compile() {
339 cd "${BUILD_DIR}" || die
340 - cmake-utils_src_make -j1 lrelease manpages
341 - cmake-utils_src_compile
342 + cmake_build -j1 lrelease manpages
343 + cmake_src_compile
344 }
345
346 diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
347 index f55fab5973b..6b06e3b852c 100644
348 --- a/media-sound/musescore/musescore-9999.ebuild
349 +++ b/media-sound/musescore/musescore-9999.ebuild
350 @@ -5,7 +5,7 @@ EAPI=7
351
352 CMAKE_MAKEFILE_GENERATOR="emake"
353 CHECKREQS_DISK_BUILD=3500M
354 -inherit git-r3 cmake-utils xdg check-reqs
355 +inherit git-r3 cmake xdg check-reqs
356
357 DESCRIPTION="WYSIWYG Music Score Typesetter"
358 HOMEPAGE="https://musescore.org/"
359 @@ -62,7 +62,7 @@ src_unpack() {
360 }
361
362 src_prepare() {
363 - cmake-utils_src_prepare
364 + cmake_src_prepare
365
366 # Move soundfonts to the correct directory
367 mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
368 @@ -84,11 +84,11 @@ src_configure() {
369 -DSOUNDFONT3="$(usex vorbis)"
370 -DBUILD_WEBENGINE="$(usex webengine)"
371 )
372 - cmake-utils_src_configure
373 + cmake_src_configure
374 }
375
376 src_compile() {
377 cd "${BUILD_DIR}" || die
378 - cmake-utils_src_make -j1 lrelease manpages
379 - cmake-utils_src_compile
380 + cmake_build -j1 lrelease manpages
381 + cmake_src_compile
382 }
383
384 diff --git a/media-sound/qmmp/qmmp-1.3.2.ebuild b/media-sound/qmmp/qmmp-1.3.2.ebuild
385 index ba1cd14b3f1..f3bc7b03bda 100644
386 --- a/media-sound/qmmp/qmmp-1.3.2.ebuild
387 +++ b/media-sound/qmmp/qmmp-1.3.2.ebuild
388 @@ -3,7 +3,7 @@
389
390 EAPI=7
391
392 -inherit cmake-utils xdg-utils
393 +inherit cmake xdg-utils
394 [[ ${PV} = 9999 ]] && inherit subversion
395
396 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
397 @@ -104,7 +104,7 @@ src_prepare() {
398 src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
399 fi
400
401 - cmake-utils_src_prepare
402 + cmake_src_prepare
403 }
404
405 src_configure() {
406 @@ -156,7 +156,7 @@ src_configure() {
407 -DUSE_WAVPACK="$(usex wavpack)"
408 )
409
410 - cmake-utils_src_configure
411 + cmake_src_configure
412 }
413
414 pkg_postinst() {
415
416 diff --git a/media-sound/qmmp/qmmp-1.3.4.ebuild b/media-sound/qmmp/qmmp-1.3.4.ebuild
417 index 88c814b238e..b403c47023b 100644
418 --- a/media-sound/qmmp/qmmp-1.3.4.ebuild
419 +++ b/media-sound/qmmp/qmmp-1.3.4.ebuild
420 @@ -3,7 +3,7 @@
421
422 EAPI=7
423
424 -inherit cmake-utils xdg-utils
425 +inherit cmake xdg-utils
426 [[ ${PV} = 9999 ]] && inherit subversion
427
428 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
429 @@ -103,7 +103,7 @@ src_prepare() {
430 src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
431 fi
432
433 - cmake-utils_src_prepare
434 + cmake_src_prepare
435 }
436
437 src_configure() {
438 @@ -155,7 +155,7 @@ src_configure() {
439 -DUSE_WAVPACK="$(usex wavpack)"
440 )
441
442 - cmake-utils_src_configure
443 + cmake_src_configure
444 }
445
446 pkg_postinst() {
447
448 diff --git a/media-sound/qmmp/qmmp-1.3.5.ebuild b/media-sound/qmmp/qmmp-1.3.5.ebuild
449 index 88c814b238e..b403c47023b 100644
450 --- a/media-sound/qmmp/qmmp-1.3.5.ebuild
451 +++ b/media-sound/qmmp/qmmp-1.3.5.ebuild
452 @@ -3,7 +3,7 @@
453
454 EAPI=7
455
456 -inherit cmake-utils xdg-utils
457 +inherit cmake xdg-utils
458 [[ ${PV} = 9999 ]] && inherit subversion
459
460 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
461 @@ -103,7 +103,7 @@ src_prepare() {
462 src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
463 fi
464
465 - cmake-utils_src_prepare
466 + cmake_src_prepare
467 }
468
469 src_configure() {
470 @@ -155,7 +155,7 @@ src_configure() {
471 -DUSE_WAVPACK="$(usex wavpack)"
472 )
473
474 - cmake-utils_src_configure
475 + cmake_src_configure
476 }
477
478 pkg_postinst() {
479
480 diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
481 index 88c814b238e..b403c47023b 100644
482 --- a/media-sound/qmmp/qmmp-9999.ebuild
483 +++ b/media-sound/qmmp/qmmp-9999.ebuild
484 @@ -3,7 +3,7 @@
485
486 EAPI=7
487
488 -inherit cmake-utils xdg-utils
489 +inherit cmake xdg-utils
490 [[ ${PV} = 9999 ]] && inherit subversion
491
492 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
493 @@ -103,7 +103,7 @@ src_prepare() {
494 src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
495 fi
496
497 - cmake-utils_src_prepare
498 + cmake_src_prepare
499 }
500
501 src_configure() {
502 @@ -155,7 +155,7 @@ src_configure() {
503 -DUSE_WAVPACK="$(usex wavpack)"
504 )
505
506 - cmake-utils_src_configure
507 + cmake_src_configure
508 }
509
510 pkg_postinst() {
511
512 diff --git a/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
513 index 4acbf0c9ea5..442d7fa9636 100644
514 --- a/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
515 +++ b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
516 @@ -3,7 +3,7 @@
517
518 EAPI=7
519
520 -inherit cmake-utils xdg
521 +inherit cmake xdg
522
523 DESCRIPTION="Software synthesizer based on ZynAddSubFX"
524 HOMEPAGE="https://yoshimi.github.io/"
525 @@ -38,7 +38,7 @@ PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch )
526 DOCS=( Changelog README.txt )
527
528 src_prepare() {
529 - cmake-utils_src_prepare
530 + cmake_src_prepare
531 # respect doc dir
532 sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die
533 }
534 @@ -47,5 +47,5 @@ src_configure() {
535 local mycmakeargs=(
536 -DLV2Plugin=$(usex lv2)
537 )
538 - cmake-utils_src_configure
539 + cmake_src_configure
540 }
Report Message
Find on MARC Find on Google Groups