xscreensaver: new package
PATCH v2 1/1 xscreensaver: new package
From: Simon Dawson <[email protected]>
---
v2: Renamed package from xapp_xscreensaver, and moved out of x11r7 package
subdirectory; fixed license information, and added an explanatory comment; removed unnecessary include and library path build options
package/Config.in | 1 + package/xscreensaver/Config.in | 23 ++++ ...ver-0001-fix-cross-compile-ansi-c-bailout.patch | 29 +++++ ...creensaver-0002-fix-minixpm-build-problem.patch | 134 +++++++++++++++++++++ package/xscreensaver/xscreensaver.mk | 21 ++++ 5 files changed, 208 insertions(+) create mode 100644 package/xscreensaver/Config.in create mode 100644 package/xscreensaver/xscreensaver-0001-fix-cross-compile-ansi-c-bailout.patch create mode 100644 package/xscreensaver/xscreensaver-0002-fix-minixpm-build-problem.patch create mode 100644 package/xscreensaver/xscreensaver.mk
package/Config.in +1 -0
@@ -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 new file +23 -0
@@ -0,0 +1,23 @@ +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_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + 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 new file +29 -0
@@ -0,0 +1,29 @@ +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 <[email protected]> + +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 new file +134 -0
134 lines not on this page · raw message
package/xscreensaver/xscreensaver.mk new file +21 -0
@@ -0,0 +1,21 @@ +################################################################################ +# +# 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_NEEDS_GETTEXT_IF_LOCALE),gettext) + +XSCREENSAVER_CONF_OPT += LIBS=-lintl + +XSCREENSAVER_INSTALL_TARGET_OPT = install_prefix="$(TARGET_DIR)" install + +$(eval $(autotools-package))
Signature · 1 line
1.8.1.2
PATCH v2 1/1 xscreensaver: new package
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"spdawson" == spdawson <[email protected]> writes:
spdawson> From: Simon Dawson <[email protected]> spdawson> Signed-off-by: Simon Dawson <[email protected]>
spdawson> +++ b/package/xscreensaver/xscreensaver.mk
spdawson> @@ -0,0 +1,21 @@
spdawson> +################################################################################ spdawson> +#
spdawson> +# xscreensaver
spdawson> +#
spdawson> +################################################################################ spdawson> +
spdawson> +XSCREENSAVER_VERSION = 5.22
spdawson> +XSCREENSAVER_SITE = http://www.jwz.org/xscreensaver
spdawson> +
spdawson> +# N.B. GPLv2+ code (in the hacks/glx subdirectory) is not currently built. spdawson> +XSCREENSAVER_LICENSE = MIT-like GPLv2+
spdawson> +XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
You could argue that we shouldn't add the glx / GPLv2+ stuff here if we aren't using them - But ok, like this we won't forget to add them if we ever enable the glx support.
spdawson> +
spdawson> +XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \
spdawson> + $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
spdawson> +
spdawson> +XSCREENSAVER_CONF_OPT += LIBS=-lintl
We should only add -lintl if gettext is enabled, otherwise we'll end up with linker errors, and we normally pass LIBS= in the configure environment, not as an option.
Here I had to explicitly point --includedir / --libdir to staging, otherwise it would end up adding -I/usr/include and -L/usr/lib causing all kinds of issues.
Committed with these changes, thanks.
Signature · 1 line
Bye, Peter Korsgaard