commit abe6a80412891cd9cfdb22a66a2b2a773fc4eb3b Author: Emmanuele Bassi Date: Sun Apr 30 16:36:25 2017 +0100 Release Epoxy 1.4.2 configure.ac | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 10c2cdfdb01405a983dbf3f6492134c898742892 Merge: 5b6d990 106eae7 Author: Emmanuele Bassi Date: Mon Apr 24 16:28:06 2017 +0100 Merge pull request #118 from LocutusOfBorg/master epoxy_internal_has_gl_extension, epoxy_egl_version: add some missing … commit 106eae7aad23dffcefe11ec3bf86e54e35137689 Author: Gianfranco Costamagna Date: Mon Apr 24 16:10:28 2017 +0200 epoxy_internal_has_gl_extension, epoxy_egl_version: add some missing nullpointer checks from https://bugzilla.redhat.com/show_bug.cgi?id=1395366 Related commit: b3b8bd9af7bf1fcfe544fd131f4d4f0d117ae7bc Fix "epoxy_glx_version" to handle the case when GLX is not active on the display. Patch is tweak from the original version posted by Tom Horsley src/dispatch_common.c | 9 ++++++++- src/dispatch_egl.c | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) commit 5b6d99069b3fa0d4e12ee617b144a51312bcea79 Author: Emmanuele Bassi Date: Wed Mar 29 18:24:25 2017 +0100 Put the no-GLX build under CI CI is pointless if we don't test all the possible combinations. .travis.yml | 1 + 1 file changed, 1 insertion(+) commit 91b4e75c6540d85efc2dc115b7915bae7bfd8bdf Author: Emmanuele Bassi Date: Wed Mar 29 18:22:37 2017 +0100 Restructure the TravisCI script The script should only run the tests; the base Docker image pull, as well as the CI image build, should be performed in the preparation stage. .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) commit e59cc63273f138fa7a2473dfb34dd1984d29e555 Author: Emmanuele Bassi Date: Wed Mar 29 18:20:18 2017 +0100 Build Epoxy with Clang on TravisCI We can test both GCC and Clang, so we can ensure Epoxy builds correctly with either. .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 3289910b9747c24aedd98f68c3bb2c1ddb27f119 Merge: 3f932ae 60b3449 Author: Emmanuele Bassi Date: Tue Mar 28 18:15:09 2017 +0100 Merge pull request #116 from ebassi/no-source-root Remove uses of meson.source_root() commit 60b34493e947df86761fb8a9420fbd547a8e5e7c Author: Emmanuele Bassi Date: Tue Mar 28 10:18:31 2017 +0100 Bump up the version of Meson used by AppVeyor We need a newer version to build Epoxy under CI. .appveyor.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) commit 2dafa2f1d3c86ed36ee727994022f61eb8c697d0 Author: Emmanuele Bassi Date: Tue Mar 28 10:08:56 2017 +0100 Move epoxy_headers definition into include/epoxy In order to properly depend on headers, both generated and provided, in a separate directory, we need to refer to them using their path. Generated headers already have their full path; for provided ones, we can simply use the `files()` directive. This change should allow using libepoxy as a Meson subproject. Fixes: #115 include/epoxy/meson.build | 2 ++ src/meson.build | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) commit 0dfe8403dd5d84e7fc4a444e6cc471e715bd8544 Author: Emmanuele Bassi Date: Tue Mar 28 10:06:29 2017 +0100 Remove workarounds for older Meson versions Removing the files() statement allows us to not use source_root(), which breaks using libepoxy as a sub-project. Using the python3 module is better for Windows portability. meson.build | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) commit 9e7af6e1f568341586f6012a47199c641fb16567 Author: Emmanuele Bassi Date: Tue Mar 28 10:05:29 2017 +0100 Bump up the required version of Meson We are going to need a more recent version of Meson to fix some warts in the build. meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 3f932aeb2f635157788c9cbcda280f2ca808c725 Merge: ab10a79 c39f161 Author: Emmanuele Bassi Date: Sun Mar 19 09:56:48 2017 +0000 Merge pull request #112 from accel2k/fix-msvc-build Fix build on MSVC commit ab10a7996ba593c6527051dca11502dd33a17f4b Merge: f7d3671 ef1bb66 Author: Emmanuele Bassi Date: Sun Mar 19 09:56:06 2017 +0000 Merge pull request #114 from Millak/master test: Fix dlwrap on aarch64 commit ef1bb66402032c90a06beb22b444e93f0e0cf39f Author: Efraim Flashner Date: Sun Mar 19 11:01:42 2017 +0200 test: Fix dlwrap on aarch64 dlsym on aarch64 has version GLIBC_2.17. test/dlwrap.c | 1 + 1 file changed, 1 insertion(+) commit c39f16102ed1b22ad796e2416bb60792b9aa5571 Author: Andrei Fadeev Date: Wed Mar 15 09:13:34 2017 +0300 Fix build on MSVC The inline keyword is available only for C++ in MSVC. So we need to use Microsoft specific __inline. meson.build | 8 ++++++++ 1 file changed, 8 insertions(+) commit f7d3671a0fcad0f5371ce60916394e0269c5cee3 Author: Emmanuele Bassi Date: Thu Mar 9 21:28:52 2017 +0000 Prefer using pkg-config files to find GLES Just like we do for GL and EGL, we can use pkg-config to find the GLES v2 and v1 dependencies. Fixes: #110 meson.build | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) commit 4719e586c0f92fa7546fa954115b92d2ae9aee9f Author: Emmanuele Bassi Date: Thu Mar 9 21:21:09 2017 +0000 Add missing visibility compiler flags We have been building the shared library for Epoxy without the symbol visibility flags for the compiler, which means we've been leaking internal symbols all over the floor. Fixes: #111 meson.build | 10 ++++++---- src/meson.build | 4 +--- 2 files changed, 7 insertions(+), 7 deletions(-) commit fef61ab6bedc551245582f4286ff326ceb63a264 Merge: f19f943 bfd99a9 Author: Emmanuele Bassi Date: Tue Mar 7 15:37:09 2017 +0000 Merge pull request #109 from anholt/macos-version-info Add explicit version flags for macOS builds commit bfd99a94218275361fc3b207e397e93042a0b1b1 Author: Emmanuele Bassi Date: Tue Mar 7 15:32:43 2017 +0000 Use some linker flags only on Linux Using GCC is not a guarantee of also having access to the Linux linker; just like we use specific linker flags on macOS, the symbolic and relro linker flags are pretty much Linux specific. src/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit d0a1a4e6767da8a2455b8822446978b35813161d Author: Emmanuele Bassi Date: Tue Mar 7 11:52:26 2017 +0000 Add explicit version flags for macOS builds Autotools automatically adds version related linker flags on macOS that are not related to the version information. Since we want to maintain binary compatibility, we should do the same when building on macOS. Fixes: #108 src/meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) commit f19f943a6699d771ef85402998a56743d6dfa3d9 Author: Emmanuele Bassi Date: Fri Mar 3 16:58:46 2017 +0000 Add z,relro and z,now to the GCC linker flags These flags are mitigations against memory corruption bugs, and are typically enabled by Linux distributions hardening rules. We only use these flags with GCC, similarly to `-Bsymbolic`. More information on relro is available here: - http://tk-blog.blogspot.co.uk/2009/02/relro-not-so-well-known-memory.html - http://mudongliang.github.io/2016/07/11/relro-a-not-so-well-known-memory-corruption-mitigation-technique.html - https://wiki.debian.org/Hardening#DEB_BUILD_HARDENING_RELRO_.28ld_-z_relro.29 src/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit 7d58fd3d47d2d69f2b1b9f08325302e4eeff9ebe Merge: 5564f9d 3fb4fea Author: Emmanuele Bassi Date: Fri Mar 3 14:52:59 2017 +0000 Merge pull request #107 from anholt/issue-106 Add C++ guards around generated headers commit 3fb4fea6743c660401b78f1f08afda731d32192e Author: Emmanuele Bassi Date: Fri Mar 3 14:41:15 2017 +0000 Add C++ guards around generated headers Commit 0625a74d69f762df8d411bc0451927424aee1f2c moved the C++ guards after the inclusion of the generated headers, which was an unintended behavioural change and now requires header guards around the inclusion of Epoxy headers. Fixes: #106 include/epoxy/egl.h | 4 ++-- include/epoxy/gl.h | 4 ++-- include/epoxy/glx.h | 4 ++-- include/epoxy/wgl.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)