Andrew Geissler | c87764f | 2020-06-27 00:16:32 -0500 | [diff] [blame] | 1 | --- xscreensaver-5.44.orig/configure.in 2020-06-16 12:49:55.384675395 +0000 |
| 2 | +++ xscreensaver-5.44/configure.in 2020-06-16 12:51:49.451826729 +0000 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 3 | @@ -14,6 +14,9 @@ |
| 4 | # |
| 5 | ############################################################################### |
| 6 | |
| 7 | +includedir='' |
| 8 | +libdir='' |
| 9 | + |
| 10 | AH_TOP([ |
| 11 | /* config.h.in --- xscreensaver, Copyright (c) 1991-2014 Jamie Zawinski. |
| 12 | * |
Andrew Geissler | c87764f | 2020-06-27 00:16:32 -0500 | [diff] [blame] | 13 | diff -Naur xscreensaver-5.44.orig/driver/Makefile.in xscreensaver-5.44/driver/Makefile.in |
| 14 | --- xscreensaver-5.44.orig/driver/Makefile.in 2020-06-16 12:49:55.388675365 +0000 |
| 15 | +++ xscreensaver-5.44/driver/Makefile.in 2020-06-16 12:53:36.331038333 +0000 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 16 | @@ -10,7 +10,7 @@ |
| 17 | top_srcdir = @top_srcdir@ |
| 18 | top_builddir = .. |
| 19 | |
| 20 | -install_prefix = |
| 21 | +install_prefix = ${DESTDIR} |
| 22 | prefix = @prefix@ |
| 23 | exec_prefix = @exec_prefix@ |
| 24 | bindir = @bindir@ |
Andrew Geissler | c87764f | 2020-06-27 00:16:32 -0500 | [diff] [blame] | 25 | @@ -228,7 +228,7 @@ |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 26 | SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \ |
| 27 | xscreensaver-text |
| 28 | SCRIPTS_OSX = xscreensaver-getimage-desktop |
| 29 | -SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ |
| 30 | +#SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ |
| 31 | |
| 32 | HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ |
| 33 | xscreensaver.h prefs.h remote.h exec.h \ |
Andrew Geissler | c87764f | 2020-06-27 00:16:32 -0500 | [diff] [blame] | 34 | diff -Naur xscreensaver-5.44.orig/hacks/Makefile.in xscreensaver-5.44/hacks/Makefile.in |
| 35 | --- xscreensaver-5.44.orig/hacks/Makefile.in 2020-06-16 12:49:55.532674285 +0000 |
| 36 | +++ xscreensaver-5.44/hacks/Makefile.in 2020-06-16 12:58:54.364719996 +0000 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 37 | @@ -10,7 +10,7 @@ |
| 38 | top_srcdir = @top_srcdir@ |
| 39 | top_builddir = .. |
| 40 | |
| 41 | -install_prefix = |
| 42 | +install_prefix = ${DESTDIR} |
| 43 | prefix = @prefix@ |
| 44 | exec_prefix = @exec_prefix@ |
| 45 | bindir = @bindir@ |
Andrew Geissler | c87764f | 2020-06-27 00:16:32 -0500 | [diff] [blame] | 46 | @@ -124,7 +124,7 @@ |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 47 | tessellimage.c delaunay.c recanim.c binaryring.c \ |
Andrew Geissler | c87764f | 2020-06-27 00:16:32 -0500 | [diff] [blame] | 48 | glitchpeg.c vfeedback.c scooter.c webcollage-cocoa.m \ |
| 49 | webcollage-helper-cocoa.m testx11.c |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 50 | -SCRIPTS = vidwhacker webcollage ljlatest |
| 51 | +#SCRIPTS = vidwhacker webcollage ljlatest |
| 52 | |
| 53 | # Programs that are mentioned in XScreenSaver.ad, and that have XML files, |
| 54 | # but that are not shipped with xscreensaver itself. |
Andrew Geissler | c87764f | 2020-06-27 00:16:32 -0500 | [diff] [blame] | 55 | @@ -166,7 +166,13 @@ |
| 56 | tessellimage.o delaunay.o recanim.o binaryring.o \ |
| 57 | glitchpeg.o vfeedback.o scooter.o testx11.o |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 58 | |
| 59 | -EXES = attraction blitspin bouboule braid decayscreen deco \ |
Andrew Geissler | c87764f | 2020-06-27 00:16:32 -0500 | [diff] [blame] | 60 | +EXES = fontglide |
| 61 | +JPEG_EXES = webcollage-helper |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 62 | + |
Andrew Geissler | c87764f | 2020-06-27 00:16:32 -0500 | [diff] [blame] | 63 | +RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ |
| 64 | + lightning lisa lissie lmorph rotor sphere spiral t3d vines \ |
| 65 | + whirlygig worm xsublim juggle testx11 \ |
| 66 | + attraction blitspin bouboule braid decayscreen deco \ |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 67 | drift flame galaxy grav greynetic halo \ |
| 68 | helix hopalong ifs imsmap julia kaleidescope \ |
| 69 | maze moire noseguy pedal \ |
Andrew Geissler | c87764f | 2020-06-27 00:16:32 -0500 | [diff] [blame] | 70 | @@ -182,17 +188,12 @@ |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 71 | speedmine vermiculate twang apollonian euler2d \ |
| 72 | polyominoes thornbird fluidballs anemone halftone \ |
| 73 | metaballs eruption popsquares barcode piecewise cloudlife \ |
Andrew Geissler | c87764f | 2020-06-27 00:16:32 -0500 | [diff] [blame] | 74 | - fontglide apple2 xanalogtv pong filmleader wormhole \ |
| 75 | + apple2 xanalogtv pong filmleader wormhole \ |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 76 | pacman fuzzyflakes anemotaxis memscroller substrate \ |
| 77 | intermomentary fireworkx fiberlamp boxfit interaggregate \ |
| 78 | celtic cwaves m6502 abstractile lcdscrub hexadrop \ |
Andrew Geissler | c87764f | 2020-06-27 00:16:32 -0500 | [diff] [blame] | 79 | tessellimage binaryring glitchpeg vfeedback scooter \ |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 80 | @JPEG_EXES@ |
| 81 | -JPEG_EXES = webcollage-helper |
| 82 | - |
| 83 | -RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ |
| 84 | - lightning lisa lissie lmorph rotor sphere spiral t3d vines \ |
| 85 | - whirlygig worm xsublim juggle testx11 |
| 86 | |
| 87 | HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ |
| 88 | $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \ |
Andrew Geissler | c87764f | 2020-06-27 00:16:32 -0500 | [diff] [blame] | 89 | diff -Naur xscreensaver-5.44.orig/Makefile.in xscreensaver-5.44/Makefile.in |
| 90 | --- xscreensaver-5.44.orig/Makefile.in 2020-06-16 12:49:55.384675395 +0000 |
| 91 | +++ xscreensaver-5.44/Makefile.in 2020-06-16 12:52:49.395383836 +0000 |
| 92 | @@ -6,7 +6,7 @@ |
| 93 | VPATH = @srcdir@ |
| 94 | |
| 95 | SHELL = /bin/sh |
| 96 | -SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po |
| 97 | +SUBDIRS = utils jwxyz hacks/images hacks driver |
| 98 | SUBDIRS2 = $(SUBDIRS) OSX android |
| 99 | TARFILES = README README.hacking README.VMS INSTALL \ |
| 100 | configure configure.in Makefile.in config.h.in \ |