Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libepoxy
Commits: ad723a7a by Emmanuele Bassi at 2021-05-21T16:56:51+01:00 Post-release version bump to 1.5.9 - - - - - 7975061f by John Bates at 2021-07-02T11:57:17-07:00 Allow libopengl.so to be used when GLX_LIB is missing This maintains compatibility with previous behavior of always using GLX_LIB if it is found. The only change is when there is no GLX_LIB. Previous behavior when no GLX_LIB: - abort. New behavior when no GLX_LIB: - Try to load libOpenGL.so as gl_handle (glx_handle remains NULL). - Else, abort. Reviewed-by: Emil Velikov <[email protected]> - - - - - ecfa8e0f by Emmanuele Bassi at 2021-07-12T16:53:46+01:00 Merge pull request #257 from batesj/allow_libopengl Allow libopengl.so to be used when GLX_LIB is missing - - - - - 6d6f7128 by Timo Aaltonen at 2021-08-26T18:37:25+03:00 Merge branch 'upstream-unstable' into debian-unstable - - - - - 35f8c906 by Timo Aaltonen at 2021-08-26T18:37:52+03:00 bump the version - - - - - e21f5940 by Timo Aaltonen at 2021-08-26T18:38:15+03:00 Bump policy to 4.6.0. - - - - - dfe19100 by Timo Aaltonen at 2021-09-15T08:55:34+03:00 upload to sid - - - - - 4 changed files: - debian/changelog - debian/control - meson.build - src/dispatch_common.c Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +libepoxy (1.5.9-1) unstable; urgency=medium + + * New upstream release. + * Bump policy to 4.6.0. + + -- Timo Aaltonen <[email protected]> Wed, 15 Sep 2021 08:55:20 +0300 + libepoxy (1.5.8-1) unstable; urgency=medium * New upstream release. ===================================== debian/control ===================================== @@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13), libegl-dev, xauth <!nocheck>, xvfb <!nocheck> -Standards-Version: 4.5.1 +Standards-Version: 4.6.0 Section: libs Homepage: https://github.com/anholt/libepoxy Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libepoxy ===================================== meson.build ===================================== @@ -1,4 +1,4 @@ -project('libepoxy', 'c', version: '1.5.8', +project('libepoxy', 'c', version: '1.5.9', default_options: [ 'buildtype=debugoptimized', 'c_std=gnu99', ===================================== src/dispatch_common.c ===================================== @@ -670,13 +670,23 @@ epoxy_load_gl(void) get_dlopen_handle(&api.gl_handle, OPENGL_LIB, true, true); #else + // Prefer GLX_LIB over OPENGL_LIB to maintain existing behavior. + // Using the inverse ordering OPENGL_LIB -> GLX_LIB, causes issues such as: + // https://github.com/anholt/libepoxy/issues/240 (apitrace missing calls) + // https://github.com/anholt/libepoxy/issues/252 (Xorg boot crash) + get_dlopen_handle(&api.glx_handle, GLX_LIB, false, true); + api.gl_handle = api.glx_handle; + #if defined(OPENGL_LIB) if (!api.gl_handle) - get_dlopen_handle(&api.gl_handle, OPENGL_LIB, false, true); + get_dlopen_handle(&api.gl_handle, OPENGL_LIB, false, true); #endif - get_dlopen_handle(&api.glx_handle, GLX_LIB, true, true); - api.gl_handle = api.glx_handle; + if (!api.gl_handle) { + fprintf(stderr, "Couldn't open %s or %s\n", GLX_LIB, OPENGL_LIB); + abort(); + } + #endif } View it on GitLab: https://salsa.debian.org/xorg-team/lib/libepoxy/-/compare/af03c96e4aeae8b1e0c1ab701319141659c11e65...dfe19100aa4e8b5ea7397bb6dec972f44beec1cd -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/libepoxy/-/compare/af03c96e4aeae8b1e0c1ab701319141659c11e65...dfe19100aa4e8b5ea7397bb6dec972f44beec1cd You're receiving this email because of your account on salsa.debian.org.
