Skip to contentSkip to conversation

xscreensaver: Update to 6.01

PATCH New Khem Raj 1 participant 1 message Jul 9, 2021

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 xscreensaver: Update to 6.01

Drop fix-buildscripts.patch and move the required changes into recipe Refresh tweak-app-defaults.patch to apply on latest release Do not build po files as they are not buildable and are not used in cross builds as much

---
 .../0001-build-Do-not-build-po-files.patch    |  44 ++++++++
 .../xscreensaver/files/fix-buildscripts.patch | 100 ------------------
 .../files/tweak-app-defaults.patch            |  18 ++--
 .../xscreensaver/xscreensaver_5.44.bb         |  36 -------
 .../xscreensaver/xscreensaver_6.01.bb         |  53 ++++++++++
 5 files changed, 108 insertions(+), 143 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch
 delete mode 100644 meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch
 delete mode 100644 meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb
 create mode 100644 meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb
meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch new file +44 -0
new file mode 100644
index 0000000000..7703a43204
@@ -0,0 +1,44 @@
+From 19bd0a979677a81d7399d5b567998398ec81f38b Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Thu, 8 Jul 2021 15:40:10 -0700
+Subject: [PATCH] build: Do not build po files
+
+Fixes
+| make[1]: Entering directory '/mnt/b/yoe/master/build/tmp/work/cortexa57-yoe-linux/xscreensaver/6.01-r0/xscreensaver-6.01/po'
+| make[1]: *** No rule to make target 'default'.  Stop.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+---
+ Makefile.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -6,8 +6,8 @@ srcdir		= @srcdir@
+ VPATH		= @srcdir@
+
+ SHELL		= /bin/sh
+-SUBDIRS 	= utils jwxyz hacks/images hacks hacks/glx hacks/fonts \
+-		  driver po
++SUBDIRS 	= utils jwxyz hacks/images hacks hacks/fonts \
++		  driver
+ SUBDIRS2	= $(SUBDIRS) OSX android
+ TARFILES	= README README.hacking INSTALL \
+ 		  configure configure.ac Makefile.in config.h.in \
+@@ -451,4 +451,3 @@ cerebrum::
+ 	--include 'configure*' \
+ 	--include '*/' \
+ 	--exclude '*'
+-
+--- a/driver/Makefile.in
++++ b/driver/Makefile.in
+@@ -212,7 +212,7 @@ TEST_EXES	= test-passwd   test-uid
+ 		  xdpyinfo      test-screens    test-yarandom   test-xinput   \
+ 	          test-xkb
+
+-EXES		= xscreensaver xscreensaver-command xscreensaver-settings
++EXES		= xscreensaver xscreensaver-command
+ UTIL_EXES	= xscreensaver-gfx @EXES_SYSTEMD@
+ SETUID_EXES	= xscreensaver-auth
+ DEMO_EXES	= @ALL_DEMO_PROGRAMS@
meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch deleted +0 -100

100 lines not on this page · raw message

meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch +11 -7
index 0f2e09aec7..4ce2faed5d 100644
@@ -1,5 +1,5 @@
---- xscreensaver-5.44.orig/driver/XScreenSaver.ad.in	2020-06-16 13:13:14.950970569 +0000
-+++ xscreensaver-5.44/driver/XScreenSaver.ad.in	2020-06-16 13:19:35.777000937 +0000
+--- a/driver/XScreenSaver.ad.in
++++ b/driver/XScreenSaver.ad.in
 @@ -29,7 +29,7 @@
  ! /* (xrdb prevention kludge: whole file)
 
@@ -18,13 +18,13 @@
  *grabVideoFrames:	False
  *chooseRandomImages:	@DEFAULT_IMAGES_P@
  ! This can be a local directory name, or the URL of an RSS or Atom feed.
-@@ -48,11 +48,11 @@
+@@ -47,11 +47,11 @@
+ *memoryLimit:		0
  *lock:			False
  *verbose:		False
- *timestamp:		True
 -*fade:			True
 +*fade:			False
- *unfade:		False
+ *unfade:		True
  *fadeSeconds:		0:00:03
  *fadeTicks:		20
 -*splash:		True
@@ -32,7 +32,7 @@
  *splashDuration:	0:00:05
  *visualID:		default
  *installColormap:	True
-@@ -343,246 +343,8 @@
+@@ -324,250 +324,8 @@ XScreenSaver.bourneShell:		/bin/sh
  !=============================================================================
 
  *programs:								      \
@@ -272,8 +272,12 @@
 -				vfeedback -root				    \n\
 -@GL_KLUDGE@ GL: 				deepstars -root				    \n\
 -@GL_KLUDGE@ GL: 				gravitywell -root			    \n\
+-@GL_KLUDGE@ GL: 				beats -root				    \n\
+-@GL_KLUDGE@ GL: 				covid19 -root				    \n\
 -@GL_KLUDGE@ GL: 				etruscanvenus -root			    \n\
--@GL_KLUDGE@ GL: 				gibson -root				    \n
+-@GL_KLUDGE@ GL: 				gibson -root				    \n\
+-@GL_KLUDGE@ GL: 				headroom -root				    \n\
+-@GL_KLUDGE@ GL: 				sphereeversion -root			    \n
 -
 -
 +-				fontglide -root -program "date +'%F %H:%M %z'"
meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.44.bb deleted +0 -36
deleted file mode 100644
index 9131c754d5..0000000000
@@ -1,36 +0,0 @@
-SUMMARY = "X screen saver and locker"
-HOMEPAGE = "https://www.jwz.org/xscreensaver/"
-LICENSE = "BSD-0-Clause"
-LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=2b97002f72fbfc9329b4336e798f2463"
-
-SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz"
-SRC_URI[md5sum] = "9f764e561f9939f8684a66ec98b27cba"
-SRC_URI[sha256sum] = "73d8089cfc7d7363b5dac99b5b01dffb3429d0a855e6af16ce9a4b7777017b95"
-
-SRC_URI += " \
-    file://xscreensaver.service \
-    file://fix-buildscripts.patch \
-    file://tweak-app-defaults.patch \
-"
-
-DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native"
-# These are only needed as part of the stopgap screensaver implementation:
-RDEPENDS_${PN} = " \
-    liberation-fonts \
-    xuser-account \
-"
-
-inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check
-
-EXTRA_OECONF += "--with-x-app-defaults=${datadir}/X11/app-defaults"
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-do_install_append() {
-    install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service
-}
-
-FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver"
-SYSTEMD_SERVICE_${PN} = "xscreensaver.service"
-
-CLEANBROKEN = "1"
meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb new file +53 -0

53 lines not on this page · raw message

--
2.32.0