projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fdad2e5)
package/x11r7/libepoxy: fix OpenGL / EGL dependencies
authorBernd Kuhls <bernd.kuhls@t-online.de>
Sat, 8 Aug 2015 12:43:18 +0000 (14:43 +0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sun, 9 Aug 2015 09:23:07 +0000 (11:23 +0200)
libepoxy depends on egl, opengl is an optional dependency

Fixes
http://autobuild.buildroot.net/results/f7e/f7e6a42f53cb4ca523d2eeefde85c44770f6011e
http://autobuild.buildroot.net/results/025/025a3d3b4d3dd4f496dcbf09f2dd279116250207

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/x11r7/libepoxy/Config.in patch | blob | history
package/x11r7/libepoxy/libepoxy.mk patch | blob | history

diff --git a/package/x11r7/libepoxy/Config.in b/package/x11r7/libepoxy/Config.in
index c4f5794d23dd4cb58396f558ef88d485e27c8b0c..5628bf79da502f5c1bb3b12cc4372b772d59151f 100644 (file)
--- a/package/x11r7/libepoxy/Config.in
+++ b/package/x11r7/libepoxy/Config.in
@@ -1,7 +1,13 @@
 config BR2_PACKAGE_LIBEPOXY
        bool "epoxy"
-       depends on BR2_PACKAGE_MESA3D
+       select BR2_PACKAGE_XLIB_LIBX11
+       select BR2_PACKAGE_XUTIL_UTIL_MACROS
+       depends on BR2_PACKAGE_HAS_LIBEGL
        help
-         Epoxy is a library for handling OpenGL function pointer management for you.
+         Epoxy is a library for handling OpenGL function pointer
+         management for you.
 
          https://github.com/anholt/libepoxy
+
+comment "epoxy needs an OpenGL EGL backend"
+       depends on !BR2_PACKAGE_HAS_LIBEGL
diff --git a/package/x11r7/libepoxy/libepoxy.mk b/package/x11r7/libepoxy/libepoxy.mk
index d908893210f6ee9095cc0b4f81bc8f529ef8f6cf..58b094afd2b4d296bd56f381b11dd5865f6486b0 100644 (file)
--- a/package/x11r7/libepoxy/libepoxy.mk
+++ b/package/x11r7/libepoxy/libepoxy.mk
@@ -8,8 +8,13 @@ LIBEPOXY_VERSION = v1.2
 LIBEPOXY_SITE = $(call github,anholt,libepoxy,$(LIBEPOXY_VERSION))
 LIBEPOXY_INSTALL_STAGING = YES
 LIBEPOXY_AUTORECONF = YES
-LIBEPOXY_DEPENDENCIES = mesa3d
+LIBEPOXY_DEPENDENCIES = xlib_libX11 xutil_util-macros libegl \
+       $(if $(BR2_PACKAGE_HAS_LIBGL),libgl)
 LIBEPOXY_LICENSE = MIT
 LIBEPOXY_LICENSE_FILES = COPYING
 
+# needed for rpi-userland
+LIBEPOXY_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl`
+LIBEPOXY_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) $(LIBEPOXY_CFLAGS)"
+
 $(eval $(autotools-package))