c84bc94593
Merge pull request #262 from seungha-yang/win-non-eng-locale
...
meson: Fix for building on non-English locale
3 years ago
1c51cfbbe1
Merge pull request #261 from arichardson/custom-prefix-build-fix
...
Fix build if EGL/X11 headers are in a custom prefix
3 years ago
9bf4788455
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.
3 years ago
8db879f810
Merge pull request #263 from caolanm/fix_libreoffice_android_build
...
fix error: use of undeclared identifier 'OPENGL_LIB'
3 years ago
063c1df279
fix error: use of undeclared identifier 'OPENGL_LIB'
...
at epoxy/src/dispatch_common.c:690 in LibreOffice android build with
libepoxy-1.5.9
3 years ago
a07b9b3383
meson: Fix for building on non-English locale
...
Specify utf-8 encoding to fix building on non-English locale
3 years ago
71dcab0cc9
Post-release version bump to 1.5.10
3 years ago
ecfa8e0f08
Merge pull request #257 from batesj/allow_libopengl
...
Allow libopengl.so to be used when GLX_LIB is missing
3 years ago
7975061f6b
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 <emil.velikov@collabora.com>
4 years ago
ad723a7a75
Post-release version bump to 1.5.9
4 years ago
2a1665c632
Merge pull request #254 from anholt/issue-252
...
Revert OpenGL/GLX loading changes
4 years ago
622ca393c3
Revert "If glvnd library found, do not use libGL.so in epoxy_load_gl"
...
Commit dbfa4b20dbfa4b209c#252
4 years ago
c2148eb019
Revert "Do not overwrite glx_handle in epoxy_load_gl if GLX library is loaded already"
...
This reverts commit 4994c48172
4 years ago
0dd0e0a272
Post-release version bump to 1.5.8
4 years ago
f9e76359cf
Merge pull request #250 from anholt/ebassi/issues-249
...
Remove redeclaration of khronos_uintptr_t
4 years ago
1403303e77
Remove redeclaration of khronos_uintptr_t
...
The type is being redeclared because I didn't see the original
declaration when I wrote 144cbc9325Fixes : #249
4 years ago
e271edbc3b
Post-release version bump to 1.5.7
4 years ago
0a304d1a25
Merge pull request #247 from anholt/win64-khr-types
...
Support Win64 pointer-sized types
4 years ago
54f645b077
Merge pull request #243 from amezin/master
...
gen_dispatch.py: close output files
4 years ago
144cbc9325
Support Win64 pointer-sized types
...
Since we're generating stub types from khrplatform.h because we can't
include it reliably, we'll have to deal with some of the fallout of the
Win64 types.
Fixes : #246
4 years ago
d0b319e27b
gen_dispatch.py: close output files
...
Fixes https://github.com/anholt/libepoxy/issues/242
4 years ago
de08cf3479
Merge pull request #238 from anholt/pull-229-alt
...
Fix some bugs in loading OpenGL/GLX/EGL libraries
4 years ago
7ec320d1db
Merge pull request #231 from xclaesse/meson-vars
...
meson: Set same variables in declare_dependency() as in pkgconfig
4 years ago
950b9f5b25
meson: Set same variables in declare_dependency() as in pkgconfig
...
GTK currently fails to detect if epoxy has been built with EGL on
Windows when epoxy is a subproject. To fix that it needs to get that
information from the dependency variables.
This requires Meson >=0.54.0 for setting variables in
declare_dependency().
4 years ago
4994c48172
Do not overwrite glx_handle in epoxy_load_gl if GLX library is loaded already
...
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
4 years ago
dbfa4b209c
If glvnd library found, do not use libGL.so in epoxy_load_gl
...
Without additional check, even if libOpenGL was loaded, libGL.so will
be loaded as well, and used both in gl_handle and glx_handle, so
libglvnd libraries will not be used.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Emmanuele Bassi <ebassi@gnome.org>
4 years ago
c797320424
Merge pull request #236 from anholt/ebassi/ci-split
...
ci: Split Linux and macOS pipelines
4 years ago
1878042c03
Add a badge for the project license
4 years ago
c37b42432b
Update the CI status badges
...
Use the badges from GitHub Actions.
4 years ago
642330e86f
ci: Split Linux and macOS pipelines
...
Don't use a single pipeline for everything.
4 years ago
03b9b4692c
Merge pull request #235 from anholt/github-ci
...
Move CI to GitHub
4 years ago
4c686ff5e3
ci: Drop tests from MSYS2 pipeline
...
The WGL tests are failing, likely because of some set up issue; for the
time being, we care more about building Epoxy, rather than testing it.
4 years ago
3e35bb8688
ci: Remove AppVeyor pipeline
...
We have MSYS2 and MSVC pipelines on GitHub Actions.
4 years ago
599847dfd6
ci: Remove Travis
...
The GitHub Actions pipeline replaces Travis in any way it matters.
4 years ago
14ab6c6bb8
ci: Use scripts for GitHub Actions
...
Do not share them with the Travis pipelines.
4 years ago
c4520d0a72
ci: Add MSVC workflow on GitHub Actions
4 years ago
4822fc167d
ci: Add MSYS2 workflow on GitHub Actions
4 years ago
ef4dbfa740
Post-release version bump to 1.5.6
4 years ago
34ecb908b0
Merge pull request #228 from eyelash/github-ci
...
GitHub CI
4 years ago
23f4049183
Merge pull request #225 from anholt/darwin_versions
...
Use the darwin_versions argument
4 years ago
1a2784a9c5
GitHub CI
4 years ago
f91fb0a0b6
Use Meson's darwin_versions argument
...
Instead of tweaking the linker flags ourselves. This allows Meson to do
the right thing, and pass the arguments only where needed.
4 years ago
d9dd5e7fd9
Require Meson >= 0.48
4 years ago
a191887406
Merge pull request #223 from anholt/glsles
...
Fix return value of shading language for GLES2.
5 years ago
1e0b063dbd
Fix return value of shading language for GLES2.
...
Throughout the mesa project we've been using 100 for GLES2's shading
language. It was pretty clearly the intent here, but the clever
inline detection of "am I parsing a GLSL version or a GL version
string" forgot about GLSL 1.0.x, and thus returned 10.
5 years ago
4e26d4dcfa
Merge pull request #220 from crziter/master
...
Add call convention to mock function
5 years ago
81d758d025
Add call convention to mock function
5 years ago
dcb0f31ce4
Merge pull request #215 from anholt/issue-214
...
Use EGL_NO_X11 to disable X11 headers
5 years ago
6b09a8bc48
Use EGL_NO_X11 to disable X11 headers
...
MESA_EGL_NO_X11_HEADERS has been deprecated, and libglvnd only supports
EGL_NO_X11.
Fixes : #214
5 years ago
68371fb802
Merge pull request #216 from anholt/gen-find-program
...
build: Use find_program()
5 years ago
Emmanuele Bassi
Alex Richardson
Caolán McNamara
Seungha Yang
Emmanuele Bassi
John Bates
Aleksandr
Xavier Claessens
Yaroslav Isakov
Elias Aebi
Eric Anholt
crziter