media-video/pipewire: Switch to meson-multilib

Signed-off-by: Matt Turner <mattst88@gentoo.org>

3 files changed, 54 insertions, 102 deletions

diff --git a/media-video/pipewire/pipewire-0.3.27-r1.ebuild b/media-video/pipewire/pipewire-0.3.27-r1.ebuild
index c833b6f88796..b9a57b1c6cf2 100644
--- a/media-video/pipewire/pipewire-0.3.27-r1.ebuild
+++ b/media-video/pipewire/pipewire-0.3.27-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit meson optfeature udev multilib-minimal
+inherit meson-multilib optfeature udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
@@ -103,18 +103,6 @@ PATCHES=(
 # with changes as necessary.
 limitsdfile=40-${PN}.conf
 
-meson_native_enabled() {
-	if multilib_is_native_abi; then
-		echo "-D${1}=enabled"
-	else
-		echo "-D${1}=disabled"
-	fi
-}
-
-meson_native_feature() {
-	multilib_native_usex "${1}" "-D${2-${1}}=enabled" "-D${2-${1}}=disabled"
-}
-
 src_prepare() {
 	default
 
@@ -137,60 +125,56 @@ src_prepare() {
 multilib_src_configure() {
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_feature doc docs)
+		$(meson_native_use_feature doc docs)
 		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
 		$(meson_native_enabled media-session)
 		$(meson_native_enabled man)
 		$(meson_feature test tests)
 		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_feature gstreamer)
-		$(meson_native_feature gstreamer gstreamer-device-provider)
-		$(meson_native_feature systemd)
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
 		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_feature systemd systemd-user-service)
+		$(meson_native_use_feature systemd systemd-user-service)
 		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
 		-Dspa-plugins=enabled
 		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
 		-Daudiomixer=enabled # Matches upstream
 		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_feature bluetooth bluez5)
-		$(meson_native_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_feature aac bluez5-codec-aac)
-		$(meson_native_feature aptx bluez5-codec-aptx)
-		$(meson_native_feature ldac bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature aac bluez5-codec-aac)
+		$(meson_native_use_feature aptx bluez5-codec-aptx)
+		$(meson_native_use_feature ldac bluez5-codec-ldac)
 		-Dcontrol=enabled # Matches upstream
 		-Daudiotestsrc=enabled # Matches upstream
 		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
 		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
 		$(meson_feature jack-sdk jack-devel)
 		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
 		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
 		-Devl=disabled # Matches upstream
 		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_feature v4l v4l2)
+		$(meson_native_use_feature v4l v4l2)
 		-Dlibcamera=disabled # libcamera is not in Portage tree
 		-Dvideoconvert=enabled # Matches upstream
 		-Dvideotestsrc=enabled # Matches upstream
 		-Dvolume=enabled # Matches upstream
 		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_feature extra pw-cat)
+		$(meson_native_use_feature extra pw-cat)
 		-Dudev=enabled
 		-Dudevrulesdir="$(get_udevdir)/rules.d"
 		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
 	)
 
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_install() {
 	# Our customs DOCS do not exist in multilib source directory
 	DOCS= meson_src_install
diff --git a/media-video/pipewire/pipewire-0.3.28.ebuild b/media-video/pipewire/pipewire-0.3.28.ebuild
index 9568402650e6..fdecb4169d00 100644
--- a/media-video/pipewire/pipewire-0.3.28.ebuild
+++ b/media-video/pipewire/pipewire-0.3.28.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit meson optfeature udev multilib-minimal
+inherit meson-multilib optfeature udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
@@ -104,18 +104,6 @@ PATCHES=(
 # with changes as necessary.
 limitsdfile=40-${PN}.conf
 
-meson_native_enabled() {
-	if multilib_is_native_abi; then
-		echo "-D${1}=enabled"
-	else
-		echo "-D${1}=disabled"
-	fi
-}
-
-meson_native_feature() {
-	multilib_native_usex "${1}" "-D${2-${1}}=enabled" "-D${2-${1}}=disabled"
-}
-
 src_prepare() {
 	default
 
@@ -138,60 +126,56 @@ src_prepare() {
 multilib_src_configure() {
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_feature doc docs)
+		$(meson_native_use_feature doc docs)
 		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
 		$(meson_native_enabled media-session)
 		$(meson_native_enabled man)
 		$(meson_feature test tests)
 		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_feature gstreamer)
-		$(meson_native_feature gstreamer gstreamer-device-provider)
-		$(meson_native_feature systemd)
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
 		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_feature systemd systemd-user-service)
+		$(meson_native_use_feature systemd systemd-user-service)
 		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
 		-Dspa-plugins=enabled
 		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
 		-Daudiomixer=enabled # Matches upstream
 		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_feature bluetooth bluez5)
-		$(meson_native_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_feature aac bluez5-codec-aac)
-		$(meson_native_feature aptx bluez5-codec-aptx)
-		$(meson_native_feature ldac bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature aac bluez5-codec-aac)
+		$(meson_native_use_feature aptx bluez5-codec-aptx)
+		$(meson_native_use_feature ldac bluez5-codec-ldac)
 		-Dcontrol=enabled # Matches upstream
 		-Daudiotestsrc=enabled # Matches upstream
 		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
 		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
 		$(meson_feature jack-sdk jack-devel)
 		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
 		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
 		-Devl=disabled # Matches upstream
 		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_feature v4l v4l2)
+		$(meson_native_use_feature v4l v4l2)
 		-Dlibcamera=disabled # libcamera is not in Portage tree
 		-Dvideoconvert=enabled # Matches upstream
 		-Dvideotestsrc=enabled # Matches upstream
 		-Dvolume=enabled # Matches upstream
 		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_feature extra pw-cat)
+		$(meson_native_use_feature extra pw-cat)
 		-Dudev=enabled
 		-Dudevrulesdir="$(get_udevdir)/rules.d"
 		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
 	)
 
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_install() {
 	# Our customs DOCS do not exist in multilib source directory
 	DOCS= meson_src_install
diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild
index 9568402650e6..fdecb4169d00 100644
--- a/media-video/pipewire/pipewire-9999.ebuild
+++ b/media-video/pipewire/pipewire-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit meson optfeature udev multilib-minimal
+inherit meson-multilib optfeature udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
@@ -104,18 +104,6 @@ PATCHES=(
 # with changes as necessary.
 limitsdfile=40-${PN}.conf
 
-meson_native_enabled() {
-	if multilib_is_native_abi; then
-		echo "-D${1}=enabled"
-	else
-		echo "-D${1}=disabled"
-	fi
-}
-
-meson_native_feature() {
-	multilib_native_usex "${1}" "-D${2-${1}}=enabled" "-D${2-${1}}=disabled"
-}
-
 src_prepare() {
 	default
 
@@ -138,60 +126,56 @@ src_prepare() {
 multilib_src_configure() {
 	local emesonargs=(
 		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(meson_native_feature doc docs)
+		$(meson_native_use_feature doc docs)
 		$(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session
 		$(meson_native_enabled media-session)
 		$(meson_native_enabled man)
 		$(meson_feature test tests)
 		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_feature gstreamer)
-		$(meson_native_feature gstreamer gstreamer-device-provider)
-		$(meson_native_feature systemd)
+		$(meson_native_use_feature gstreamer)
+		$(meson_native_use_feature gstreamer gstreamer-device-provider)
+		$(meson_native_use_feature systemd)
 		-Dsystemd-system-service=disabled # Matches upstream
-		$(meson_native_feature systemd systemd-user-service)
+		$(meson_native_use_feature systemd systemd-user-service)
 		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
 		-Dspa-plugins=enabled
 		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this)
 		-Daudiomixer=enabled # Matches upstream
 		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_feature bluetooth bluez5)
-		$(meson_native_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_feature aac bluez5-codec-aac)
-		$(meson_native_feature aptx bluez5-codec-aptx)
-		$(meson_native_feature ldac bluez5-codec-ldac)
+		$(meson_native_use_feature bluetooth bluez5)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
+		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
+		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
+		$(meson_native_use_feature aac bluez5-codec-aac)
+		$(meson_native_use_feature aptx bluez5-codec-aptx)
+		$(meson_native_use_feature ldac bluez5-codec-ldac)
 		-Dcontrol=enabled # Matches upstream
 		-Daudiotestsrc=enabled # Matches upstream
 		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
 		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_feature jack-client jack) # Allows PW to act as a JACK client
+		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
 		$(meson_feature jack-sdk jack-devel)
 		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
 		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
 		-Devl=disabled # Matches upstream
 		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_feature v4l v4l2)
+		$(meson_native_use_feature v4l v4l2)
 		-Dlibcamera=disabled # libcamera is not in Portage tree
 		-Dvideoconvert=enabled # Matches upstream
 		-Dvideotestsrc=enabled # Matches upstream
 		-Dvolume=enabled # Matches upstream
 		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_feature extra pw-cat)
+		$(meson_native_use_feature extra pw-cat)
 		-Dudev=enabled
 		-Dudevrulesdir="$(get_udevdir)/rules.d"
 		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
+		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
 	)
 
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_install() {
 	# Our customs DOCS do not exist in multilib source directory
 	DOCS= meson_src_install