From 288ba97b58c51bf6502c6fe30a2c5157dd5f16da Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@dv9000.openelec.tv>
Date: Tue, 24 Mar 2009 22:25:20 +0100
Subject: [PATCH] adding evilwm-ewmh for test

---
 packages/devel/glib/url.old                   |  1 -
 packages/virtual/Xorg/install                 |  2 +-
 .../xinit/scripts/xinitrc.d/20_windowmanager  |  4 +++-
 .../openchrome_enable_libxvmc.diff            | 23 +++++++++++++++++++
 packages/x11/other/evilwm-ewmh/build          | 14 +++++++++++
 packages/x11/other/evilwm-ewmh/install        | 10 ++++++++
 packages/x11/other/evilwm-ewmh/unpack         |  9 ++++++++
 packages/x11/other/evilwm-ewmh/url            |  1 +
 8 files changed, 61 insertions(+), 3 deletions(-)
 delete mode 100644 packages/devel/glib/url.old
 create mode 100644 packages/x11/driver/xf86-video-openchrome/openchrome_enable_libxvmc.diff
 create mode 100755 packages/x11/other/evilwm-ewmh/build
 create mode 100755 packages/x11/other/evilwm-ewmh/install
 create mode 100755 packages/x11/other/evilwm-ewmh/unpack
 create mode 100644 packages/x11/other/evilwm-ewmh/url

diff --git a/packages/devel/glib/url.old b/packages/devel/glib/url.old
deleted file mode 100644
index c83bf88fb9..0000000000
--- a/packages/devel/glib/url.old
+++ /dev/null
@@ -1 +0,0 @@
-ftp://ftp.gtk.org/pub/glib/2.18/glib-2.18.4.tar.bz2
diff --git a/packages/virtual/Xorg/install b/packages/virtual/Xorg/install
index f02f4a0653..7cb3bff58c 100755
--- a/packages/virtual/Xorg/install
+++ b/packages/virtual/Xorg/install
@@ -33,7 +33,7 @@ $SCRIPTS/install xf86-video-nv
 #$SCRIPTS/install read-edid
 $SCRIPTS/install xinit
 #+$SCRIPTS/install pciutils
-$SCRIPTS/install evilwm
+$SCRIPTS/install evilwm-ewmh
 #mkdir -p $INSTALL/usr/bin
 #cp $PKG_DIR/scripts/oe_wrapper $INSTALL/usr/bin
 #cp $PKG_DIR/scripts/startx $INSTALL/usr/bin
diff --git a/packages/x11/app/xinit/scripts/xinitrc.d/20_windowmanager b/packages/x11/app/xinit/scripts/xinitrc.d/20_windowmanager
index 2c7fcadb1a..289a39c005 100644
--- a/packages/x11/app/xinit/scripts/xinitrc.d/20_windowmanager
+++ b/packages/x11/app/xinit/scripts/xinitrc.d/20_windowmanager
@@ -13,5 +13,7 @@ if test -f /usr/bin/mrxvt; then
 fi
 
 if /usr/bin/test "${OE_X_WM_ENABLED}" = "yes" ; then
-    /usr/bin/evilwm -fn ${WM_FONT} ${args}> /dev/null 2>&1 &
+    /usr/bin/evilwm ${args}> /dev/null 2>&1 &
 fi
+
+#    /usr/bin/evilwm -fn ${WM_FONT} ${args}> /dev/null 2>&1 &
diff --git a/packages/x11/driver/xf86-video-openchrome/openchrome_enable_libxvmc.diff b/packages/x11/driver/xf86-video-openchrome/openchrome_enable_libxvmc.diff
new file mode 100644
index 0000000000..4eac26aa5d
--- /dev/null
+++ b/packages/x11/driver/xf86-video-openchrome/openchrome_enable_libxvmc.diff
@@ -0,0 +1,23 @@
+diff -Naur xf86-video-openchrome-20090302/Makefile.am xf86-video-openchrome-20090302.patch/Makefile.am
+--- xf86-video-openchrome-20090302/Makefile.am	2008-10-29 10:54:10.000000000 +0100
++++ xf86-video-openchrome-20090302.patch/Makefile.am	2009-03-24 09:58:46.040036529 +0100
+@@ -19,6 +19,6 @@
+ #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = src man
++SUBDIRS = src man libxvmc
+ 
+ EXTRA_DIST = COPYING NEWS README
+diff -Naur xf86-video-openchrome-20090302/Makefile.in xf86-video-openchrome-20090302.patch/Makefile.in
+--- xf86-video-openchrome-20090302/Makefile.in	2009-03-03 01:13:33.000000000 +0100
++++ xf86-video-openchrome-20090302.patch/Makefile.in	2009-03-24 09:58:59.013295184 +0100
+@@ -215,7 +215,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = src man
++SUBDIRS = src man libxvmc
+ EXTRA_DIST = COPYING NEWS README
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/packages/x11/other/evilwm-ewmh/build b/packages/x11/other/evilwm-ewmh/build
new file mode 100755
index 0000000000..bd96a8224f
--- /dev/null
+++ b/packages/x11/other/evilwm-ewmh/build
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+$SCRIPTS/build libX11
+$SCRIPTS/build libXext
+$SCRIPTS/build libXrandr
+
+cd $BUILD/$1*
+
+make CC=$TARGET_CC XROOT=$SYSROOT_PREFIX/usr
+
+$STRIP evilwm
diff --git a/packages/x11/other/evilwm-ewmh/install b/packages/x11/other/evilwm-ewmh/install
new file mode 100755
index 0000000000..bf20d7a979
--- /dev/null
+++ b/packages/x11/other/evilwm-ewmh/install
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+. config/options
+$SCRIPTS/install libX11
+$SCRIPTS/install libXext
+$SCRIPTS/install libXrandr
+
+mkdir -p $INSTALL/usr/bin
+cp $BUILD/$1*/evilwm $INSTALL/usr/bin
+
diff --git a/packages/x11/other/evilwm-ewmh/unpack b/packages/x11/other/evilwm-ewmh/unpack
new file mode 100755
index 0000000000..02240498bb
--- /dev/null
+++ b/packages/x11/other/evilwm-ewmh/unpack
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/fixconfigtools $BUILD/$1*/support
+
+sed -i 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' $BUILD/$1*/evilwm.h
+sed -i -e '/^CFLAGS/s/ -Os/ /' \
+       -e 's/install -s /install /' $BUILD/$1*/Makefile
\ No newline at end of file
diff --git a/packages/x11/other/evilwm-ewmh/url b/packages/x11/other/evilwm-ewmh/url
new file mode 100644
index 0000000000..f87170a7d8
--- /dev/null
+++ b/packages/x11/other/evilwm-ewmh/url
@@ -0,0 +1 @@
+http://www.6809.org.uk/tmp/evilwm/evilwm-ewmh.tar.bz2
\ No newline at end of file