[Buildroot] [PATCH 1/2] package/x11r7/libepoxy: Fix OpenGL / EGL dependencies
Bernd Kuhls
bernd.kuhls at t-online.de
Sat May 2 14:07:09 UTC 2015
Also add the usual cflags for RPI and re-wrap the Config.in help text.
Fixes
http://autobuild.buildroot.net/results/596/596f44a26aad45c027f0f4f97d63e97a1f4fd001
Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
---
package/x11r7/libepoxy/Config.in | 8 ++++++--
package/x11r7/libepoxy/libepoxy.mk | 12 +++++++++++-
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/package/x11r7/libepoxy/Config.in b/package/x11r7/libepoxy/Config.in
index c4f5794..875ccc5 100644
--- a/package/x11r7/libepoxy/Config.in
+++ b/package/x11r7/libepoxy/Config.in
@@ -1,7 +1,11 @@
config BR2_PACKAGE_LIBEPOXY
bool "epoxy"
- depends on BR2_PACKAGE_MESA3D
+ 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 d908893..fc1ede4 100644
--- a/package/x11r7/libepoxy/libepoxy.mk
+++ b/package/x11r7/libepoxy/libepoxy.mk
@@ -8,8 +8,18 @@ LIBEPOXY_VERSION = v1.2
LIBEPOXY_SITE = $(call github,anholt,libepoxy,$(LIBEPOXY_VERSION))
LIBEPOXY_INSTALL_STAGING = YES
LIBEPOXY_AUTORECONF = YES
-LIBEPOXY_DEPENDENCIES = mesa3d
+LIBEPOXY_DEPENDENCIES = \
+ $(if $(BR2_PACKAGE_HAS_LIBEGL),libegl) \
+ $(if $(BR2_PACKAGE_HAS_LIBGL),libgl)
LIBEPOXY_LICENSE = MIT
LIBEPOXY_LICENSE_FILES = COPYING
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+LIBEPOXY_CONF_ENV = \
+ CFLAGS="$(TARGET_CFLAGS) \
+ -I$(STAGING_DIR)/usr/include/IL \
+ -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
+ -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"
+endif
+
$(eval $(autotools-package))
--
1.7.10.4
More information about the buildroot
mailing list