* [Buildroot] [PATCH v2/next 1/1] package/x11r7/libepoxy: bump to version 1.3.1
@ 2015-08-08 12:43 Bernd Kuhls
2015-08-08 12:43 ` [Buildroot] [PATCH v5 1/1] package/x11r7/libepoxy: fix OpenGL / EGL dependencies Bernd Kuhls
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Bernd Kuhls @ 2015-08-08 12:43 UTC (permalink / raw)
To: buildroot
Removed call to pkgconf because epoxy configure now uses pkgconf
itself to find egl headers:
https://github.com/anholt/libepoxy/commit/d56f21c494b315306215c4730835a9b291360e9b
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: Removed pkgconf to find rpi headers
package/x11r7/libepoxy/libepoxy.mk | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/package/x11r7/libepoxy/libepoxy.mk b/package/x11r7/libepoxy/libepoxy.mk
index 58b094a..12ddd03 100644
--- a/package/x11r7/libepoxy/libepoxy.mk
+++ b/package/x11r7/libepoxy/libepoxy.mk
@@ -4,17 +4,13 @@
#
################################################################################
-LIBEPOXY_VERSION = v1.2
+LIBEPOXY_VERSION = v1.3.1
LIBEPOXY_SITE = $(call github,anholt,libepoxy,$(LIBEPOXY_VERSION))
LIBEPOXY_INSTALL_STAGING = YES
LIBEPOXY_AUTORECONF = YES
LIBEPOXY_DEPENDENCIES = xlib_libX11 xutil_util-macros libegl \
- $(if $(BR2_PACKAGE_HAS_LIBGL),libgl)
+ $(if $(BR2_PACKAGE_HAS_LIBGL),libgl) host-pkgconf
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))
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v5 1/1] package/x11r7/libepoxy: fix OpenGL / EGL dependencies
2015-08-08 12:43 [Buildroot] [PATCH v2/next 1/1] package/x11r7/libepoxy: bump to version 1.3.1 Bernd Kuhls
@ 2015-08-08 12:43 ` Bernd Kuhls
2015-08-09 9:23 ` Thomas Petazzoni
2015-08-28 17:47 ` [Buildroot] [PATCH v2/next 1/1] package/x11r7/libepoxy: bump to version 1.3.1 Thomas Petazzoni
2015-12-19 13:23 ` Thomas Petazzoni
2 siblings, 1 reply; 5+ messages in thread
From: Bernd Kuhls @ 2015-08-08 12:43 UTC (permalink / raw)
To: buildroot
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>
---
v5: Fix CFLAGS and SoB (Thomas)
v4: split opengl/egl fix from version bump (Thomas)
v3: bumped to v1.3.1, switched to pkgconf for rpi support
v2: Add missing select lines to Config.in (Thomas)
package/x11r7/libepoxy/Config.in | 10 ++++++++--
package/x11r7/libepoxy/libepoxy.mk | 7 ++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/package/x11r7/libepoxy/Config.in b/package/x11r7/libepoxy/Config.in
index c4f5794..5628bf7 100644
--- 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 d908893..58b094a 100644
--- 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))
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v5 1/1] package/x11r7/libepoxy: fix OpenGL / EGL dependencies
2015-08-08 12:43 ` [Buildroot] [PATCH v5 1/1] package/x11r7/libepoxy: fix OpenGL / EGL dependencies Bernd Kuhls
@ 2015-08-09 9:23 ` Thomas Petazzoni
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2015-08-09 9:23 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Sat, 8 Aug 2015 14:43:18 +0200, Bernd Kuhls wrote:
> 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>
> ---
> v5: Fix CFLAGS and SoB (Thomas)
> v4: split opengl/egl fix from version bump (Thomas)
> v3: bumped to v1.3.1, switched to pkgconf for rpi support
> v2: Add missing select lines to Config.in (Thomas)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2/next 1/1] package/x11r7/libepoxy: bump to version 1.3.1
2015-08-08 12:43 [Buildroot] [PATCH v2/next 1/1] package/x11r7/libepoxy: bump to version 1.3.1 Bernd Kuhls
2015-08-08 12:43 ` [Buildroot] [PATCH v5 1/1] package/x11r7/libepoxy: fix OpenGL / EGL dependencies Bernd Kuhls
@ 2015-08-28 17:47 ` Thomas Petazzoni
2015-12-19 13:23 ` Thomas Petazzoni
2 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2015-08-28 17:47 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Sat, 8 Aug 2015 14:43:17 +0200, Bernd Kuhls wrote:
> Removed call to pkgconf because epoxy configure now uses pkgconf
> itself to find egl headers:
> https://github.com/anholt/libepoxy/commit/d56f21c494b315306215c4730835a9b291360e9b
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: Removed pkgconf to find rpi headers
>
> package/x11r7/libepoxy/libepoxy.mk | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/package/x11r7/libepoxy/libepoxy.mk b/package/x11r7/libepoxy/libepoxy.mk
> index 58b094a..12ddd03 100644
> --- a/package/x11r7/libepoxy/libepoxy.mk
> +++ b/package/x11r7/libepoxy/libepoxy.mk
> @@ -4,17 +4,13 @@
> #
> ################################################################################
>
> -LIBEPOXY_VERSION = v1.2
> +LIBEPOXY_VERSION = v1.3.1
> LIBEPOXY_SITE = $(call github,anholt,libepoxy,$(LIBEPOXY_VERSION))
> LIBEPOXY_INSTALL_STAGING = YES
> LIBEPOXY_AUTORECONF = YES
> LIBEPOXY_DEPENDENCIES = xlib_libX11 xutil_util-macros libegl \
> - $(if $(BR2_PACKAGE_HAS_LIBGL),libgl)
> + $(if $(BR2_PACKAGE_HAS_LIBGL),libgl) host-pkgconf
> 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))
This patch currently doesn't apply on next, because next has been
branched before your other libepoxy fixes have been merged. So I will
wait for next to be merged back in master before applying this patch.
This should happen soon, since we're approaching the end of August.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2/next 1/1] package/x11r7/libepoxy: bump to version 1.3.1
2015-08-08 12:43 [Buildroot] [PATCH v2/next 1/1] package/x11r7/libepoxy: bump to version 1.3.1 Bernd Kuhls
2015-08-08 12:43 ` [Buildroot] [PATCH v5 1/1] package/x11r7/libepoxy: fix OpenGL / EGL dependencies Bernd Kuhls
2015-08-28 17:47 ` [Buildroot] [PATCH v2/next 1/1] package/x11r7/libepoxy: bump to version 1.3.1 Thomas Petazzoni
@ 2015-12-19 13:23 ` Thomas Petazzoni
2 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2015-12-19 13:23 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Sat, 8 Aug 2015 14:43:17 +0200, Bernd Kuhls wrote:
> Removed call to pkgconf because epoxy configure now uses pkgconf
> itself to find egl headers:
> https://github.com/anholt/libepoxy/commit/d56f21c494b315306215c4730835a9b291360e9b
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: Removed pkgconf to find rpi headers
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-12-19 13:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-08 12:43 [Buildroot] [PATCH v2/next 1/1] package/x11r7/libepoxy: bump to version 1.3.1 Bernd Kuhls
2015-08-08 12:43 ` [Buildroot] [PATCH v5 1/1] package/x11r7/libepoxy: fix OpenGL / EGL dependencies Bernd Kuhls
2015-08-09 9:23 ` Thomas Petazzoni
2015-08-28 17:47 ` [Buildroot] [PATCH v2/next 1/1] package/x11r7/libepoxy: bump to version 1.3.1 Thomas Petazzoni
2015-12-19 13:23 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox