commit: f289ef1637cab9d0418ec99549e82bf8e8855a49
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 21 06:21:46 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 21 06:21:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f289ef16
media-libs/openal: use cmake-multilib.eclass more idiomatically
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/openal/openal-1.22.2-r1.ebuild | 64 +++++++++++++++----------------
1 file changed, 30 insertions(+), 34 deletions(-)
diff --git a/media-libs/openal/openal-1.22.2-r1.ebuild
b/media-libs/openal/openal-1.22.2-r1.ebuild
index 787199b78e60..68c7bc35d077 100644
--- a/media-libs/openal/openal-1.22.2-r1.ebuild
+++ b/media-libs/openal/openal-1.22.2-r1.ebuild
@@ -51,41 +51,37 @@ DEPEND="
DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
-src_configure() {
- my_configure() {
- local mycmakeargs=(
- # See bug #809314 for getting both options for backends
- -DALSOFT_{BACKEND,REQUIRE}_ALSA=$(usex alsa)
- -DALSOFT_{BACKEND,REQUIRE}_COREAUDIO=$(usex coreaudio)
- -DALSOFT_{BACKEND,REQUIRE}_JACK=$(usex jack)
- -DALSOFT_{BACKEND,REQUIRE}_OSS=$(usex oss)
- -DALSOFT_{BACKEND,REQUIRE}_PIPEWIRE=$(usex pipewire)
- -DALSOFT_{BACKEND,REQUIRE}_PORTAUDIO=$(usex portaudio)
- -DALSOFT_{BACKEND,REQUIRE}_PULSEAUDIO=$(usex pulseaudio)
- -DALSOFT_{BACKEND,REQUIRE}_SDL2=$(usex sdl)
- -DALSOFT_{BACKEND,REQUIRE}_SNDIO=$(usex sndio)
+multilib_src_configure() {
+ local mycmakeargs=(
+ # See bug #809314 for getting both options for backends
+ -DALSOFT_{BACKEND,REQUIRE}_ALSA=$(usex alsa)
+ -DALSOFT_{BACKEND,REQUIRE}_COREAUDIO=$(usex coreaudio)
+ -DALSOFT_{BACKEND,REQUIRE}_JACK=$(usex jack)
+ -DALSOFT_{BACKEND,REQUIRE}_OSS=$(usex oss)
+ -DALSOFT_{BACKEND,REQUIRE}_PIPEWIRE=$(usex pipewire)
+ -DALSOFT_{BACKEND,REQUIRE}_PORTAUDIO=$(usex portaudio)
+ -DALSOFT_{BACKEND,REQUIRE}_PULSEAUDIO=$(usex pulseaudio)
+ -DALSOFT_{BACKEND,REQUIRE}_SDL2=$(usex sdl)
+ -DALSOFT_{BACKEND,REQUIRE}_SNDIO=$(usex sndio)
- -DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" ||
echo "OFF")
- -DALSOFT_NO_CONFIG_UTIL=$(usex qt5
"$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
- # EXAMPLES=OFF to avoid FFmpeg dependency, bug #481670
- -DALSOFT_EXAMPLES=OFF
- )
-
- # Avoid unused variable warnings, bug #738240
- if use amd64 || use x86 ; then
- mycmakeargs+=(
- -DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
- -DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
- -DALSOFT_CPUEXT_SSE4_1=$(usex
cpu_flags_x86_sse4_1)
- )
- elif use arm || use arm64 ; then
- mycmakeargs+=(
- -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon)
- )
- fi
+ -DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo
"OFF")
+ -DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi &&
echo "OFF" || echo "ON")" ON)
+ # EXAMPLES=OFF to avoid FFmpeg dependency, bug #481670
+ -DALSOFT_EXAMPLES=OFF
+ )
- cmake_src_configure
- }
+ # Avoid unused variable warnings, bug #738240
+ if use amd64 || use x86 ; then
+ mycmakeargs+=(
+ -DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
+ -DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
+ -DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+ )
+ elif use arm || use arm64 ; then
+ mycmakeargs+=(
+ -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon)
+ )
+ fi
- multilib_parallel_foreach_abi my_configure
+ cmake_src_configure
}
