Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib /
libepoxy
Commits:
0dd0e0a2 by Emmanuele Bassi at 2021-04-30T13:17:59+01:00
Post-release version bump to 1.5.8
- - - - -
c2148eb0 by Emmanuele Bassi at 2021-05-21T15:35:35+01:00
Revert "Do not overwrite glx_handle in epoxy_load_gl if GLX library is
loaded already"
This reverts commit 4994c48172e94ca81c000597e0abc0ea0e682b3c.
- - - - -
622ca393 by Emmanuele Bassi at 2021-05-21T15:35:41+01:00
Revert "If glvnd library found, do not use libGL.so in epoxy_load_gl"
Commit dbfa4b20 has introduced a string of regressions in the X server
and KWin.
This reverts commit dbfa4b209c0712b67dfeb8366c2ebe8503063b52.
See: #252
- - - - -
2a1665c6 by Emmanuele Bassi at 2021-05-21T16:51:50+01:00
Merge pull request #254 from anholt/issue-252
Revert OpenGL/GLX loading changes
- - - - -
2 changed files:
- meson.build
- src/dispatch_common.c
Changes:
=====================================
meson.build
=====================================
@@ -1,4 +1,4 @@
-project('libepoxy', 'c', version: '1.5.7',
+project('libepoxy', 'c', version: '1.5.8',
default_options: [
'buildtype=debugoptimized',
'c_std=gnu99',
=====================================
src/dispatch_common.c
=====================================
@@ -674,13 +674,9 @@ epoxy_load_gl(void)
if (!api.gl_handle)
get_dlopen_handle(&api.gl_handle, OPENGL_LIB, false, true);
#endif
- if (!api.gl_handle) {
- get_dlopen_handle(&api.gl_handle, GLX_LIB, true, true);
-#if PLATFORM_HAS_GLX
- if (!api.glx_handle)
- api.glx_handle = api.gl_handle;
-#endif
- }
+
+ get_dlopen_handle(&api.glx_handle, GLX_LIB, true, true);
+ api.gl_handle = api.glx_handle;
#endif
}
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/libepoxy/-/compare/f9e76359cf7da5fde70440361ffad5e9c8aee36b...2a1665c632d47c2c73f4e8e1d2f2db62b26682d2
--
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/libepoxy/-/compare/f9e76359cf7da5fde70440361ffad5e9c8aee36b...2a1665c632d47c2c73f4e8e1d2f2db62b26682d2
You're receiving this email because of your account on salsa.debian.org.
