Timo Aaltonen pushed to branch debian-experimental at X Strike Force / lib / mesa
Commits:
-
ccde12fc
by Timo Aaltonen at 2019-07-01T13:08:04Z
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:
| ... | ... | @@ -5,6 +5,8 @@ mesa (19.1.1-1) UNRELEASED; urgency=medium |
| 5 | 5 |
#930879)
|
| 6 | 6 |
* control, rules: Enable vulkan-overlay, add glslang-tools to build-depends.
|
| 7 | 7 |
(Closes: #930945)
|
| 8 |
+ * rules, libgles2-mesa-dev.install: Re-add the pkgconfig file for now.
|
|
| 9 |
+ (Closes: #930514)
|
|
| 8 | 10 |
|
| 9 | 11 |
-- Timo Aaltonen <tjaalton@debian.org> Thu, 27 Jun 2019 10:41:51 +0300
|
| 10 | 12 |
|
| 1 | 1 |
usr/include/GLES2
|
| 2 | 2 |
usr/include/GLES3
|
| 3 |
+usr/lib/*/pkgconfig/glesv2.pc
|
| 1 |
+From 11ed91495759f0f86c0eb6a9d799d8ce31bbffc3 Mon Sep 17 00:00:00 2001
|
|
| 2 |
+From: Timo Aaltonen <tjaalton@debian.org>
|
|
| 3 |
+Date: Mon, 1 Jul 2019 15:57:47 +0300
|
|
| 4 |
+Subject: [PATCH] Revert "meson: don't build libGLES*.so with GLVND"
|
|
| 5 |
+ |
|
| 6 |
+This reverts commit b01524fff05eef66e8cd24f1c5aacefed4209f03.
|
|
| 7 |
+---
|
|
| 8 |
+ src/mapi/meson.build | 12 +++++-------
|
|
| 9 |
+ 1 file changed, 5 insertions(+), 7 deletions(-)
|
|
| 10 |
+ |
|
| 11 |
+diff --git a/src/mapi/meson.build b/src/mapi/meson.build
|
|
| 12 |
+index 2c79a04f1df..c2dbbf02f08 100644
|
|
| 13 |
+--- a/src/mapi/meson.build
|
|
| 14 |
++++ b/src/mapi/meson.build
|
|
| 15 |
+@@ -35,11 +35,9 @@ if with_shared_glapi
|
|
| 16 |
+ else
|
|
| 17 |
+ libglapi = []
|
|
| 18 |
+ endif
|
|
| 19 |
+-if not with_glvnd
|
|
| 20 |
+- if with_gles1
|
|
| 21 |
+- subdir('es1api')
|
|
| 22 |
+- endif
|
|
| 23 |
+- if with_gles2
|
|
| 24 |
+- subdir('es2api')
|
|
| 25 |
+- endif
|
|
| 26 |
++if with_gles1
|
|
| 27 |
++ subdir('es1api')
|
|
| 28 |
++endif
|
|
| 29 |
++if with_gles2
|
|
| 30 |
++ subdir('es2api')
|
|
| 31 |
+ endif
|
|
| 32 |
+--
|
|
| 33 |
+2.20.1
|
|
| 34 |
+ |
| 1 | 1 |
07_gallium-fix-build-failure-on-powerpcspe.diff
|
| 2 |
+Revert-meson-don-t-build-libGLES-.so-with-GLVND.patch
|
| ... | ... | @@ -196,6 +196,9 @@ override_dh_install: |
| 196 | 196 |
rm debian/tmp/usr/lib/*/libEGL_mesa.so
|
| 197 | 197 |
rm debian/tmp/usr/lib/*/libGLX_mesa.so
|
| 198 | 198 |
|
| 199 |
+ # we only need the pkgconfig file
|
|
| 200 |
+ rm debian/tmp/usr/lib/*/libGLESv2*
|
|
| 201 |
+ |
|
| 199 | 202 |
# Copy the hardlinked *_dri.so correctly.
|
| 200 | 203 |
install -m755 -d debian/libgl1-mesa-dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/
|
| 201 | 204 |
mv debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so \
|