[Buildroot] [git commit] package/x11r7/xapp_xeyes: xrender is optional, not mandatory

Yann E. MORIN yann.morin.1998 at free.fr
Tue Sep 14 19:47:57 UTC 2021


commit: https://git.buildroot.net/buildroot/commit/?id=a2b0c9b5f98090d85a2cdf0362f2862f0251805d
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

xrender is optional, not mandatory since its addition in version 1.0.99:
https://gitlab.freedesktop.org/xorg/app/xeyes/-/commit/5e825a140f4022b88dd7a1a20a9a01b653f1a95c

Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
---
 package/x11r7/xapp_xeyes/Config.in     | 1 -
 package/x11r7/xapp_xeyes/xapp_xeyes.mk | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xapp_xeyes/Config.in b/package/x11r7/xapp_xeyes/Config.in
index 5cf7f6c052..a7b77375fd 100644
--- a/package/x11r7/xapp_xeyes/Config.in
+++ b/package/x11r7/xapp_xeyes/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_XAPP_XEYES
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XLIB_LIBXMU
-	select BR2_PACKAGE_XLIB_LIBXRENDER
 	select BR2_PACKAGE_XLIB_LIBXT
 	help
 	  X.Org xeyes application
diff --git a/package/x11r7/xapp_xeyes/xapp_xeyes.mk b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
index 11eea802d5..a127e28ea7 100644
--- a/package/x11r7/xapp_xeyes/xapp_xeyes.mk
+++ b/package/x11r7/xapp_xeyes/xapp_xeyes.mk
@@ -9,6 +9,13 @@ XAPP_XEYES_SOURCE = xeyes-$(XAPP_XEYES_VERSION).tar.bz2
 XAPP_XEYES_SITE = https://xorg.freedesktop.org/archive/individual/app
 XAPP_XEYES_LICENSE = MIT
 XAPP_XEYES_LICENSE_FILES = COPYING
-XAPP_XEYES_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu xlib_libXrender xlib_libXt
+XAPP_XEYES_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu xlib_libXt
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y)
+XAPP_XEYES_DEPENDENCIES += xlib_libXrender
+XAPP_XEYES_CONF_OPTS += --with-xrender
+else
+XAPP_XEYES_CONF_OPTS += --without-xrender
+endif
 
 $(eval $(autotools-package))


More information about the buildroot mailing list