xscreensaver: update to 5.07

3 files changed, 154 insertions, 0 deletions

diff --git a/packages/xscreensaver/xscreensaver-5.07/.mtn2git_empty b/packages/xscreensaver/xscreensaver-5.07/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xscreensaver/xscreensaver-5.07/.mtn2git_empty
diff --git a/packages/xscreensaver/xscreensaver-5.07/configure.in.patch b/packages/xscreensaver/xscreensaver-5.07/configure.in.patch
new file mode 100644
index 0000000000..384b134037
--- /dev/null
+++ b/packages/xscreensaver/xscreensaver-5.07/configure.in.patch
@@ -0,0 +1,91 @@
+--- /tmp/configure.in	2008-08-21 12:56:59.000000000 +0200
++++ xscreensaver-5.07/configure.in	2008-08-21 13:06:16.293198000 +0200
+@@ -952,9 +952,6 @@
+ #
+ AC_DEFUN(AC_CHECK_X_HEADER, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+   AC_CHECK_HEADER([$1],[$2],[$3],[$4])
+@@ -964,9 +961,6 @@
+ #
+ AC_DEFUN(AC_EGREP_X_HEADER, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+   AC_EGREP_HEADER([$1], [$2], [$3], [$4])
+@@ -976,9 +970,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_COMPILE, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+   AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+@@ -993,9 +984,6 @@
+   ac_save_LDFLAGS="$LDFLAGS"
+ #  ac_save_LIBS="$LIBS"
+ 
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   # note: $X_CFLAGS includes $x_includes
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ 
+@@ -1018,9 +1006,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_RUN, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+   AC_TRY_RUN([$1], [$2], [$3], [$4])
+@@ -1099,11 +1084,8 @@
+ 
+ # random compiler setup
+ AC_CANONICAL_HOST
+-AC_PROG_CC_ANSI
+ AC_NO_LONG_STRING_WARNINGS
+ AC_NO_MISPLACED_DECLARATIONS
+-AC_NO_OBJECTIVE_C
+-AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE
+ AC_PROG_CPP
+ AC_C_CONST
+ AC_C_INLINE
+@@ -2831,9 +2813,6 @@
+ EOF
+ 
+          ac_save_CPPFLAGS="$CPPFLAGS"
+-         if test \! -z "$includedir" ; then 
+-           CPPFLAGS="$CPPFLAGS -I$includedir"
+-         fi
+          CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ 
+          mglv=`(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | grep configure:`
+@@ -3515,16 +3494,6 @@
+ DEPEND_FLAGS=
+ DEPEND_DEFINES=
+ 
+-
+-if test \! -z "$includedir" ; then 
+-  INCLUDES="$INCLUDES -I$includedir"
+-fi
+-
+-if test \! -z "$libdir" ; then
+-  LDFLAGS="$LDFLAGS -L$libdir"
+-fi
+-
+-
+ PREFERRED_DEMO_PROGRAM=''
+ ALL_DEMO_PROGRAMS=
+ if test "$have_motif" = yes; then
diff --git a/packages/xscreensaver/xscreensaver_5.07.bb b/packages/xscreensaver/xscreensaver_5.07.bb
new file mode 100644
index 0000000000..8e288b872a
--- /dev/null
+++ b/packages/xscreensaver/xscreensaver_5.07.bb
@@ -0,0 +1,63 @@
+# xscreensaver OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "*The* screensaver package for X11"
+HOMEPAGE = "http://www.jwz.org/xscreensaver/"
+SECTION = "x11-misc"
+LICENSE = "BSD"
+DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade"
+
+
+SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
+           file://configure.in.patch;patch=1 \
+	   file://XScreenSaver"
+
+# xscreensaver-demo is a glade app
+LDFLAGS_append = " -Wl,--export-dynamic"
+
+inherit autotools
+
+export INTLTOOL_PERL="/usr/bin/env perl"
+
+EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \
+	--with-jpeg --with-xpm"
+
+PACKAGES =+  " xscreensaver-demo xscreensaver-extra"
+
+FILES_${PN}= "${bindir}/xscreensaver ${bindir}/xscreensaver-command \
+	/usr/X11R6/lib/X11/app-defaults"
+
+FILES_xscreensaver-demo="${bindir}/xscreensaver-demo ${datadir}/xscreensaver \
+	${datadir}/pixmaps/"
+
+FILES_xscreensaver-extra="${bindir}/xscreensaver-getimage*"
+
+do_configure_prepend() {
+	sed -i 's:GTK_DATADIR="$GTK_DATADIR/share":GTK_DATADIR="${datadir}":' ${S}/configure.in
+	
+	export includedir="/lib"
+}
+
+do_compile() {
+	oe_runmake GNOME_DATADIR=${datadir} all
+}
+
+do_install() {
+	unset KDEDIR
+	oe_runmake -C ${S}/driver GNOME_DATADIR=${datadir} \
+	install_prefix=${D} install
+
+	oe_runmake -C ${S}/hacks install_prefix=${D} install-program
+
+	# Install the defaults file
+	install -d ${D}/usr/X11R6/lib/X11/app-defaults
+	install -m 0644 ${WORKDIR}/XScreenSaver ${D}/usr/X11R6/lib/X11/app-defaults
+}
+
+PACKAGES_DYNAMIC = "xscreensaver-hack-*"
+
+python populate_packages_prepend () {
+	hackdir = bb.data.expand('${libexecdir}/xscreensaver', d)
+	do_split_packages(d, hackdir, '^(.*)', 'xscreensaver-hack-%s', 'XScreensaver hack %s')
+}