commit: 9587e4463685465b87d12026397e84586a109838 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Dec 30 18:13:38 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 31 14:30:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9587e446
*/*: Switch sound proj packages to cmake.eclass Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/alure/alure-1.2-r1.ebuild | 6 +++--- media-libs/chromaprint/chromaprint-1.4.3.ebuild | 3 ++- media-libs/codec2/codec2-0.8.1.ebuild | 3 ++- media-libs/libcue/libcue-2.2.1.ebuild | 2 +- media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild | 4 ++-- media-libs/openal/openal-1.20.0.ebuild | 3 ++- media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.3.0.ebuild | 2 +- media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild | 4 ++-- media-sound/milkytracker/milkytracker-1.0.0.ebuild | 11 +++++------ media-sound/musescore/musescore-3.3.3.ebuild | 10 +++++----- media-sound/musescore/musescore-3.3.4.ebuild | 10 +++++----- media-sound/musescore/musescore-3.3.ebuild | 10 +++++----- media-sound/musescore/musescore-9999.ebuild | 10 +++++----- media-sound/qmmp/qmmp-1.3.2.ebuild | 6 +++--- media-sound/qmmp/qmmp-1.3.4.ebuild | 6 +++--- media-sound/qmmp/qmmp-1.3.5.ebuild | 6 +++--- media-sound/qmmp/qmmp-9999.ebuild | 6 +++--- media-sound/yoshimi/yoshimi-1.5.10.2.ebuild | 6 +++--- 18 files changed, 55 insertions(+), 53 deletions(-) diff --git a/media-libs/alure/alure-1.2-r1.ebuild b/media-libs/alure/alure-1.2-r1.ebuild index 24092bba44b..69166861c89 100644 --- a/media-libs/alure/alure-1.2-r1.ebuild +++ b/media-libs/alure/alure-1.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="The OpenAL Utility Toolkit" HOMEPAGE="https://kcat.strangesoft.net/alure.html"; @@ -27,7 +27,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${P}-include-unistd.patch" ) src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare sed -i -e "/DESTINATION/s:doc/alure:doc/${PF}:" CMakeLists.txt || die } @@ -46,5 +46,5 @@ src_configure() { -DVORBIS=$(usex vorbis) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild index 943c2de4042..cd4a0daac61 100644 --- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild +++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_ECLASS=cmake GTEST_VERSION="1.8.0" inherit cmake-multilib @@ -43,7 +44,7 @@ multilib_src_configure() { -DFFT_LIB=avfft -DAUDIO_PROCESSOR_LIB=$(usex libav avresample swresample) ) - cmake-utils_src_configure + cmake_src_configure } multilib_src_test() { diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild index 29f29b27f09..9660f28e09b 100644 --- a/media-libs/codec2/codec2-0.8.1.ebuild +++ b/media-libs/codec2/codec2-0.8.1.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_ECLASS=cmake inherit cmake-multilib DESCRIPTION="Low bit rate speech codec" @@ -18,7 +19,7 @@ PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" ) multilib_src_configure() { local mycmakeargs=( -DUNITTEST=OFF ) - cmake-utils_src_configure + cmake_src_configure } src_install() { diff --git a/media-libs/libcue/libcue-2.2.1.ebuild b/media-libs/libcue/libcue-2.2.1.ebuild index c6aa7b57564..9d485704f6c 100644 --- a/media-libs/libcue/libcue-2.2.1.ebuild +++ b/media-libs/libcue/libcue-2.2.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="CUE Sheet Parser Library" HOMEPAGE="https://github.com/lipnitsk/libcue"; diff --git a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild index 2e6fa31892f..55b84538167 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" HOMEPAGE="http://wiki.gpodder.org/wiki/Libmygpo-qt"; @@ -38,5 +38,5 @@ src_configure() { -DMYGPO_BUILD_TESTS=$(usex test) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/media-libs/openal/openal-1.20.0.ebuild b/media-libs/openal/openal-1.20.0.ebuild index ba3fa775890..6f24d010fd5 100644 --- a/media-libs/openal/openal-1.20.0.ebuild +++ b/media-libs/openal/openal-1.20.0.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_ECLASS=cmake inherit cmake-multilib MY_P="${PN}-soft-${PV}" @@ -60,7 +61,7 @@ src_configure() { use cpu_flags_arm_neon && mycmakeargs+=( -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) ) - cmake-utils_src_configure + cmake_src_configure } multilib_parallel_foreach_abi my_configure 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 index 3dce469db1a..1cbdb39bcfb 100644 --- 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 @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="A set of extra plugins for Qmmp" HOMEPAGE="http://qmmp.ylsoftware.com/"; diff --git a/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild b/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild index 8184eff54ff..de8b8d6c52d 100644 --- a/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild +++ b/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="Fast and light music player" HOMEPAGE="https://gogglesmm.github.io"; @@ -41,5 +41,5 @@ src_configure() { -DWITH_NLS="$(usex nls)" -DWITH_CFOX=OFF ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild b/media-sound/milkytracker/milkytracker-1.0.0.ebuild index f2fac2cf642..3d5f9f04861 100644 --- a/media-sound/milkytracker/milkytracker-1.0.0.ebuild +++ b/media-sound/milkytracker/milkytracker-1.0.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils desktop +inherit cmake desktop DESCRIPTION="FastTracker 2 inspired music tracker" HOMEPAGE="https://milkytracker.titandemo.org/"; @@ -31,15 +31,14 @@ S="${WORKDIR}/MilkyTracker-${PV}" src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} - $(cmake-utils_use_find_package alsa ALSA) - $(cmake-utils_use_find_package jack JACK) + $(cmake_use_find_package alsa ALSA) + $(cmake_use_find_package jack JACK) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install newicon resources/pictures/carton.png ${PN}.png make_desktop_entry ${PN} MilkyTracker ${PN} \ diff --git a/media-sound/musescore/musescore-3.3.3.ebuild b/media-sound/musescore/musescore-3.3.3.ebuild index 3055267da6e..cd4bca0639e 100644 --- a/media-sound/musescore/musescore-3.3.3.ebuild +++ b/media-sound/musescore/musescore-3.3.3.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" CHECKREQS_DISK_BUILD=3500M -inherit cmake-utils xdg check-reqs +inherit cmake xdg check-reqs DESCRIPTION="WYSIWYG Music Score Typesetter" HOMEPAGE="https://musescore.org/"; @@ -59,7 +59,7 @@ PATCHES=( S="${WORKDIR}/MuseScore-${PV}" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # Move soundfonts to the correct directory mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files" @@ -81,11 +81,11 @@ src_configure() { -DSOUNDFONT3="$(usex vorbis)" -DBUILD_WEBENGINE="$(usex webengine)" ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { cd "${BUILD_DIR}" || die - cmake-utils_src_make -j1 lrelease manpages - cmake-utils_src_compile + cmake_build -j1 lrelease manpages + cmake_src_compile } diff --git a/media-sound/musescore/musescore-3.3.4.ebuild b/media-sound/musescore/musescore-3.3.4.ebuild index 3055267da6e..cd4bca0639e 100644 --- a/media-sound/musescore/musescore-3.3.4.ebuild +++ b/media-sound/musescore/musescore-3.3.4.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" CHECKREQS_DISK_BUILD=3500M -inherit cmake-utils xdg check-reqs +inherit cmake xdg check-reqs DESCRIPTION="WYSIWYG Music Score Typesetter" HOMEPAGE="https://musescore.org/"; @@ -59,7 +59,7 @@ PATCHES=( S="${WORKDIR}/MuseScore-${PV}" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # Move soundfonts to the correct directory mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files" @@ -81,11 +81,11 @@ src_configure() { -DSOUNDFONT3="$(usex vorbis)" -DBUILD_WEBENGINE="$(usex webengine)" ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { cd "${BUILD_DIR}" || die - cmake-utils_src_make -j1 lrelease manpages - cmake-utils_src_compile + cmake_build -j1 lrelease manpages + cmake_src_compile } diff --git a/media-sound/musescore/musescore-3.3.ebuild b/media-sound/musescore/musescore-3.3.ebuild index 0533ecb9ffb..f697f370677 100644 --- a/media-sound/musescore/musescore-3.3.ebuild +++ b/media-sound/musescore/musescore-3.3.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" CHECKREQS_DISK_BUILD=3500M -inherit cmake-utils xdg check-reqs +inherit cmake xdg check-reqs DESCRIPTION="WYSIWYG Music Score Typesetter" HOMEPAGE="https://musescore.org/"; @@ -59,7 +59,7 @@ PATCHES=( S="${WORKDIR}/MuseScore-${PV}" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # Move soundfonts to the correct directory mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files" @@ -81,11 +81,11 @@ src_configure() { -DSOUNDFONT3="$(usex vorbis)" -DBUILD_WEBENGINE="$(usex webengine)" ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { cd "${BUILD_DIR}" || die - cmake-utils_src_make -j1 lrelease manpages - cmake-utils_src_compile + cmake_build -j1 lrelease manpages + cmake_src_compile } diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild index f55fab5973b..6b06e3b852c 100644 --- a/media-sound/musescore/musescore-9999.ebuild +++ b/media-sound/musescore/musescore-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" CHECKREQS_DISK_BUILD=3500M -inherit git-r3 cmake-utils xdg check-reqs +inherit git-r3 cmake xdg check-reqs DESCRIPTION="WYSIWYG Music Score Typesetter" HOMEPAGE="https://musescore.org/"; @@ -62,7 +62,7 @@ src_unpack() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # Move soundfonts to the correct directory mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files" @@ -84,11 +84,11 @@ src_configure() { -DSOUNDFONT3="$(usex vorbis)" -DBUILD_WEBENGINE="$(usex webengine)" ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { cd "${BUILD_DIR}" || die - cmake-utils_src_make -j1 lrelease manpages - cmake-utils_src_compile + cmake_build -j1 lrelease manpages + cmake_src_compile } diff --git a/media-sound/qmmp/qmmp-1.3.2.ebuild b/media-sound/qmmp/qmmp-1.3.2.ebuild index ba1cd14b3f1..f3bc7b03bda 100644 --- a/media-sound/qmmp/qmmp-1.3.2.ebuild +++ b/media-sound/qmmp/qmmp-1.3.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils xdg-utils +inherit cmake xdg-utils [[ ${PV} = 9999 ]] && inherit subversion DESCRIPTION="Qt5-based audio player with winamp/xmms skins support" @@ -104,7 +104,7 @@ src_prepare() { src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die fi - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -156,7 +156,7 @@ src_configure() { -DUSE_WAVPACK="$(usex wavpack)" ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { diff --git a/media-sound/qmmp/qmmp-1.3.4.ebuild b/media-sound/qmmp/qmmp-1.3.4.ebuild index 88c814b238e..b403c47023b 100644 --- a/media-sound/qmmp/qmmp-1.3.4.ebuild +++ b/media-sound/qmmp/qmmp-1.3.4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils xdg-utils +inherit cmake xdg-utils [[ ${PV} = 9999 ]] && inherit subversion DESCRIPTION="Qt5-based audio player with winamp/xmms skins support" @@ -103,7 +103,7 @@ src_prepare() { src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die fi - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -155,7 +155,7 @@ src_configure() { -DUSE_WAVPACK="$(usex wavpack)" ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { diff --git a/media-sound/qmmp/qmmp-1.3.5.ebuild b/media-sound/qmmp/qmmp-1.3.5.ebuild index 88c814b238e..b403c47023b 100644 --- a/media-sound/qmmp/qmmp-1.3.5.ebuild +++ b/media-sound/qmmp/qmmp-1.3.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils xdg-utils +inherit cmake xdg-utils [[ ${PV} = 9999 ]] && inherit subversion DESCRIPTION="Qt5-based audio player with winamp/xmms skins support" @@ -103,7 +103,7 @@ src_prepare() { src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die fi - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -155,7 +155,7 @@ src_configure() { -DUSE_WAVPACK="$(usex wavpack)" ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild index 88c814b238e..b403c47023b 100644 --- a/media-sound/qmmp/qmmp-9999.ebuild +++ b/media-sound/qmmp/qmmp-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils xdg-utils +inherit cmake xdg-utils [[ ${PV} = 9999 ]] && inherit subversion DESCRIPTION="Qt5-based audio player with winamp/xmms skins support" @@ -103,7 +103,7 @@ src_prepare() { src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die fi - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -155,7 +155,7 @@ src_configure() { -DUSE_WAVPACK="$(usex wavpack)" ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { diff --git a/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild index 4acbf0c9ea5..442d7fa9636 100644 --- a/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild +++ b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils xdg +inherit cmake xdg DESCRIPTION="Software synthesizer based on ZynAddSubFX" HOMEPAGE="https://yoshimi.github.io/"; @@ -38,7 +38,7 @@ PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch ) DOCS=( Changelog README.txt ) src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # respect doc dir sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die } @@ -47,5 +47,5 @@ src_configure() { local mycmakeargs=( -DLV2Plugin=$(usex lv2) ) - cmake-utils_src_configure + cmake_src_configure }
