Timo Aaltonen pushed to branch debian-experimental at X Strike Force / lib /
mesa
Commits:
ccde12fc by Timo Aaltonen at 2019-07-01T13:08:04Z
rules, libgles2-mesa-dev.install: Re-add the pkgconfig file for now. (Closes:
#930514)
- - - - -
5 changed files:
- debian/changelog
- debian/libgles2-mesa-dev.install
- + debian/patches/Revert-meson-don-t-build-libGLES-.so-with-GLVND.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -5,6 +5,8 @@ mesa (19.1.1-1) UNRELEASED; urgency=medium
#930879)
* control, rules: Enable vulkan-overlay, add glslang-tools to build-depends.
(Closes: #930945)
+ * rules, libgles2-mesa-dev.install: Re-add the pkgconfig file for now.
+ (Closes: #930514)
-- Timo Aaltonen <[email protected]> Thu, 27 Jun 2019 10:41:51 +0300
=====================================
debian/libgles2-mesa-dev.install
=====================================
@@ -1,2 +1,3 @@
usr/include/GLES2
usr/include/GLES3
+usr/lib/*/pkgconfig/glesv2.pc
=====================================
debian/patches/Revert-meson-don-t-build-libGLES-.so-with-GLVND.patch
=====================================
@@ -0,0 +1,34 @@
+From 11ed91495759f0f86c0eb6a9d799d8ce31bbffc3 Mon Sep 17 00:00:00 2001
+From: Timo Aaltonen <[email protected]>
+Date: Mon, 1 Jul 2019 15:57:47 +0300
+Subject: [PATCH] Revert "meson: don't build libGLES*.so with GLVND"
+
+This reverts commit b01524fff05eef66e8cd24f1c5aacefed4209f03.
+---
+ src/mapi/meson.build | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/src/mapi/meson.build b/src/mapi/meson.build
+index 2c79a04f1df..c2dbbf02f08 100644
+--- a/src/mapi/meson.build
++++ b/src/mapi/meson.build
+@@ -35,11 +35,9 @@ if with_shared_glapi
+ else
+ libglapi = []
+ endif
+-if not with_glvnd
+- if with_gles1
+- subdir('es1api')
+- endif
+- if with_gles2
+- subdir('es2api')
+- endif
++if with_gles1
++ subdir('es1api')
++endif
++if with_gles2
++ subdir('es2api')
+ endif
+--
+2.20.1
+
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
07_gallium-fix-build-failure-on-powerpcspe.diff
+Revert-meson-don-t-build-libGLES-.so-with-GLVND.patch
=====================================
debian/rules
=====================================
@@ -196,6 +196,9 @@ override_dh_install:
rm debian/tmp/usr/lib/*/libEGL_mesa.so
rm debian/tmp/usr/lib/*/libGLX_mesa.so
+ # we only need the pkgconfig file
+ rm debian/tmp/usr/lib/*/libGLESv2*
+
# Copy the hardlinked *_dri.so correctly.
install -m755 -d
debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so \
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/mesa/commit/ccde12fcf86badd9cb5e1535f8d57d97775f93d7
--
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/mesa/commit/ccde12fcf86badd9cb5e1535f8d57d97775f93d7
You're receiving this email because of your account on salsa.debian.org.
