[gentoo-commits] repo/gentoo:master commit in: x11-libs/libdrm/

[Matt Turner]

commit:     30999e7f1fa9228ab77deac93a3ecb7888129e01
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 01:31:54 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun  4 01:14:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30999e7f

x11-libs/libdrm: Switch to meson-multilib

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

 x11-libs/libdrm/libdrm-2.4.106.ebuild | 38 ++++++++++++-----------------------
 x11-libs/libdrm/libdrm-9999.ebuild    | 38 ++++++++++++-----------------------
 2 files changed, 26 insertions(+), 50 deletions(-)

diff --git a/x11-libs/libdrm/libdrm-2.4.106.ebuild 
b/x11-libs/libdrm/libdrm-2.4.106.ebuild
index 370a65ea93c..f603cf78370 100644
--- a/x11-libs/libdrm/libdrm-2.4.106.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.106.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
        GIT_ECLASS="git-r3"
 fi
 
-inherit ${GIT_ECLASS} meson multilib-minimal
+inherit ${GIT_ECLASS} meson-multilib
 
 DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm";
@@ -40,32 +40,20 @@ multilib_src_configure() {
                # Udev is only used by tests now.
                -Dudev=false
                -Dcairo-tests=false
-               -Damdgpu=$(usex video_cards_amdgpu true false)
-               -Dexynos=$(usex video_cards_exynos true false)
-               -Dfreedreno=$(usex video_cards_freedreno true false)
-               -Dintel=$(usex video_cards_intel true false)
-               -Dnouveau=$(usex video_cards_nouveau true false)
-               -Domap=$(usex video_cards_omap true false)
-               -Dradeon=$(usex video_cards_radeon true false)
-               -Dtegra=$(usex video_cards_tegra true false)
-               -Dvc4=$(usex video_cards_vc4 true false)
-               -Detnaviv=$(usex video_cards_vivante true false)
-               -Dvmwgfx=$(usex video_cards_vmware true false)
-               -Dlibkms=$(usex libkms true false)
+               $(meson_use video_cards_amdgpu amdgpu)
+               $(meson_use video_cards_exynos exynos)
+               $(meson_use video_cards_freedreno freedreno)
+               $(meson_use video_cards_intel intel)
+               $(meson_use video_cards_nouveau nouveau)
+               $(meson_use video_cards_omap omap)
+               $(meson_use video_cards_radeon radeon)
+               $(meson_use video_cards_tegra tegra)
+               $(meson_use video_cards_vc4 vc4)
+               $(meson_use video_cards_vivante etnaviv)
+               $(meson_use video_cards_vmware vmwgfx)
+               $(meson_use libkms)
                # valgrind installs its .pc file to the pkgconfig for the 
primary arch
                -Dvalgrind=$(usex valgrind auto false)
        )
        meson_src_configure
 }
-
-multilib_src_compile() {
-       meson_src_compile
-}
-
-multilib_src_test() {
-       meson_src_test
-}
-
-multilib_src_install() {
-       meson_src_install
-}

diff --git a/x11-libs/libdrm/libdrm-9999.ebuild 
b/x11-libs/libdrm/libdrm-9999.ebuild
index 370a65ea93c..f603cf78370 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
        GIT_ECLASS="git-r3"
 fi
 
-inherit ${GIT_ECLASS} meson multilib-minimal
+inherit ${GIT_ECLASS} meson-multilib
 
 DESCRIPTION="X.Org libdrm library"
 HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm";
@@ -40,32 +40,20 @@ multilib_src_configure() {
                # Udev is only used by tests now.
                -Dudev=false
                -Dcairo-tests=false
-               -Damdgpu=$(usex video_cards_amdgpu true false)
-               -Dexynos=$(usex video_cards_exynos true false)
-               -Dfreedreno=$(usex video_cards_freedreno true false)
-               -Dintel=$(usex video_cards_intel true false)
-               -Dnouveau=$(usex video_cards_nouveau true false)
-               -Domap=$(usex video_cards_omap true false)
-               -Dradeon=$(usex video_cards_radeon true false)
-               -Dtegra=$(usex video_cards_tegra true false)
-               -Dvc4=$(usex video_cards_vc4 true false)
-               -Detnaviv=$(usex video_cards_vivante true false)
-               -Dvmwgfx=$(usex video_cards_vmware true false)
-               -Dlibkms=$(usex libkms true false)
+               $(meson_use video_cards_amdgpu amdgpu)
+               $(meson_use video_cards_exynos exynos)
+               $(meson_use video_cards_freedreno freedreno)
+               $(meson_use video_cards_intel intel)
+               $(meson_use video_cards_nouveau nouveau)
+               $(meson_use video_cards_omap omap)
+               $(meson_use video_cards_radeon radeon)
+               $(meson_use video_cards_tegra tegra)
+               $(meson_use video_cards_vc4 vc4)
+               $(meson_use video_cards_vivante etnaviv)
+               $(meson_use video_cards_vmware vmwgfx)
+               $(meson_use libkms)
                # valgrind installs its .pc file to the pkgconfig for the 
primary arch
                -Dvalgrind=$(usex valgrind auto false)
        )
        meson_src_configure
 }
-
-multilib_src_compile() {
-       meson_src_compile
-}
-
-multilib_src_test() {
-       meson_src_test
-}
-
-multilib_src_install() {
-       meson_src_install
-}