From cbcbd66b0f241184288232972d9cd9d03c9f0ce1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 9 Mar 2022 22:09:53 +0100 Subject: [PATCH] package/xscreensaver: bump to version 6.03 xlib_libXft and xlib_libXi are now mandatory https://www.jwz.org/xscreensaver/changelog.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/xscreensaver/Config.in | 2 ++ package/xscreensaver/xscreensaver.hash | 2 +- package/xscreensaver/xscreensaver.mk | 18 +++--------------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/package/xscreensaver/Config.in b/package/xscreensaver/Config.in index 10b2b7012c..48eefdfa70 100644 --- a/package/xscreensaver/Config.in +++ b/package/xscreensaver/Config.in @@ -14,6 +14,8 @@ config BR2_PACKAGE_XSCREENSAVER select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_JPEG select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_XLIB_LIBXFT + select BR2_PACKAGE_XLIB_LIBXI select BR2_PACKAGE_XLIB_LIBXT help XScreenSaver is the standard screen saver collection shipped diff --git a/package/xscreensaver/xscreensaver.hash b/package/xscreensaver/xscreensaver.hash index 26ecd8bbbf..27ef7d8f00 100644 --- a/package/xscreensaver/xscreensaver.hash +++ b/package/xscreensaver/xscreensaver.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 7016df6736ba0126a68c1f35abcf411a695fe93bc01a18ebd9df46c9a9f4d50d xscreensaver-5.45.tar.gz +sha256 328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a xscreensaver-6.03.tar.gz sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk index 46dedc3211..0a91d22d14 100644 --- a/package/xscreensaver/xscreensaver.mk +++ b/package/xscreensaver/xscreensaver.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSCREENSAVER_VERSION = 5.45 +XSCREENSAVER_VERSION = 6.03 XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver # N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built. @@ -20,6 +20,8 @@ XSCREENSAVER_DEPENDENCIES = \ libgtk2 \ libxml2 \ xlib_libX11 \ + xlib_libXft \ + xlib_libXi \ xlib_libXt \ $(TARGET_NLS_DEPENDENCIES) \ host-intltool @@ -51,20 +53,6 @@ else XSCREENSAVER_CONF_OPTS += --with-systemd=no endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -XSCREENSAVER_CONF_OPTS += --with-xft=yes -XSCREENSAVER_DEPENDENCIES += xlib_libXft -else -XSCREENSAVER_CONF_OPTS += --with-xft=no -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=yes -XSCREENSAVER_DEPENDENCIES += xlib_libXi -else -XSCREENSAVER_CONF_OPTS += --with-xinput-ext=no -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) XSCREENSAVER_CONF_OPTS += --with-xinerama-ext=yes XSCREENSAVER_DEPENDENCIES += xlib_libXinerama