From ec4e2ddde2d93e2627619c253b10ff18dc9de0da Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@mobile.openelec.tv>
Date: Sat, 19 Sep 2009 21:46:36 +0200
Subject: [PATCH] wayland: now wayland compiles and run

---
 packages/other/wayland/build                  |  5 ++++
 packages/other/wayland/install                | 20 ++++++++++++-
 .../wayland/patches/wayland-crosscompile.diff | 29 +++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 packages/other/wayland/patches/wayland-crosscompile.diff

diff --git a/packages/other/wayland/build b/packages/other/wayland/build
index 0ee49e777b..93c853ecf6 100755
--- a/packages/other/wayland/build
+++ b/packages/other/wayland/build
@@ -3,7 +3,12 @@
 . config/options
 
 $SCRIPTS/build toolchain
+$SCRIPTS/build udev
 $SCRIPTS/build eagle
+$SCRIPTS/build libffi
+$SCRIPTS/build libpng
+$SCRIPTS/build $CAIRO
+$SCRIPTS/build gtk+
 
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
diff --git a/packages/other/wayland/install b/packages/other/wayland/install
index dce51a02ec..b2497c2a3a 100755
--- a/packages/other/wayland/install
+++ b/packages/other/wayland/install
@@ -2,5 +2,23 @@
 
 . config/options
 
+$SCRIPTS/install udev
+$SCRIPTS/install eagle
+$SCRIPTS/install libffi
+$SCRIPTS/install libpng
+$SCRIPTS/install $CAIRO
+$SCRIPTS/install gtk+
+
 mkdir -p $INSTALL/usr/lib
-cp -PR $PKG_BUILD/$1/.libs/*.so* $INSTALL/usr/lib
+cp -PR $PKG_BUILD/libwayland*.so* $INSTALL/usr/lib
+
+mkdir -p $INSTALL/usr/bin
+cp -PR $PKG_BUILD/flower $INSTALL/usr/bin
+cp -PR $PKG_BUILD/gears $INSTALL/usr/bin
+cp -PR $PKG_BUILD/image $INSTALL/usr/bin
+cp -PR $PKG_BUILD/screenshot $INSTALL/usr/bin
+cp -PR $PKG_BUILD/terminal $INSTALL/usr/bin
+cp -PR $PKG_BUILD/wayland-system-compositor $INSTALL/usr/bin
+
+mkdir -p $INSTALL/lib/udev/rules.d
+cp -PR $PKG_BUILD/70-wayland.rules $INSTALL/lib/udev/rules.d
diff --git a/packages/other/wayland/patches/wayland-crosscompile.diff b/packages/other/wayland/patches/wayland-crosscompile.diff
new file mode 100644
index 0000000000..1748dc1586
--- /dev/null
+++ b/packages/other/wayland/patches/wayland-crosscompile.diff
@@ -0,0 +1,29 @@
+diff -Naur wayland-20090913/Makefile.in wayland-20090913.patch/Makefile.in
+--- wayland-20090913/Makefile.in	2009-05-29 02:23:31.000000000 +0200
++++ wayland-20090913.patch/Makefile.in	2009-09-18 16:14:57.000000000 +0200
+@@ -27,7 +27,7 @@
+ $(libs) : CFLAGS += -fPIC @FFI_CFLAGS@
+ $(libs) : LDLIBS += @FFI_LIBS@
+ $(libs) :
+-	gcc -shared $^ $(LDLIBS)  -o $@
++	$(CC) -shared $^ $(LDLIBS)  -o $@
+ 
+ wayland-system-compositor :			\
+ 	wayland-system-compositor.o		\
+@@ -54,11 +54,11 @@
+ $(cairo_clients) : LDLIBS += -L. -lwayland @CAIRO_CLIENT_LIBS@ -lrt
+ 
+ install : $(libs) $(compositors)
+-	install -d @libdir@ @libdir@/pkgconfig ${udev_rules_dir}
+-	install $(libs) @libdir@
+-	install wayland-server.pc wayland.pc @libdir@/pkgconfig
+-	install wayland-client.h @includedir@
+-	install 70-wayland.rules ${udev_rules_dir}
++	install -d ${DESTDIR}@libdir@ ${DESTDIR}@libdir@/pkgconfig ${DESTDIR}${udev_rules_dir}
++	install $(libs) ${DESTDIR}/@libdir@
++	install wayland-server.pc wayland.pc ${DESTDIR}@libdir@/pkgconfig
++	install wayland-client.h ${DESTDIR}@includedir@
++	install 70-wayland.rules ${DESTDIR}${udev_rules_dir}
+ 
+ clean :
+ 	rm -f $(clients) $(compositors) *.o *.so