mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-09 07:51:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/xscreensaver: bump version to 6.12

Browse Source 
Added two patches from Debian to fix configure errors.

Switched from libgtk2 to libgtk3 and adjusted dependencies.
Added dependency to libxcrypt.

Fixed broken include path for gl.h, inspired by Gentoo:
https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-misc/xscreensaver/xscreensaver-6.12-r2.ebuild#n172

Removed dependency to gdk-pixbuf-xlib, not needed since version 6.05:
https://gitweb.gentoo.org/repo/gentoo.git/commit/x11-misc/xscreensaver?id=3d6bc3a216196c795de6e0932f74055548beb9bb

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Julien: replace the sed substitute separator with '%']
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2025-11-06 21:45:20 +01:00
committed by Julien Olivain
parent 7085d1c48b
commit 34a03bdba4
5 changed files with 85 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
package/xscreensaver/0001-allow_unrecognized_conf_opts.patch Normal file
View File

@@ -0,0 +1,28 @@
Description: Allow unrecognized configure options
Fix an oddity in upstream-generated configure.
Our dh_auto_configure will add several unrecognized options.
Forwarded: not-needed
Author: Tormod Volden <debian.tormod@gmail.com>
Downloaded from
https://sources.debian.org/data/main/x/xscreensaver/6.09%2Bdfsg1-1/debian/patches/94_allow_unrecognized_conf_opts.patch
Upstream: not applicable
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Index: xscreensaver-git/configure
===================================================================
--- xscreensaver-git.orig/configure
+++ xscreensaver-git/configure
@@ -2856,8 +2856,8 @@ echo "current directory: `pwd`"
echo "command line was: $0 $@"
if ! test -z "$ac_unrecognized_opts" ; then
- echo "" >&2
- exit 2
+ echo "ignored options $ac_unrecognized_opts" >&2
+ #exit 2
fi
###############################################################################

35
package/xscreensaver/0002-configure_allow_warnings.patch Normal file
View File

@@ -0,0 +1,35 @@
Description: Allow warnings from configure
Since 6.03 the original configure script returns non-zero if a
warning about configuration options versus detected capabilities
has been issued, presumably to increase awareness of the warnings.
To allow building on all architectures, while relying on the
resulting HAVE_XX flags as usual, return with success at the end
of the script.
Forwarded: not-needed
Author: Tormod Volden <debian.tormod@gmail.com>
Downloaded from
https://sources.debian.org/src/xscreensaver/6.09%2Bdfsg1-1/debian/patches/100_configure_allow_warnings.patch
Upstream: not applicable
[Bernd: s/Debian/buildroot]
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Index: xscreensaver-git/configure
===================================================================
--- xscreensaver-git.orig/configure
+++ xscreensaver-git/configure
@@ -23273,5 +23273,11 @@ echo " Extra Fonts: ${FONT
echo " App Defaults: ${APPDEFAULTS}/$addir_err"
echo ""
-exit $CONF_STATUS
+if test "$CONF_STATUS" != 0; then
+ echo ""
+ echo "Warning: Buildroot build will proceed regardless of above warnings"
+ echo ""
+fi
+
+exit 0

18
package/xscreensaver/Config.in
View File

@@ -2,16 +2,17 @@ config BR2_PACKAGE_XSCREENSAVER
bool "xscreensaver"
depends on BR2_PACKAGE_XORG7
depends on BR2_PACKAGE_HAS_LIBGL # libglu
depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango
depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf, libgtk2 -> glib2
depends on BR2_USE_WCHAR # gdk-pixbuf, libgtk2 -> glib2
depends on BR2_USE_MMU # gdk-pixbuf, libgtk2 -> glib2
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk2 -> pango -> harfbuzz
depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS # libgtk3
depends on BR2_USE_WCHAR # libgtk3, libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk3, libglib2
depends on BR2_USE_MMU # libgtk3, libglib2
depends on BR2_INSTALL_LIBSTDCPP # libgtk3
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk3
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgtk3
select BR2_PACKAGE_GDK_PIXBUF
select BR2_PACKAGE_GDK_PIXBUF_XLIB
select BR2_PACKAGE_LIBGLU
select BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_LIBGTK3
select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_XLIB_LIBX11
@@ -31,6 +32,7 @@ config BR2_PACKAGE_XSCREENSAVER
comment "xscreensaver needs a toolchain w/ wchar, C++, threads, gcc >= 4.9, OpenGL backend"
depends on BR2_PACKAGE_XORG7
depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \

2
package/xscreensaver/xscreensaver.hash
View File

@@ -1,4 +1,4 @@
# Locally calculated
sha256 328d51797352acf58ca5bab49e76fbf26034e7cad785f651ea11ce7b43fba25a xscreensaver-6.03.tar.gz
sha256 4ff6798217e3bbbc3c7336beeda7e83eafbf03301ac29b2236da66a0f1317643 xscreensaver-6.12.tar.gz
sha256 8a03451ba5c4c9af669b53e47e50c38c149b9e152d3d627809b962da7b760bbd hacks/screenhack.h
sha256 56db580415bb313a4a82c5e08f106304904d15d42faf8e6ab14b34e14e2087a5 hacks/glx/chessmodels.h

14
package/xscreensaver/xscreensaver.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
XSCREENSAVER_VERSION = 6.03
XSCREENSAVER_VERSION = 6.12
XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver
# N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built.
@@ -13,13 +13,17 @@ XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
XSCREENSAVER_CPE_ID_VALID = YES
XSCREENSAVER_SELINUX_MODULES = xdg xscreensaver xserver
define XSCREENSAVER_FIX_INCLUDE_GL
$(SED) 's%OpenGL/gl.h%GL/gl.h%' $(@D)/driver/subprocs.c
endef
XSCREENSAVER_POST_EXTRACT_HOOKS = XSCREENSAVER_FIX_INCLUDE_GL
XSCREENSAVER_DEPENDENCIES = \
gdk-pixbuf \
gdk-pixbuf-xlib \
jpeg \
libgl \
libglu \
libgtk2 \
libgtk3 \
libxml2 \
xlib_libX11 \
xlib_libXft \
@@ -42,6 +46,10 @@ else
XSCREENSAVER_CONF_OPTS += --with-png=no
endif
ifeq ($(BR2_PACKAGE_LIBXCRYPT),y)
XSCREENSAVER_DEPENDENCIES += libxcrypt
endif
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
XSCREENSAVER_CONF_OPTS += --with-systemd=yes
XSCREENSAVER_DEPENDENCIES += systemd