xapp_xscreensaver: new package
PATCH 1/1 xapp_xscreensaver: new package
From: Simon Dawson <[email protected]>
--- package/x11r7/Config.in | 1 + package/x11r7/xapp_xscreensaver/Config.in | 22 ++++ ...ver-0001-fix-cross-compile-ansi-c-bailout.patch | 29 +++++ ...creensaver-0002-fix-minixpm-build-problem.patch | 134 +++++++++++++++++++++ .../x11r7/xapp_xscreensaver/xapp_xscreensaver.mk | 24 ++++ 5 files changed, 210 insertions(+) create mode 100644 package/x11r7/xapp_xscreensaver/Config.in create mode 100644 package/x11r7/xapp_xscreensaver/xapp_xscreensaver-0001-fix-cross-compile-ansi-c-bailout.patch create mode 100644 package/x11r7/xapp_xscreensaver/xapp_xscreensaver-0002-fix-minixpm-build-problem.patch create mode 100644 package/x11r7/xapp_xscreensaver/xapp_xscreensaver.mk
package/x11r7/Config.in +1 -0
@@ -127,6 +127,7 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xapp_xrandr/Config.in source package/x11r7/xapp_xrdb/Config.in source package/x11r7/xapp_xrefresh/Config.in + source package/x11r7/xapp_xscreensaver/Config.in source package/x11r7/xapp_xset/Config.in source package/x11r7/xapp_xsetmode/Config.in source package/x11r7/xapp_xsetpointer/Config.in
package/x11r7/xapp_xscreensaver/Config.in new file +22 -0
@@ -0,0 +1,22 @@ +config BR2_PACKAGE_XAPP_XSCREENSAVER + bool "xscreensaver" + 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/x11r7/xapp_xscreensaver/xapp_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/x11r7/xapp_xscreensaver/xapp_xscreensaver-0002-fix-minixpm-build-problem.patch new file +134 -0
134 lines not on this page · raw message
package/x11r7/xapp_xscreensaver/xapp_xscreensaver.mk new file +24 -0
@@ -0,0 +1,24 @@ +################################################################################ +# +# xapp_xscreensaver +# +################################################################################ + +XAPP_XSCREENSAVER_VERSION = 5.22 +XAPP_XSCREENSAVER_SITE = http://www.jwz.org/xscreensaver +XAPP_XSCREENSAVER_SOURCE = xscreensaver-$(XAPP_XSCREENSAVER_VERSION).tar.gz + +XAPP_XSCREENSAVER_LICENSE = MIT-like +XAPP_XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h + +XAPP_XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \ + $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) + +XAPP_XSCREENSAVER_CONF_OPT += \ + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ + LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ + LIBS=-lintl + +XAPP_XSCREENSAVER_INSTALL_TARGET_OPT = install_prefix="$(TARGET_DIR)" install + +$(eval $(autotools-package))
Signature · 1 line
1.8.1.2
PATCH 1/1 xapp_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> ---
spdawson> package/x11r7/Config.in | 1 + spdawson> package/x11r7/xapp_xscreensaver/Config.in | 22 ++++ spdawson> ...ver-0001-fix-cross-compile-ansi-c-bailout.patch | 29 +++++ spdawson> ...creensaver-0002-fix-minixpm-build-problem.patch | 134 +++++++++++++++++++++ spdawson> .../x11r7/xapp_xscreensaver/xapp_xscreensaver.mk | 24 ++++ spdawson> 5 files changed, 210 insertions(+) spdawson> create mode 100644 package/x11r7/xapp_xscreensaver/Config.in spdawson> create mode 100644 package/x11r7/xapp_xscreensaver/xapp_xscreensaver-0001-fix-cross-compile-ansi-c-bailout.patch spdawson> create mode 100644 package/x11r7/xapp_xscreensaver/xapp_xscreensaver-0002-fix-minixpm-build-problem.patch spdawson> create mode 100644 package/x11r7/xapp_xscreensaver/xapp_xscreensaver.mk
spdawson> diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in spdawson> index 205079c..19c46a5 100644
spdawson> --- a/package/x11r7/Config.in
spdawson> +++ b/package/x11r7/Config.in
spdawson> @@ -127,6 +127,7 @@ if BR2_PACKAGE_XORG7
spdawson> source package/x11r7/xapp_xrandr/Config.in spdawson> source package/x11r7/xapp_xrdb/Config.in spdawson> source package/x11r7/xapp_xrefresh/Config.in
spdawson> + source package/x11r7/xapp_xscreensaver/Config.in
Like Thomas commented on the recently posted lesstif package, this shouldn't go under x11r7 as it isn't part of x.org (and should just be called xscreensaver).
spdawson> +++ b/package/x11r7/xapp_xscreensaver/xapp_xscreensaver.mk spdawson> @@ -0,0 +1,24 @@
spdawson> +################################################################################ spdawson> +#
spdawson> +# xapp_xscreensaver
spdawson> +#
spdawson> +################################################################################ spdawson> +
spdawson> +XAPP_XSCREENSAVER_VERSION = 5.22
spdawson> +XAPP_XSCREENSAVER_SITE = http://www.jwz.org/xscreensaver
spdawson> +XAPP_XSCREENSAVER_SOURCE = xscreensaver-$(XAPP_XSCREENSAVER_VERSION).tar.gz spdawson> +
spdawson> +XAPP_XSCREENSAVER_LICENSE = MIT-like
spdawson> +XAPP_XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h
According to the Debian package, it also contains GPLv2+ parts (hacks/glx/chessmodels.{c,man}), but perhaps we don't build that file?
A comment explaining it might be good.
spdawson> +
spdawson> +XAPP_XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \
spdawson> + $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
spdawson> +
spdawson> +XAPP_XSCREENSAVER_CONF_OPT += \
spdawson> + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
spdawson> + LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
The compiler should already be looking under STAGING_DIR, why is this needed?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 xapp_xscreensaver: new package
Quoted 6 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"spdawson" == spdawson <[email protected]> writes:
spdawson> + source package/x11r7/xapp_xscreensaver/Config.in
Like Thomas commented on the recently posted lesstif package, this shouldn't go under x11r7 as it isn't part of x.org (and should just be called xscreensaver).
Okay; I'll move it.
Quoted 7 lines
spdawson> +XAPP_XSCREENSAVER_LICENSE = MIT-like spdawson> +XAPP_XSCREENSAVER_LICENSE_FILES =
hacks/screenhack.hAccording to the Debian package, it also contains GPLv2+ parts (hacks/glx/chessmodels.{c,man}), but perhaps we don't build that file?
A comment explaining it might be good.
Ah, right. I'll fix this then.
Quoted 6 lines
spdawson> +XAPP_XSCREENSAVER_CONF_OPT += \
spdawson> + CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
spdawson> + LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \The compiler should already be looking under
STAGING_DIR, why is this needed?
Right; not needed, in fact. I'll remove this in the next iteration of the patch.
Simon.