Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libglvnd
Commits: 1272dd94 by Timo Aaltonen at 2019-12-12T08:46:34Z Update libglvnd0.symbols for arm64. - - - - - 8651ade8 by Timo Aaltonen at 2019-12-12T08:53:20Z fix-armv7-build.diff: Fix armel/armhf build. - - - - - d3cd7dbf by Timo Aaltonen at 2019-12-12T08:57:52Z releasing package libglvnd version 1.3.0-2 - - - - - 4 changed files: - debian/changelog - debian/libglvnd0.symbols - + debian/patches/fix-armv7-build.diff - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +libglvnd (1.3.0-2) experimental; urgency=medium + + * Update libglvnd0.symbols for arm64. + * fix-armv7-build.diff: Fix armel/armhf build. + + -- Timo Aaltonen <[email protected]> Thu, 12 Dec 2019 10:53:22 +0200 + libglvnd (1.3.0-1) experimental; urgency=medium * New upstream release. (Closes: #930514) (LP: #1816004) ===================================== debian/libglvnd0.symbols ===================================== @@ -16,4 +16,4 @@ libGLdispatch.so.0 libglvnd0 #MINVER# __glDispatchUnregisterStubCallbacks@Base 0 _glapi_Current@Base 0 _glapi_get_current@Base 0 - (arch=!arm64)_glapi_tls_Current@Base 0 + _glapi_tls_Current@Base 0 ===================================== debian/patches/fix-armv7-build.diff ===================================== @@ -0,0 +1,31 @@ +commit 9ccdb05cdd620c4ae9454010f419d7d11c0efcdc +Author: Kyle Brenneman <[email protected]> +Date: Fri Dec 6 07:22:40 2019 -0700 + + meson: Fix the armv7 build. + + Fix the GLdispatch meson file so that it checks for the value "armv7_tsd" for + gl_dispatch_type instead of "arm_tsd". + +diff --git a/src/GLdispatch/vnd-glapi/meson.build b/src/GLdispatch/vnd-glapi/meson.build +index c5319fc..ce20178 100644 +--- a/src/GLdispatch/vnd-glapi/meson.build ++++ b/src/GLdispatch/vnd-glapi/meson.build +@@ -39,7 +39,7 @@ if gl_dispatch_type == 'pure_c' + _entry_files += 'entry_pure_c.c' + else + _entry_files += 'entry_common.c' +- if gl_dispatch_type != 'arm_tsd' ++ if gl_dispatch_type != 'armv7_tsd' + _entry_files += 'entry_simple_asm.c' + endif + if gl_dispatch_type == 'x86_tls' +@@ -50,7 +50,7 @@ else + _entry_files += 'entry_x86_64_tls.c' + elif gl_dispatch_type == 'x86_64_tsd' + _entry_files += 'entry_x86_64_tsd.c' +- elif gl_dispatch_type == 'arm_tsd' ++ elif gl_dispatch_type == 'armv7_tsd' + _entry_files += 'entry_armv7_tsd.c' + elif gl_dispatch_type == 'aarch64_tsd' + _entry_files += 'entry_aarch64_tsd.c' ===================================== debian/patches/series ===================================== @@ -1 +1 @@ -# placeholder +fix-armv7-build.diff View it on GitLab: https://salsa.debian.org/xorg-team/lib/libglvnd/compare/f3a61c7886d5e5ef74ad8c12fb15e3dfff337c9d...d3cd7dbf7cf62158e4976bc64dd1fae5d00f42f1 -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/libglvnd/compare/f3a61c7886d5e5ef74ad8c12fb15e3dfff337c9d...d3cd7dbf7cf62158e4976bc64dd1fae5d00f42f1 You're receiving this email because of your account on salsa.debian.org.
