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
-
7975061f
by John Bates at 2021-07-02T11:57:17-07:00
-
ecfa8e0f
by Emmanuele Bassi at 2021-07-12T16:53:46+01:00
-
6d6f7128
by Timo Aaltonen at 2021-08-26T18:37:25+03:00
-
35f8c906
by Timo Aaltonen at 2021-08-26T18:37:52+03:00
-
e21f5940
by Timo Aaltonen at 2021-08-26T18:38:15+03:00
-
dfe19100
by Timo Aaltonen at 2021-09-15T08:55:34+03:00
4 changed files:
Changes:
1 |
+libepoxy (1.5.9-1) unstable; urgency=medium
|
|
2 |
+ |
|
3 |
+ * New upstream release.
|
|
4 |
+ * Bump policy to 4.6.0.
|
|
5 |
+ |
|
6 |
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 15 Sep 2021 08:55:20 +0300
|
|
7 |
+ |
|
1 | 8 |
libepoxy (1.5.8-1) unstable; urgency=medium
|
2 | 9 |
|
3 | 10 |
* New upstream release.
|
... | ... | @@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13), |
9 | 9 |
libegl-dev,
|
10 | 10 |
xauth <!nocheck>,
|
11 | 11 |
xvfb <!nocheck>
|
12 |
-Standards-Version: 4.5.1
|
|
12 |
+Standards-Version: 4.6.0
|
|
13 | 13 |
Section: libs
|
14 | 14 |
Homepage: https://github.com/anholt/libepoxy
|
15 | 15 |
Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libepoxy
|
1 |
-project('libepoxy', 'c', version: '1.5.8',
|
|
1 |
+project('libepoxy', 'c', version: '1.5.9',
|
|
2 | 2 |
default_options: [
|
3 | 3 |
'buildtype=debugoptimized',
|
4 | 4 |
'c_std=gnu99',
|
... | ... | @@ -670,13 +670,23 @@ epoxy_load_gl(void) |
670 | 670 |
get_dlopen_handle(&api.gl_handle, OPENGL_LIB, true, true);
|
671 | 671 |
#else
|
672 | 672 |
|
673 |
+ // Prefer GLX_LIB over OPENGL_LIB to maintain existing behavior.
|
|
674 |
+ // Using the inverse ordering OPENGL_LIB -> GLX_LIB, causes issues such as:
|
|
675 |
+ // https://github.com/anholt/libepoxy/issues/240 (apitrace missing calls)
|
|
676 |
+ // https://github.com/anholt/libepoxy/issues/252 (Xorg boot crash)
|
|
677 |
+ get_dlopen_handle(&api.glx_handle, GLX_LIB, false, true);
|
|
678 |
+ api.gl_handle = api.glx_handle;
|
|
679 |
+ |
|
673 | 680 |
#if defined(OPENGL_LIB)
|
674 | 681 |
if (!api.gl_handle)
|
675 |
- get_dlopen_handle(&api.gl_handle, OPENGL_LIB, false, true);
|
|
682 |
+ get_dlopen_handle(&api.gl_handle, OPENGL_LIB, false, true);
|
|
676 | 683 |
#endif
|
677 | 684 |
|
678 |
- get_dlopen_handle(&api.glx_handle, GLX_LIB, true, true);
|
|
679 |
- api.gl_handle = api.glx_handle;
|
|
685 |
+ if (!api.gl_handle) {
|
|
686 |
+ fprintf(stderr, "Couldn't open %s or %s\n", GLX_LIB, OPENGL_LIB);
|
|
687 |
+ abort();
|
|
688 |
+ }
|
|
689 |
+ |
|
680 | 690 |
#endif
|
681 | 691 |
}
|
682 | 692 |
|