Timo Aaltonen pushed to branch upstream-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 - - - - - 2 changed files: - meson.build - src/dispatch_common.c Changes: ===================================== 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/2a1665c632d47c2c73f4e8e1d2f2db62b26682d2...ecfa8e0f083084181d36966fa084aca9a6c97d53 -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/libepoxy/-/compare/2a1665c632d47c2c73f4e8e1d2f2db62b26682d2...ecfa8e0f083084181d36966fa084aca9a6c97d53 You're receiving this email because of your account on salsa.debian.org.
