Skip to contentSkip to conversation

package/x11r7/libepoxy: bump version to 1.3.1, fix OpenGL / EGL dependencies

PATCH New Bernd Kuhls 3 participants 6 messages Aug 1, 2015 – Aug 29, 2015

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH v3 1/2 package/x11r7/libepoxy: bump version to 1.3.1, fix OpenGL / EGL dependencies

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 <[email protected]>

---
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 |  8 ++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)
package/x11r7/libepoxy/Config.in +8 -2
index c4f5794..5628bf7 100644
@@ -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
package/x11r7/libepoxy/libepoxy.mk +6 -2
index d908893..26d90f3 100644
@@ -4,12 +4,16 @@
 #
 ################################################################################
 
-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 = 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`
+
 $(eval $(autotools-package))
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH v2 2/2 package/x11r7/xserver_xorg-server: Fix glamor dependency

X.org xserver depends on libepoxy for glamor support, which depends on EGL support. Mesa3d is not the only possible EGL provider therefore change the dependency check.

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: rebased

 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +1 -1
index 79d663c..8f4b3f8 100644
@@ -195,7 +195,7 @@ endif
 ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3
-ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
+ifeq ($(BR2_PACKAGE_LIBEPOXY),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += libepoxy
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-glamor
 endif
Signature · 1 line
2.1.4
Applied
#2 lore raw

PATCH v2 2/2 package/x11r7/xserver_xorg-server: Fix glamor dependency

Dear Bernd Kuhls,

Quoted 7 lines · Bernd Kuhls

X.org xserver depends on libepoxy for glamor support, which depends on EGL support. Mesa3d is not the only possible EGL provider therefore change the dependency check.

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: rebased

Applied to master, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH v3 1/2 package/x11r7/libepoxy: bump version to 1.3.1, fix OpenGL / EGL dependencies

In reply to Bernd Kuhls

Bernd, All,

On 2015-08-01 18:07 +0200, Bernd Kuhls spake thusly:

Quoted 7 lines

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 <[email protected]>

I was not able to test this, because there is a build failure earlier in the stack.

Given this defconfig:

    BR2_TOOLCHAIN_EXTERNAL=y
    BR2_PACKAGE_MESA3D=y
    BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU=y
    BR2_PACKAGE_MESA3D_OPENGL_EGL=y
    BR2_PACKAGE_MESA3D_OPENGL_ES=y
    BR2_PACKAGE_XORG7=y
    BR2_PACKAGE_LIBEPOXY=y

And running:
make libepoxy-depends

I get the following build failure:
configure: WARNING: Neither DRI nor Xlib-GLX enabled, disabling GLX checking for LIBDRM... yes
checking for LIBUDEV... no
configure: error: gbm requires --enable-dri

I'm not very at ease with the Xorg/GL stacks... Care to have a look, please?

Regards,
Yann E. MORIN.

Quoted 58 lines

---
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 |  8 ++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)
package/x11r7/libepoxy/Config.in +8 -2
index c4f5794..5628bf7 100644
@@ -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
package/x11r7/libepoxy/libepoxy.mk +6 -2
index d908893..26d90f3 100644
@@ -4,12 +4,16 @@
 #
 ################################################################################
 
-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 = 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`
+
 $(eval $(autotools-package))
Signature · 6 lines
2.1.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH v3 1/2 package/x11r7/libepoxy: bump version to 1.3.1, fix OpenGL / EGL dependencies

In reply to Bernd Kuhls

Dear Bernd Kuhls,

Quoted 7 lines · Bernd Kuhls

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 <[email protected]>

Could you separate the libepoxy bump from the OpenGL/EGL dependency fix? We're past -rc1, so I can apply fixes, but not version bumps.

Also, could you get back to Yann E. Morin who asked some questions about this patch?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#5 lore raw

PATCH v3 1/2 package/x11r7/libepoxy: bump version to 1.3.1, fix OpenGL / EGL dependencies

Hi Thomas,

Am Thu, 06 Aug 2015 09:01:35 +0200 schrieb Thomas Petazzoni:

Quoted 7 lines

Dear Bernd Kuhls,

Quoted 4 lines · Bernd Kuhls

libepoxy depends on egl, opengl is an optional dependency

Fixes
http://autobuild.buildroot.net/results/f7e/

f7e6a42f53cb4ca523d2eeefde85c44770f6011e

Quoted 1 line
Quoted 1 line

http://autobuild.buildroot.net/

results/025/025a3d3b4d3dd4f496dcbf09f2dd279116250207

Quoted 6 lines
Quoted 3 lines

Signed-off-by: Bernd Kuhls
<[email protected]>

Could you separate the libepoxy bump from the OpenGL/EGL dependency fix? We're past -rc1, so I can apply fixes, but not version bumps.

done: http://patchwork.ozlabs.org/patch/505222/

Quoted 2 lines

Also, could you get back to Yann E. Morin who asked some questions about this patch?

The problem mentioned by Yann is fixed by
http://patchwork.ozlabs.org/patch/502988/

This patch ( http://patchwork.ozlabs.org/patch/502832/ ), which should be applied after the two patches mentioned here, opens up glamor support in X.org xserver for other libegl providers.

The glamor capability depends on libepoxy & dri3 support, enabling glamor needs knowledge about these facts atm. What about adding a Kconfig option to package/x11r7/xserver_xorg-server/Config.in like BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX?

Regards, Bernd