Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libglvnd
Commits:
-
1272dd94
by Timo Aaltonen at 2019-12-12T08:46:34Z
-
8651ade8
by Timo Aaltonen at 2019-12-12T08:53:20Z
-
d3cd7dbf
by Timo Aaltonen at 2019-12-12T08:57:52Z
4 changed files:
- debian/changelog
- debian/libglvnd0.symbols
- + debian/patches/fix-armv7-build.diff
- debian/patches/series
Changes:
1 |
+libglvnd (1.3.0-2) experimental; urgency=medium
|
|
2 |
+ |
|
3 |
+ * Update libglvnd0.symbols for arm64.
|
|
4 |
+ * fix-armv7-build.diff: Fix armel/armhf build.
|
|
5 |
+ |
|
6 |
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 12 Dec 2019 10:53:22 +0200
|
|
7 |
+ |
|
1 | 8 |
libglvnd (1.3.0-1) experimental; urgency=medium
|
2 | 9 |
|
3 | 10 |
* New upstream release. (Closes: #930514) (LP: #1816004)
|
... | ... | @@ -16,4 +16,4 @@ libGLdispatch.so.0 libglvnd0 #MINVER# |
16 | 16 |
__glDispatchUnregisterStubCallbacks@Base 0
|
17 | 17 |
_glapi_Current@Base 0
|
18 | 18 |
_glapi_get_current@Base 0
|
19 |
- (arch=!arm64)_glapi_tls_Current@Base 0
|
|
19 |
+ _glapi_tls_Current@Base 0
|
1 |
+commit 9ccdb05cdd620c4ae9454010f419d7d11c0efcdc
|
|
2 |
+Author: Kyle Brenneman <kbrenneman@nvidia.com>
|
|
3 |
+Date: Fri Dec 6 07:22:40 2019 -0700
|
|
4 |
+ |
|
5 |
+ meson: Fix the armv7 build.
|
|
6 |
+
|
|
7 |
+ Fix the GLdispatch meson file so that it checks for the value "armv7_tsd" for
|
|
8 |
+ gl_dispatch_type instead of "arm_tsd".
|
|
9 |
+ |
|
10 |
+diff --git a/src/GLdispatch/vnd-glapi/meson.build b/src/GLdispatch/vnd-glapi/meson.build
|
|
11 |
+index c5319fc..ce20178 100644
|
|
12 |
+--- a/src/GLdispatch/vnd-glapi/meson.build
|
|
13 |
++++ b/src/GLdispatch/vnd-glapi/meson.build
|
|
14 |
+@@ -39,7 +39,7 @@ if gl_dispatch_type == 'pure_c'
|
|
15 |
+ _entry_files += 'entry_pure_c.c'
|
|
16 |
+ else
|
|
17 |
+ _entry_files += 'entry_common.c'
|
|
18 |
+- if gl_dispatch_type != 'arm_tsd'
|
|
19 |
++ if gl_dispatch_type != 'armv7_tsd'
|
|
20 |
+ _entry_files += 'entry_simple_asm.c'
|
|
21 |
+ endif
|
|
22 |
+ if gl_dispatch_type == 'x86_tls'
|
|
23 |
+@@ -50,7 +50,7 @@ else
|
|
24 |
+ _entry_files += 'entry_x86_64_tls.c'
|
|
25 |
+ elif gl_dispatch_type == 'x86_64_tsd'
|
|
26 |
+ _entry_files += 'entry_x86_64_tsd.c'
|
|
27 |
+- elif gl_dispatch_type == 'arm_tsd'
|
|
28 |
++ elif gl_dispatch_type == 'armv7_tsd'
|
|
29 |
+ _entry_files += 'entry_armv7_tsd.c'
|
|
30 |
+ elif gl_dispatch_type == 'aarch64_tsd'
|
|
31 |
+ _entry_files += 'entry_aarch64_tsd.c'
|
1 |
-# placeholder
|
|
1 |
+fix-armv7-build.diff
|