merge of 6a83bbd03f976982866f96cb6a6c060a9c8f0f51

     and 757ecda6a55f9383b0120347f55b2337f6d9df15

7 files changed, 74 insertions, 1 deletions

diff --git a/packages/libao/libao_0.8.6.bb b/packages/libao/libao_0.8.6.bb
index 8c2601bce8..62275f14fb 100644
--- a/packages/libao/libao_0.8.6.bb
+++ b/packages/libao/libao_0.8.6.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 PR = "r0"
 
-SRC_URI = "http://www.xiph.org/ao/src/libao-${PV}.tar.gz"
+SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
diff --git a/packages/xscreensaver/files/.mtn2git_empty b/packages/xscreensaver/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xscreensaver/files/.mtn2git_empty
diff --git a/packages/xscreensaver/xscreensaver-4.16/XScreenSaver b/packages/xscreensaver/files/XScreenSaver
index fa27d2c536..fa27d2c536 100644
--- a/packages/xscreensaver/xscreensaver-4.16/XScreenSaver
+++ b/packages/xscreensaver/files/XScreenSaver
diff --git a/packages/xscreensaver/xscreensaver-4.16/fixes.patch b/packages/xscreensaver/files/fixes.patch
index 3d138bc490..3d138bc490 100644
--- a/packages/xscreensaver/xscreensaver-4.16/fixes.patch
+++ b/packages/xscreensaver/files/fixes.patch
diff --git a/packages/xscreensaver/xscreensaver-4.22/.mtn2git_empty b/packages/xscreensaver/xscreensaver-4.22/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xscreensaver/xscreensaver-4.22/.mtn2git_empty
diff --git a/packages/xscreensaver/xscreensaver-4.22/configure.in.patch b/packages/xscreensaver/xscreensaver-4.22/configure.in.patch
new file mode 100644
index 0000000000..1538315e3b
--- /dev/null
+++ b/packages/xscreensaver/xscreensaver-4.22/configure.in.patch
@@ -0,0 +1,15 @@
+--- xscreensaver-4.22~/configure.in	2005-08-26 10:00:58.000000000 -0700
++++ xscreensaver-4.22/configure.in	2005-08-26 10:01:27.000000000 -0700
+@@ -1080,9 +1080,9 @@
+ 
+ # random compiler setup
+ AC_CANONICAL_HOST
+-AC_PROG_CC_ANSI
+-AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE
+-AC_NO_OBJECTIVE_C
++#AC_PROG_CC_ANSI
++#AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE
++#AC_NO_OBJECTIVE_C
+ AC_PROG_CPP
+ AC_C_CONST
+ AC_C_INLINE
diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb
new file mode 100644
index 0000000000..e4ca0acc3a
--- /dev/null
+++ b/packages/xscreensaver/xscreensaver_4.22.bb
@@ -0,0 +1,58 @@
+# xscreensaver OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+SRC_URI="http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
+         file://fixes.patch;patch=1 \
+         file://configure.in.patch;patch=1 \
+         file://XScreenSaver"
+
+DESCRIPTION="*The* screensaver package for X11"
+LICENSE="BSD"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+PR = "r0"
+SECTION="x11-misc"
+
+DEPENDS="intltool x11 gtk+ libxml2 libglade"
+
+# xscreensaver-demo is a glade app
+LDFLAGS_append = " -Wl,--export-dynamic"
+
+inherit autotools
+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
+}
+
+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
+}
+
+python populate_packages_prepend () {
+	hackdir = bb.data.expand('${libexecdir}/xscreensaver', d)
+	do_split_packages(d, hackdir, '^(.*)', 'xscreensaver-hack-%s', 'XScreensaver hack %s')
+}