summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2024-04-18 13:03:58 -0400
committerMatt Turner <mattst88@gentoo.org>2024-04-18 13:58:09 -0400
commitee10f04c52f6035be1f878cc99cf20633ca7d588 (patch)
tree445f5b51cb450ee6a6eddf8670560a32c8fb4f11 /gui-libs/libdecor
parentnet-wireless/bluez: drop 5.73 (diff)
downloadgentoo-ee10f04c52f6035be1f878cc99cf20633ca7d588.tar.gz
gentoo-ee10f04c52f6035be1f878cc99cf20633ca7d588.tar.bz2
gentoo-ee10f04c52f6035be1f878cc99cf20633ca7d588.zip
gui-libs/libdecor: Add multilib support
Needed by x11-apps/mesa-progs. Bug: https://bugs.gentoo.org/894156 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'gui-libs/libdecor')
-rw-r--r--gui-libs/libdecor/libdecor-0.2.2-r1.ebuild (renamed from gui-libs/libdecor/libdecor-0.2.2.ebuild)16
-rw-r--r--gui-libs/libdecor/libdecor-9999.ebuild16
2 files changed, 16 insertions, 16 deletions
diff --git a/gui-libs/libdecor/libdecor-0.2.2.ebuild b/gui-libs/libdecor/libdecor-0.2.2-r1.ebuild
index 2d21ad63368e..c868676829a1 100644
--- a/gui-libs/libdecor/libdecor-0.2.2.ebuild
+++ b/gui-libs/libdecor/libdecor-0.2.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit meson
+inherit meson-multilib
DESCRIPTION="A client-side decorations library for Wayland clients"
HOMEPAGE="https://gitlab.freedesktop.org/libdecor/libdecor"
@@ -19,11 +19,11 @@ SLOT="0"
IUSE="+dbus +gtk examples"
RDEPEND="
- >=dev-libs/wayland-1.18
- x11-libs/pango
- x11-libs/cairo
- dbus? ( sys-apps/dbus )
- gtk? ( x11-libs/gtk+:3 )
+ >=dev-libs/wayland-1.18[${MULTILIB_USEDEP}]
+ x11-libs/pango[${MULTILIB_USEDEP}]
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ gtk? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
examples? (
media-libs/libglvnd
x11-libs/libxkbcommon
@@ -40,13 +40,13 @@ BDEPEND="
virtual/pkgconfig
"
-src_configure() {
+multilib_src_configure() {
local emesonargs=(
# Avoid auto-magic, built-in feature of meson
-Dauto_features=disabled
$(meson_feature gtk)
$(meson_feature dbus)
- $(meson_use examples demo)
+ $(meson_native_use_bool examples demo)
-Dinstall_demo=true
)
diff --git a/gui-libs/libdecor/libdecor-9999.ebuild b/gui-libs/libdecor/libdecor-9999.ebuild
index 2d21ad63368e..c868676829a1 100644
--- a/gui-libs/libdecor/libdecor-9999.ebuild
+++ b/gui-libs/libdecor/libdecor-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit meson
+inherit meson-multilib
DESCRIPTION="A client-side decorations library for Wayland clients"
HOMEPAGE="https://gitlab.freedesktop.org/libdecor/libdecor"
@@ -19,11 +19,11 @@ SLOT="0"
IUSE="+dbus +gtk examples"
RDEPEND="
- >=dev-libs/wayland-1.18
- x11-libs/pango
- x11-libs/cairo
- dbus? ( sys-apps/dbus )
- gtk? ( x11-libs/gtk+:3 )
+ >=dev-libs/wayland-1.18[${MULTILIB_USEDEP}]
+ x11-libs/pango[${MULTILIB_USEDEP}]
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ gtk? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
examples? (
media-libs/libglvnd
x11-libs/libxkbcommon
@@ -40,13 +40,13 @@ BDEPEND="
virtual/pkgconfig
"
-src_configure() {
+multilib_src_configure() {
local emesonargs=(
# Avoid auto-magic, built-in feature of meson
-Dauto_features=disabled
$(meson_feature gtk)
$(meson_feature dbus)
- $(meson_use examples demo)
+ $(meson_native_use_bool examples demo)
-Dinstall_demo=true
)