diff options
| author | adam <adam> | 2015-11-19 11:46:33 +0000 |
|---|---|---|
| committer | adam <adam> | 2015-11-19 11:46:33 +0000 |
| commit | af1cf8efa33b1b23622b94ee9d24f72298afdb17 (patch) | |
| tree | d111f2760645bd3ddf314295edca27352a83f90d /graphics/libepoxy/patches | |
| parent | 0d20dd2bcd115d4f88886f5d48829f69bdd5b352 (diff) | |
| download | pkgsrc-af1cf8efa33b1b23622b94ee9d24f72298afdb17.tar.gz | |
Allow building on OS X without X11
Diffstat (limited to 'graphics/libepoxy/patches')
| -rw-r--r-- | graphics/libepoxy/patches/patch-configure.ac | 17 | ||||
| -rw-r--r-- | graphics/libepoxy/patches/patch-src_dispatch__common.h | 22 |
2 files changed, 21 insertions, 18 deletions
diff --git a/graphics/libepoxy/patches/patch-configure.ac b/graphics/libepoxy/patches/patch-configure.ac index cdb8a54eac1..6aab9fbd8d3 100644 --- a/graphics/libepoxy/patches/patch-configure.ac +++ b/graphics/libepoxy/patches/patch-configure.ac @@ -1,23 +1,16 @@ -$NetBSD: patch-configure.ac,v 1.3 2015/09/14 14:40:37 gdt Exp $ +$NetBSD: patch-configure.ac,v 1.4 2015/11/19 11:46:33 adam Exp $ Override EGL detection. - -Revert upstream's disabling of glx on Mac. See -https://github.com/anholt/libepoxy/commit/e3051481cc9f5b7b36b317aff1454ee16ea9cdb9 -for context. We require X11 anyway, and libepoxy without glx is -defective - in particular, gtk3+ fails to build. -Not yet reported upstream. +On Darwin, build GLX only for X11 configuration. --- configure.ac.orig 2015-07-15 23:46:36.000000000 +0000 +++ configure.ac -@@ -77,15 +77,16 @@ case $host_os in - AC_SUBST([LOG_COMPILER], [wine]) +@@ -78,14 +78,14 @@ case $host_os in ;; darwin*) -+ # TODO: explain why egl is forced off on Darwin build_egl=no - build_glx=no -+ build_glx=yes ++ build_glx=@BUILD_GLX@ build_wgl=no build_apple=yes has_znow=no @@ -25,7 +18,7 @@ Not yet reported upstream. ;; *) - build_egl=yes -+ build_egl=${PKGSRC_BUILD_EGL} ++ build_egl=@BUILD_EGL@ build_glx=yes build_wgl=no # On platforms with dlopen, we load everything dynamically and diff --git a/graphics/libepoxy/patches/patch-src_dispatch__common.h b/graphics/libepoxy/patches/patch-src_dispatch__common.h index 2f62f480eff..99b21bb0235 100644 --- a/graphics/libepoxy/patches/patch-src_dispatch__common.h +++ b/graphics/libepoxy/patches/patch-src_dispatch__common.h @@ -1,23 +1,33 @@ -$NetBSD: patch-src_dispatch__common.h,v 1.2 2015/09/14 14:40:37 gdt Exp $ +$NetBSD: patch-src_dispatch__common.h,v 1.3 2015/11/19 11:46:33 adam Exp $ -Override EGL detection. +Override EGL and GLX detection. --- src/dispatch_common.h.orig 2015-07-15 23:46:36.000000000 +0000 +++ src/dispatch_common.h -@@ -30,7 +30,7 @@ +@@ -22,6 +22,7 @@ + */ + + #include <stdbool.h> ++#include "config.h" + + #ifdef _WIN32 + #define PLATFORM_HAS_EGL 0 +@@ -30,7 +31,11 @@ #define EPOXY_IMPORTEXPORT __declspec(dllexport) #elif defined(__APPLE__) #define PLATFORM_HAS_EGL 0 --#define PLATFORM_HAS_GLX 0 ++#ifdef BUILD_GLX +#define PLATFORM_HAS_GLX 1 ++#else + #define PLATFORM_HAS_GLX 0 ++#endif #define PLATFORM_HAS_WGL 0 #define EPOXY_IMPORTEXPORT #elif defined(ANDROID) -@@ -39,7 +39,12 @@ +@@ -39,7 +44,11 @@ #define PLATFORM_HAS_WGL 0 #define EPOXY_IMPORTEXPORT #else -+#include "config.h" +#ifdef BUILD_EGL #define PLATFORM_HAS_EGL 1 +#else |