diff options
Diffstat (limited to 'meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch')
-rw-r--r-- | meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch | 116 |
1 files changed, 116 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch b/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch new file mode 100644 index 000000000..3a50eff83 --- /dev/null +++ b/meta-oe/recipes-graphics/xscreensaver/files/fix-buildscripts.patch | |||
@@ -0,0 +1,116 @@ | |||
1 | --- xscreensaver-5.39.orig/configure.in | ||
2 | +++ xscreensaver-5.39/configure.in | ||
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 | * | ||
13 | @@ -422,12 +425,12 @@ | ||
14 | |||
15 | OBJCC="$CC" | ||
16 | |||
17 | - AC_MSG_CHECKING([whether the compiler works on ANSI C]) | ||
18 | - AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], | ||
19 | - AC_MSG_RESULT(yes), | ||
20 | - AC_MSG_RESULT(no) | ||
21 | - AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.), | ||
22 | - AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.)) | ||
23 | +# AC_MSG_CHECKING([whether the compiler works on ANSI C]) | ||
24 | +# AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], | ||
25 | +# AC_MSG_RESULT(yes), | ||
26 | +# AC_MSG_RESULT(no) | ||
27 | +# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.), | ||
28 | +# AC_MSG_ERROR(Couldn't build even a trivial ANSI C program: check CC.)) | ||
29 | |||
30 | if test -n "$GCC"; then | ||
31 | AC_MSG_RESULT(Turning on gcc compiler warnings.) | ||
32 | --- xscreensaver-5.39.orig/Makefile.in | ||
33 | +++ xscreensaver-5.39/Makefile.in | ||
34 | @@ -6,7 +6,7 @@ | ||
35 | VPATH = @srcdir@ | ||
36 | |||
37 | SHELL = /bin/sh | ||
38 | -SUBDIRS = utils jwxyz hacks/images hacks hacks/glx driver po | ||
39 | +SUBDIRS = utils jwxyz hacks/images hacks driver | ||
40 | SUBDIRS2 = $(SUBDIRS) OSX android | ||
41 | TARFILES = README README.hacking README.VMS INSTALL \ | ||
42 | configure configure.in Makefile.in config.h.in \ | ||
43 | --- xscreensaver-5.39.orig/driver/Makefile.in | ||
44 | +++ xscreensaver-5.39/driver/Makefile.in | ||
45 | @@ -10,7 +10,7 @@ | ||
46 | top_srcdir = @top_srcdir@ | ||
47 | top_builddir = .. | ||
48 | |||
49 | -install_prefix = | ||
50 | +install_prefix = ${DESTDIR} | ||
51 | prefix = @prefix@ | ||
52 | exec_prefix = @exec_prefix@ | ||
53 | bindir = @bindir@ | ||
54 | @@ -221,7 +221,7 @@ | ||
55 | SCRIPTS_1 = xscreensaver-getimage-file xscreensaver-getimage-video \ | ||
56 | xscreensaver-text | ||
57 | SCRIPTS_OSX = xscreensaver-getimage-desktop | ||
58 | -SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ | ||
59 | +#SCRIPTS = $(SCRIPTS_1) @SCRIPTS_OSX@ | ||
60 | |||
61 | HDRS = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \ | ||
62 | xscreensaver.h prefs.h remote.h exec.h \ | ||
63 | --- xscreensaver-5.39.orig/hacks/Makefile.in | ||
64 | +++ xscreensaver-5.39/hacks/Makefile.in | ||
65 | @@ -10,7 +10,7 @@ | ||
66 | top_srcdir = @top_srcdir@ | ||
67 | top_builddir = .. | ||
68 | |||
69 | -install_prefix = | ||
70 | +install_prefix = ${DESTDIR} | ||
71 | prefix = @prefix@ | ||
72 | exec_prefix = @exec_prefix@ | ||
73 | bindir = @bindir@ | ||
74 | @@ -122,7 +122,7 @@ | ||
75 | asm6502.c abstractile.c lcdscrub.c hexadrop.c \ | ||
76 | tessellimage.c delaunay.c recanim.c binaryring.c \ | ||
77 | webcollage-cocoa.m webcollage-helper-cocoa.m testx11.c | ||
78 | -SCRIPTS = vidwhacker webcollage ljlatest | ||
79 | +#SCRIPTS = vidwhacker webcollage ljlatest | ||
80 | |||
81 | # Programs that are mentioned in XScreenSaver.ad, and that have XML files, | ||
82 | # but that are not shipped with xscreensaver itself. | ||
83 | @@ -163,7 +163,13 @@ | ||
84 | lcdscrub.o hexadrop.o tessellimage.o delaunay.o recanim.o \ | ||
85 | binaryring.o testx11.o | ||
86 | |||
87 | -EXES = attraction blitspin bouboule braid decayscreen deco \ | ||
88 | +EXES = fontglide | ||
89 | +JPEG_EXES = webcollage-helper | ||
90 | + | ||
91 | +RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ | ||
92 | + lightning lisa lissie lmorph rotor sphere spiral t3d vines \ | ||
93 | + whirlygig worm xsublim juggle testx11 \ | ||
94 | + attraction blitspin bouboule braid decayscreen deco \ | ||
95 | drift flame galaxy grav greynetic halo \ | ||
96 | helix hopalong ifs imsmap julia kaleidescope \ | ||
97 | maze moire noseguy pedal \ | ||
98 | @@ -179,17 +185,12 @@ | ||
99 | speedmine vermiculate twang apollonian euler2d \ | ||
100 | polyominoes thornbird fluidballs anemone halftone \ | ||
101 | metaballs eruption popsquares barcode piecewise cloudlife \ | ||
102 | - fontglide apple2 xanalogtv pong wormhole \ | ||
103 | + apple2 xanalogtv pong wormhole \ | ||
104 | pacman fuzzyflakes anemotaxis memscroller substrate \ | ||
105 | intermomentary fireworkx fiberlamp boxfit interaggregate \ | ||
106 | celtic cwaves m6502 abstractile lcdscrub hexadrop \ | ||
107 | tessellimage binaryring \ | ||
108 | @JPEG_EXES@ | ||
109 | -JPEG_EXES = webcollage-helper | ||
110 | - | ||
111 | -RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ | ||
112 | - lightning lisa lissie lmorph rotor sphere spiral t3d vines \ | ||
113 | - whirlygig worm xsublim juggle testx11 | ||
114 | |||
115 | HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ | ||
116 | $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \ | ||