Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib /
libepoxy
Commits:
71dcab0c by Emmanuele Bassi at 2021-08-14T14:56:42+01:00
Post-release version bump to 1.5.10
- - - - -
a07b9b33 by Seungha Yang at 2021-10-12T02:41:41+09:00
meson: Fix for building on non-English locale
Specify utf-8 encoding to fix building on non-English locale
- - - - -
063c1df2 by Caolán McNamara at 2021-10-20T11:09:09+01:00
fix error: use of undeclared identifier 'OPENGL_LIB'
at epoxy/src/dispatch_common.c:690 in LibreOffice android build with
libepoxy-1.5.9
- - - - -
8db879f8 by Emmanuele Bassi at 2021-10-25T17:55:28+01:00
Merge pull request #263 from caolanm/fix_libreoffice_android_build
fix error: use of undeclared identifier 'OPENGL_LIB'
- - - - -
9bf47884 by Alex Richardson at 2022-02-16T19:37:01+00:00
Add the right include paths for EGL and X11 headers
Libepoxy currently depends on all headers living under the same prefix.
This is not necessarily true: X11 headers can live in a separate prefix,
for instance under /opt/X11. This is also the case when cross-compiling to
a platform that sets up the build environment in non-standard ways.
We could add `x11_dep` and `egl_dep` to the libepoxy target dependencies,
but that could potentially add spurious linker flags and cause libepoxy to
depend on libraries it will dlopen() during normal operations.
To avoid that case, we use a partial_dep() object from Meson, and we limit
the dependency to compiler flags and inclusion paths.
- - - - -
1c51cfbb by Emmanuele Bassi at 2022-02-17T12:55:36+00:00
Merge pull request #261 from arichardson/custom-prefix-build-fix
Fix build if EGL/X11 headers are in a custom prefix
- - - - -
c84bc945 by Emmanuele Bassi at 2022-02-17T12:56:12+00:00
Merge pull request #262 from seungha-yang/win-non-eng-locale
meson: Fix for building on non-English locale
- - - - -
3 changed files:
- meson.build
- src/dispatch_common.c
- src/meson.build
Changes:
=====================================
meson.build
=====================================
@@ -1,4 +1,4 @@
-project('libepoxy', 'c', version: '1.5.9',
+project('libepoxy', 'c', version: '1.5.10',
default_options: [
'buildtype=debugoptimized',
'c_std=gnu99',
@@ -95,6 +95,7 @@ if cc.get_id() == 'msvc'
'-we4053', # an expression of type void was used as an operand
'-we4071', # no function prototype given
'-we4819', # the file contains a character that cannot be represented in
the current code page
+ '/utf-8', # Set the input and exec encoding to utf-8, like is the default
with GCC
]
elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
test_cflags = [
@@ -165,9 +166,11 @@ endif
dl_dep = cc.find_library('dl', required: false)
gl_dep = dependency('gl', required: false)
egl_dep = dependency('egl', required: false)
+elg_headers_dep = egl_dep.partial_dependency(compile_args: true, includes:
true)
# Optional dependencies for tests
x11_dep = dependency('x11', required: false)
+x11_headers_dep = x11_dep.partial_dependency(compile_args: true, includes:
true)
# GLES v2 and v1 may have pkg-config files, courtesy of downstream
# packagers; let's check those first, and fall back to find_library()
=====================================
src/dispatch_common.c
=====================================
@@ -683,7 +683,11 @@ epoxy_load_gl(void)
#endif
if (!api.gl_handle) {
+#if defined(OPENGL_LIB)
fprintf(stderr, "Couldn't open %s or %s\n", GLX_LIB, OPENGL_LIB);
+#else
+ fprintf(stderr, "Couldn't open %s\n", GLX_LIB);
+#endif
abort();
}
=====================================
src/meson.build
=====================================
@@ -59,6 +59,12 @@ epoxy_deps = [ dl_dep, ]
if host_system == 'windows'
epoxy_deps += [ opengl32_dep, gdi32_dep ]
endif
+if enable_x11
+ epoxy_deps += [ x11_headers_dep, ]
+endif
+if build_egl
+ epoxy_deps += [ elg_headers_dep, ]
+endif
libepoxy = library(
'epoxy',
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/libepoxy/-/compare/ecfa8e0f083084181d36966fa084aca9a6c97d53...c84bc9459357a40e46e2fec0408d04fbdde2c973
--
View it on GitLab:
https://salsa.debian.org/xorg-team/lib/libepoxy/-/compare/ecfa8e0f083084181d36966fa084aca9a6c97d53...c84bc9459357a40e46e2fec0408d04fbdde2c973
You're receiving this email because of your account on salsa.debian.org.
