diff options
Diffstat (limited to 'meta-oe/recipes-graphics/xscreensaver/files')
| -rw-r--r-- | meta-oe/recipes-graphics/xscreensaver/files/0001-Tweak-app-defaults.patch (renamed from meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch) | 59 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch | 47 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch | 53 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch | 116 |
4 files changed, 145 insertions, 130 deletions
diff --git a/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch b/meta-oe/recipes-graphics/xscreensaver/files/0001-Tweak-app-defaults.patch index 099a0b2f4a..1d0d20da2f 100644 --- a/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch +++ b/meta-oe/recipes-graphics/xscreensaver/files/0001-Tweak-app-defaults.patch @@ -1,5 +1,16 @@ ---- xscreensaver-5.39.orig/driver/XScreenSaver.ad.in -+++ xscreensaver-5.39/driver/XScreenSaver.ad.in +From f2c592352360e52a7c817a1adcc8b09fd92cd941 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 16 Jul 2022 09:58:24 -0700 +Subject: [PATCH 1/2] Tweak app defaults + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + driver/XScreenSaver.ad.in | 259 +------------------------------------- + 1 file changed, 6 insertions(+), 253 deletions(-) + +--- a/driver/XScreenSaver.ad.in ++++ b/driver/XScreenSaver.ad.in @@ -29,7 +29,7 @@ ! /* (xrdb prevention kludge: whole file) @@ -18,23 +29,23 @@ *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 +*splash: False *splashDuration: 0:00:05 *visualID: default - *captureStderr: True -@@ -158,236 +158,8 @@ - ! screen savers interactively. - ! + *installColormap: True +@@ -324,256 +324,8 @@ XScreenSaver.bourneShell: /bin/sh + !============================================================================= + *programs: \ - maze -root \n\ -@GL_KLUDGE@ GL: superquadrics -root \n\ @@ -74,7 +85,7 @@ - munch -root \n\ - penrose -root \n\ -@GL_KLUDGE@ GL: pipes -root \n\ -- rd-bomb -root \n\ +- rdbomb -root \n\ -@GL_KLUDGE@ GL: rubik -root \n\ -- sierpinski -root \n\ - slip -root \n\ @@ -138,6 +149,7 @@ -@GL_KLUDGE@ GL: menger -root \n\ -@GL_KLUDGE@ GL: molecule -root \n\ - rotzoomer -root \n\ +- scooter -root \n\ - speedmine -root \n\ -@GL_KLUDGE@ GL: starwars -root \n\ -@GL_KLUDGE@ GL: stonerview -root \n\ @@ -262,12 +274,31 @@ -@GL_KLUDGE@ GL: esper -root \n\ -@GL_KLUDGE@ GL: vigilance -root \n\ -@GL_KLUDGE@ GL: crumbler -root \n\ +- filmleader -root \n\ +- glitchpeg -root \n\ +-@GL_KLUDGE@ GL: handsy -root \n\ -@GL_KLUDGE@ GL: maze3d -root \n\ -@GL_KLUDGE@ GL: peepers -root \n\ --@GL_KLUDGE@ GL: razzledazzle -root \n +-@GL_KLUDGE@ GL: razzledazzle -root \n\ +- 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: headroom -root \n\ +-@GL_KLUDGE@ GL: sphereeversion -root \n\ +- binaryhorizon -root \n\ +- marbling -root \n\ +-@GL_KLUDGE@ GL: chompytower -root \n\ +-@GL_KLUDGE@ GL: mapscroller -root \n\ +-@GL_KLUDGE@ GL: nakagin -root \n\ +-@GL_KLUDGE@ GL: squirtorus -root \n - -+- fontglide -root -program "date +'%F %H:%M %z'" \n\ -+ gifview --window $XSCREENSAVER_WINDOW /usr/share/logo/bosch-black.gif \n - +- ++- fontglide -root -program "date +'%F %H:%M %z'" ++ gifview --window $XSCREENSAVER_WINDOW /usr/share/logo/bosch-black.gif !============================================================================= + ! diff --git a/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch b/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch new file mode 100644 index 0000000000..ea3f25a2f2 --- /dev/null +++ b/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch @@ -0,0 +1,47 @@ +From 516fbcdcfe6343b1d64d35957ddb768346713ff6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 17 Jul 2022 09:47:35 -0700 +Subject: [PATCH] configure: Ignore CONF_STATUS for gtk and openGL needs + +These are just warnings + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c4fd38f..d7463cf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4522,7 +4522,6 @@ fi + if test "$gtk_halfassed" != no ; then + warnL "GTK was found, but $gtk_halfassed_lib was not, so GTK" + warn2 "can't be used." +- CONF_STATUS=1 + + if ( echo $gtk_halfassed_lib | grep -qi pixbuf-xlib ); then + echo '' +@@ -4549,7 +4548,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then + else + warnL "The GTK libraries do not seem to be available; the" + warn2 "\`xscreensaver-settings' program requires them." +- CONF_STATUS=1 + # echo '' + # warn2 'You can use Motif or Lesstif instead of GTK (use the' + # warn2 "\`--with-motif' option) but that is NOT recommended." +@@ -4735,10 +4733,8 @@ if test "$have_gl" = no ; then + CONF_STATUS=1 + elif test "$with_gl_req" = no ; then + noteL 'The OpenGL 3D library is not being used.' +- CONF_STATUS=1 + else + noteL 'The OpenGL 3D library was not found.' +- CONF_STATUS=1 + fi + + if test "$gl_halfassed" = yes ; then +-- +2.37.1 + diff --git a/meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch b/meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch new file mode 100644 index 0000000000..0ceba7be02 --- /dev/null +++ b/meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch @@ -0,0 +1,53 @@ +From 6b5d022f6dd9848a2d5ca08a1968929b8c140981 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 16 Jul 2022 09:59:40 -0700 +Subject: [PATCH 2/2] 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 <raj.khem@gmail.com> +--- + Makefile.in | 5 ++--- + driver/Makefile.in | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 9de79b2..1c1d16c 100644 +--- 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 \ +@@ -461,4 +461,3 @@ cerebrum:: + --include 'ad2c' \ + --include '*/' \ + --exclude '*' +- +diff --git a/driver/Makefile.in b/driver/Makefile.in +index e1fa1b2..feca6fc 100644 +--- a/driver/Makefile.in ++++ b/driver/Makefile.in +@@ -211,7 +211,7 @@ TEST_EXES = test-passwd test-uid test-xdpms test-grab \ + 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@ +-- +2.37.1 + diff --git a/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch b/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch deleted file mode 100644 index 3a50eff83c..0000000000 --- a/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- xscreensaver-5.39.orig/configure.in -+++ xscreensaver-5.39/configure.in -@@ -14,6 +14,9 @@ - # - ############################################################################### - -+includedir='' -+libdir='' -+ - AH_TOP([ - /* config.h.in --- xscreensaver, Copyright (c) 1991-2014 Jamie Zawinski. - * -@@ -422,12 +425,12 @@ - - OBJCC="$CC" - -- AC_MSG_CHECKING([whether the compiler works on ANSI C]) -- AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], -- AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no) -- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.), -- AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.)) -+# AC_MSG_CHECKING([whether the compiler works on ANSI C]) -+# AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], -+# AC_MSG_RESULT(yes), -+# AC_MSG_RESULT(no) -+# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.), -+# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.)) - - if test -n "$GCC"; then - AC_MSG_RESULT(Turning on gcc compiler warnings.) ---- xscreensaver-5.39.orig/Makefile.in -+++ xscreensaver-5.39/Makefile.in -@@ -6,7 +6,7 @@ - VPATH = @srcdir@ - - SHELL = /bin/sh --SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po -+SUBDIRS = utils jwxyz hacks/images hacks driver - SUBDIRS2 = $(SUBDIRS) OSX android - TARFILES = README README.hacking README.VMS INSTALL \ - configure configure.in Makefile.in config.h.in \ ---- xscreensaver-5.39.orig/driver/Makefile.in -+++ xscreensaver-5.39/driver/Makefile.in -@@ -10,7 +10,7 @@ - top_srcdir = @top_srcdir@ - top_builddir = .. - --install_prefix = -+install_prefix = ${DESTDIR} - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ -@@ -221,7 +221,7 @@ - SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \ - xscreensaver-text - SCRIPTS_OSX = xscreensaver-getimage-desktop --SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ -+#SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ - - HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ - xscreensaver.h prefs.h remote.h exec.h \ ---- xscreensaver-5.39.orig/hacks/Makefile.in -+++ xscreensaver-5.39/hacks/Makefile.in -@@ -10,7 +10,7 @@ - top_srcdir = @top_srcdir@ - top_builddir = .. - --install_prefix = -+install_prefix = ${DESTDIR} - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ -@@ -122,7 +122,7 @@ - asm6502.c abstractile.c lcdscrub.c hexadrop.c \ - tessellimage.c delaunay.c recanim.c binaryring.c \ - webcollage-cocoa.m webcollage-helper-cocoa.m testx11.c --SCRIPTS = vidwhacker webcollage ljlatest -+#SCRIPTS = vidwhacker webcollage ljlatest - - # Programs that are mentioned in XScreenSaver.ad, and that have XML files, - # but that are not shipped with xscreensaver itself. -@@ -163,7 +163,13 @@ - lcdscrub.o hexadrop.o tessellimage.o delaunay.o recanim.o \ - binaryring.o testx11.o - --EXES = attraction blitspin bouboule braid decayscreen deco \ -+EXES = fontglide -+JPEG_EXES = webcollage-helper -+ -+RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ -+ lightning lisa lissie lmorph rotor sphere spiral t3d vines \ -+ whirlygig worm xsublim juggle testx11 \ -+ attraction blitspin bouboule braid decayscreen deco \ - drift flame galaxy grav greynetic halo \ - helix hopalong ifs imsmap julia kaleidescope \ - maze moire noseguy pedal \ -@@ -179,17 +185,12 @@ - speedmine vermiculate twang apollonian euler2d \ - polyominoes thornbird fluidballs anemone halftone \ - metaballs eruption popsquares barcode piecewise cloudlife \ -- fontglide apple2 xanalogtv pong wormhole \ -+ apple2 xanalogtv pong wormhole \ - pacman fuzzyflakes anemotaxis memscroller substrate \ - intermomentary fireworkx fiberlamp boxfit interaggregate \ - celtic cwaves m6502 abstractile lcdscrub hexadrop \ - tessellimage binaryring \ - @JPEG_EXES@ --JPEG_EXES = webcollage-helper -- --RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ -- lightning lisa lissie lmorph rotor sphere spiral t3d vines \ -- whirlygig worm xsublim juggle testx11 - - HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ - $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \ |