From c665208f06384f7a6a32a44c610a0750803e28c2 Mon Sep 17 00:00:00 2001 From: Hill Ma Date: Sun, 11 Apr 2021 15:11:56 -0700 Subject: [PATCH 1/2] mesa: separate out libgbm-devel. --- srcpkgs/libgbm-devel | 1 + srcpkgs/mesa/template | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/libgbm-devel diff --git a/srcpkgs/libgbm-devel b/srcpkgs/libgbm-devel new file mode 120000 index 000000000000..1ad1bbec7ab3 --- /dev/null +++ b/srcpkgs/libgbm-devel @@ -0,0 +1 @@ +mesa \ No newline at end of file diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 267419298baa..ac42418f48a0 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -30,7 +30,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then fi # Set subpackages manually to set proper rdeps in 32bit pkgs. -subpackages="libglapi libgbm libOSMesa" +subpackages="libglapi libgbm libgbm-devel libOSMesa" # Replace old mesa pkgs, superseded by libglvnd. replaces="libGL>=10_1<19.2.5_2 libEGL>=10_1<19.2.5_2 libGLES>=10_1<19.2.5_2" @@ -228,6 +228,16 @@ libgbm_package() { } } +libgbm-devel_package() { + short_desc="Mesa Generic buffer management API - development files" + depends="libgbm>=${version}_${revision}" + pkg_install() { + vmove usr/include/gbm.h + vmove usr/lib/libgbm.so + vmove usr/lib/pkgconfig/gbm.pc + } +} + libOSMesa_package() { short_desc="Mesa Off-Screen interface library" pkg_install() { @@ -239,7 +249,7 @@ MesaLib-devel_package() { depends="xorgproto libxshmfence-devel libXext-devel libXxf86vm-devel libXdamage-devel expat-devel libXfixes-devel libX11-devel libxcb-devel libdrm-devel libglvnd-devel - libOSMesa>=${version}_${revision} libgbm>=${version}_${revision} + libOSMesa>=${version}_${revision} libgbm-devel>=${version}_${revision} mesa>=${version}_${revision}" if [ "$_have_vmware" ]; then depends+=" libxatracker>=${version}_${revision}" @@ -254,7 +264,6 @@ MesaLib-devel_package() { vmove usr/lib/libEGL_mesa.so vmove usr/lib/libGLX_mesa.so vmove usr/lib/libOSMesa.so - vmove usr/lib/libgbm.so vmove usr/lib/libglapi.so if [ "$_have_vmware" ]; then vmove usr/lib/libxatracker.so From 0ae4d9d0164a2c2849cef82cfb5c6c91f4e883a6 Mon Sep 17 00:00:00 2001 From: Hill Ma Date: Thu, 15 Apr 2021 19:44:16 -0700 Subject: [PATCH 2/2] wlroots: replace MesaLib-devel with libgbm-devel and libglvnd-devel. --- srcpkgs/wlroots/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template index fd3a4b0b5aae..f2e0618e8b27 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -8,7 +8,7 @@ build_style=meson configure_args="--auto-features=enabled -Dlogind=disabled -Dexamples=false -Dwerror=false -Db_ndebug=false" hostmakedepends="pkg-config wayland-devel" -_devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel +_devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel" makedepends="${_devel_depends}