Commit 11357a11 authored by Simon Dawson's avatar Simon Dawson Committed by Peter Korsgaard
Browse files

xscreensaver: new package 



[Peter: fix libintl handling, pass --includedir / --libdir]
Signed-off-by: default avatarSimon Dawson <spdawson@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 77a2607f

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ source "package/sylpheed/Config.in" 
source "package/synergy/Config.in"

source "package/torsmo/Config.in"

source "package/x11vnc/Config.in"

source "package/xscreensaver/Config.in"

source "package/xstroke/Config.in"

source "package/xterm/Config.in"

source "package/xvkbd/Config.in"

package/xscreensaver/Config.in

0 → 100644
+22 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_XSCREENSAVER

	bool "xscreensaver"

	depends on BR2_PACKAGE_XORG7

	depends on BR2_INSTALL_LIBSTDCPP # libgtk2->pango

	depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2->glib2

	select BR2_PACKAGE_LIBGTK2

	select BR2_PACKAGE_LIBGLADE

	select BR2_PACKAGE_JPEG

	select BR2_PACKAGE_XLIB_LIBX11

	select BR2_PACKAGE_XLIB_LIBXT

	help

	  XScreenSaver is the standard screen saver collection shipped on most

	  Linux and Unix systems running the X11 Window System.



	  On X11 systems, XScreenSaver is two things: it is both a large

	  collection of screen savers; and it is also the framework for

	  blanking and locking the screen.



	  http://www.jwz.org/xscreensaver/



comment "xscreensaver requires a toolchain with C++ and thread support enabled"

	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)

package/xscreensaver/xscreensaver-0001-fix-cross-compile-ansi-c-bailout.patch

0 → 100644
+29 −0
Original line number Diff line number Diff line 
The configure bails out when cross-compiling, because it is over-cautious

about ANSI support in the C compiler. Work around this by disabling the

bail-out code.



Signed-off-by: Simon Dawson <spdawson@gmail.com>



diff -Nurp a/configure b/configure

--- a/configure	2013-07-16 10:23:32.000000000 +0100

+++ b/configure	2013-09-22 14:50:07.186953454 +0100

@@ -3537,9 +3537,7 @@ $as_echo "Solaris: adding -D__EXTENSIONS

   { $as_echo "$as_me:$LINENO: checking whether the compiler works on ANSI C" >&5

 $as_echo_n "checking whether the compiler works on ANSI C... " >&6; }

   if test "$cross_compiling" = yes; then

-  { { $as_echo "$as_me:$LINENO: error: Couldn't build even a trivial ANSI C program: check CC." >&5

-$as_echo "$as_me: error: Couldn't build even a trivial ANSI C program: check CC." >&2;}

-   { (exit 1); exit 1; }; }

+  :

 else

   cat >conftest.$ac_ext <<_ACEOF

 /* confdefs.h.  */

@@ -8616,7 +8614,7 @@ fi

 $as_echo "$ac_cv_xpointer" >&6; }

   if test "$ac_cv_xpointer" != yes; then

    cat >>confdefs.h <<\_ACEOF

-#define XPointer char*

+/* #define XPointer char* */

 _ACEOF

 

   fi

package/xscreensaver/xscreensaver-0002-fix-minixpm-build-problem.patch

0 → 100644
+134 −0
Original line number Diff line number Diff line 
Fix compile and link errors related to the minixpm code.



Signed-off-by: Simon Dawson <spdawson@gmail.com>



diff -Nurp a/hacks/Makefile.in b/hacks/Makefile.in

--- a/hacks/Makefile.in	2013-07-16 10:23:32.000000000 +0100

+++ b/hacks/Makefile.in	2013-09-22 18:47:56.389238980 +0100

@@ -73,17 +73,22 @@ UTIL_SRCS	= $(UTILS_SRC)/alpha.c $(UTILS

 		  $(UTILS_SRC)/minixpm.c \

 		  $(UTILS_SRC)/yarandom.c $(UTILS_SRC)/erase.c \

 		  $(UTILS_SRC)/xshm.c $(UTILS_SRC)/xdbe.c \

-		  $(UTILS_SRC)/textclient.c

+		  $(UTILS_SRC)/colorbars.c \

+		  $(UTILS_SRC)/fade.c \

+		  $(UTILS_SRC)/textclient.c \

+		  $(UTILS_SRC)/overlay.c

 UTIL_OBJS	= $(UTILS_BIN)/alpha.o $(UTILS_BIN)/colors.o \

 		  $(UTILS_BIN)/grabclient.o \

 		  $(UTILS_BIN)/hsv.o $(UTILS_BIN)/resources.o \

 		  $(UTILS_BIN)/spline.o $(UTILS_BIN)/usleep.o \

 		  $(UTILS_BIN)/visual.o $(UTILS_BIN)/logo.o \

-		  $(UTILS_SRC)/minixpm.c \

+		  $(UTILS_BIN)/minixpm.o \

 		  $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/erase.o \

 		  $(UTILS_BIN)/xshm.o $(UTILS_BIN)/xdbe.o \

 		  $(UTILS_BIN)/colorbars.o \

-		  $(UTILS_SRC)/textclient.o

+		  $(UTILS_BIN)/fade.o \

+		  $(UTILS_BIN)/textclient.o \

+		  $(UTILS_BIN)/overlay.o

 

 SRCS		= attraction.c blitspin.c bouboule.c braid.c bubbles.c \

 		  bubbles-default.c decayscreen.c deco.c drift.c flag.c \

@@ -559,11 +564,11 @@ xscreensaver-sgigl: xscreensaver-sgigl.c

 attraction:	attraction.o	$(HACK_OBJS) $(COL) $(SPL)

 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(SPL) $(HACK_LIBS)

 

-blitspin:	blitspin.o	$(HACK_OBJS) $(GRAB) $(XPM)

-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(XPM) $(XPM_LIBS)

+blitspin:	blitspin.o	$(HACK_OBJS) $(GRAB) $(XPM) $(MINIXPM)

+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(XPM) $(MINIXPM) $(XPM_LIBS)

 

-bubbles:	bubbles.o	$(HACK_OBJS) bubbles-default.o $(XPM)

-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) bubbles-default.o $(XPM) $(XPM_LIBS)

+bubbles:	bubbles.o	$(HACK_OBJS) bubbles-default.o $(XPM) $(MINIXPM)

+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) bubbles-default.o $(XPM) $(MINIXPM) $(XPM_LIBS)

 

 decayscreen:	decayscreen.o	$(HACK_OBJS) $(GRAB)

 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(HACK_LIBS)

@@ -604,8 +609,8 @@ moire:		moire.o		$(HACK_OBJS) $(COL) $(S

 moire2:		moire2.o	$(HACK_OBJS) $(COL) $(DBE)

 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(DBE) $(HACK_LIBS)

 

-noseguy:	noseguy.o	$(HACK_OBJS) $(XPM) $(TEXT)

-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(XPM) $(TEXT) $(XPM_LIBS) $(TEXT_LIBS)

+noseguy:	noseguy.o	$(HACK_OBJS) $(XPM) $(TEXT) $(MINIXPM)

+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(XPM) $(TEXT) $(MINIXPM) $(XPM_LIBS) $(TEXT_LIBS)

 

 pedal:		pedal.o		$(HACK_OBJS) $(HSV) $(ERASE)

 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HSV) $(ERASE) $(HACK_LIBS)

@@ -658,14 +663,14 @@ interference:  interference.o	$(HACK_OBJ

 truchet:	 truchet.o	$(HACK_OBJS) $(COL)

 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS)

 

-bsod:	 	bsod.o		$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM)

-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(XPM_LIBS)

+bsod:	 	bsod.o		$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(MINIXPM)

+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(MINIXPM) $(XPM_LIBS)

 

 apple2:	 	apple2.o apple2-main.o	$(HACK_OBJS) $(ATV) $(GRAB) $(TEXT)

 	$(CC_HACK) -o $@ $@.o	apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(XPM_LIBS) $(TEXT_LIBS)

 

-xanalogtv: 	xanalogtv.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM)

-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(XPM_LIBS) $(HACK_LIBS)

+xanalogtv: 	xanalogtv.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(MINIXPM)

+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(MINIXPM) $(XPM_LIBS) $(HACK_LIBS)

 

 distort:	distort.o	$(HACK_OBJS) $(GRAB) $(SHM)

 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(SHM) $(HACK_LIBS)

@@ -688,8 +693,8 @@ compass:	compass.o	$(HACK_OBJS) $(DBE)

 squiral:	squiral.o	$(HACK_OBJS) $(COL)

 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS)

 

-xflame:		xflame.o	$(HACK_OBJS) $(SHM) $(XPM)

-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(SHM) $(XPM) $(XPM_LIBS)

+xflame:		xflame.o	$(HACK_OBJS) $(SHM) $(XPM) $(MINIXPM)

+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(SHM) $(XPM) $(MINIXPM) $(XPM_LIBS)

 

 wander:		wander.o	$(HACK_OBJS) $(COL) $(ERASE)

 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(ERASE) $(HACK_LIBS)

@@ -703,8 +708,8 @@ critical:	critical.o	$(HACK_OBJS) $(COL)

 phosphor:	phosphor.o	$(HACK_OBJS) $(TEXT) $(COL)

 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(TEXT) $(COL) $(HACK_LIBS) $(TEXT_LIBS)

 

-xmatrix:	xmatrix.o	$(HACK_OBJS) $(TEXT) $(XPM)

-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(TEXT) $(XPM) $(XPM_LIBS) $(TEXT_LIBS)

+xmatrix:	xmatrix.o	$(HACK_OBJS) $(TEXT) $(XPM) $(MINIXPM)

+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(TEXT) $(XPM) $(MINIXPM) $(XPM_LIBS) $(TEXT_LIBS)

 

 petri:		petri.o		$(HACK_OBJS) $(COL) $(SPL)

 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(SPL) $(HACK_LIBS)

@@ -787,8 +792,8 @@ cloudlife:	cloudlife.o	$(HACK_OBJS) $(CO

 fontglide:	fontglide.o	$(HACK_OBJS) $(DBE) $(TEXT)

 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(DBE) $(TEXT) $(HACK_LIBS) $(TEXT_LIBS)

 

-pong: 	pong.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM)

-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(XPM_LIBS) $(HACK_LIBS)

+pong: 	pong.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(MINIXPM)

+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(MINIXPM) $(XPM_LIBS) $(HACK_LIBS)

 

 wormhole: 	wormhole.o	$(HACK_OBJS)

 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)

@@ -856,8 +861,8 @@ braid:		braid.o		$(XLOCK_OBJS) $(ERASE)

 drift:		drift.o		$(XLOCK_OBJS) $(ERASE)

 	$(CC_HACK) -o $@ $@.o	$(XLOCK_OBJS) $(ERASE) $(HACK_LIBS)

 

-flag:		flag.o		$(XLOCK_OBJS) $(XPM)

-	$(CC_HACK) -o $@ $@.o	$(XLOCK_OBJS) $(XPM) $(XPM_LIBS)

+flag:		flag.o		$(XLOCK_OBJS) $(XPM) $(MINIXPM)

+	$(CC_HACK) -o $@ $@.o	$(XLOCK_OBJS) $(XPM) $(MINIXPM) $(XPM_LIBS)

 

 forest:		forest.o	$(XLOCK_OBJS) $(ERASE)

 	$(CC_HACK) -o $@ $@.o	$(XLOCK_OBJS) $(ERASE) $(HACK_LIBS)

@@ -959,8 +964,8 @@ thornbird:	thornbird.o	$(XLOCK_OBJS)

 	$(CC_HACK) -o $@ $@.o	$(XLOCK_OBJS) $(HACK_LIBS)

 

 PACOBJS=pacman_ai.o pacman_level.o

-pacman:		pacman.o 	$(PACOBJS) $(XLOCK_OBJS) $(XPM)

-	$(CC_HACK) -o $@ $@.o	$(PACOBJS) $(XLOCK_OBJS) $(XPM) $(XPM_LIBS)

+pacman:		pacman.o 	$(PACOBJS) $(XLOCK_OBJS) $(XPM) $(MINIXPM)

+	$(CC_HACK) -o $@ $@.o	$(PACOBJS) $(XLOCK_OBJS) $(XPM) $(MINIXPM) $(XPM_LIBS)

 

 fiberlamp:	fiberlamp.o	$(XLOCK_OBJS)

 	$(CC_HACK) -o $@ $@.o	$(XLOCK_OBJS) $(HACK_LIBS)

package/xscreensaver/xscreensaver.mk

0 → 100644
+27 −0
Original line number Diff line number Diff line 
################################################################################

#

# xscreensaver

#

################################################################################



XSCREENSAVER_VERSION = 5.22

XSCREENSAVER_SITE = http://www.jwz.org/xscreensaver



# N.B. GPLv2+ code (in the hacks/glx subdirectory) is not currently built.

XSCREENSAVER_LICENSE = MIT-like GPLv2+

XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h



XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \

	$(if $(BR2_PACKAGE_GETTEXT),gettext)



XSCREENSAVER_CONF_ENV = $(if $(BR2_PACKAGE_GETTEXT),LIBS=-lintl)



# otherwise we end up with host include/library dirs passed to the

# compiler/linker

XSCREENSAVER_CONF_OPT = \

	--includedir=$(STAGING_DIR)/usr/include \

	--libdir=$(STAGING_DIR)/usr/lib



XSCREENSAVER_INSTALL_TARGET_OPT = install_prefix="$(TARGET_DIR)" install



$(eval $(autotools-package))