From e6062e60a17cdbc4eec9cd187fc7821d6fdc53fa Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Wed, 10 Mar 2010 21:03:31 +0100
Subject: [PATCH 1/8] new package: - re-add package xineramaproto

---
 packages/x11/proto/xineramaproto/build | 15 +++++++++++++++
 packages/x11/proto/xineramaproto/url   |  1 +
 2 files changed, 16 insertions(+)
 create mode 100755 packages/x11/proto/xineramaproto/build
 create mode 100644 packages/x11/proto/xineramaproto/url

diff --git a/packages/x11/proto/xineramaproto/build b/packages/x11/proto/xineramaproto/build
new file mode 100755
index 0000000000..61467203fa
--- /dev/null
+++ b/packages/x11/proto/xineramaproto/build
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+
+cd $PKG_BUILD
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+
+make
+
+$MAKEINSTALL
diff --git a/packages/x11/proto/xineramaproto/url b/packages/x11/proto/xineramaproto/url
new file mode 100644
index 0000000000..72b50c4754
--- /dev/null
+++ b/packages/x11/proto/xineramaproto/url
@@ -0,0 +1 @@
+http://xorg.freedesktop.org/archive/individual/proto/xineramaproto-1.2.tar.bz2
\ No newline at end of file

From b43e80904870ccad89f23e2faf5d14514ba5be95 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Wed, 10 Mar 2010 21:03:58 +0100
Subject: [PATCH 2/8] new package: - re-add libXinerama

---
 packages/x11/lib/libXinerama/build   | 20 ++++++++++++++++++++
 packages/x11/lib/libXinerama/install |  6 ++++++
 packages/x11/lib/libXinerama/url     |  1 +
 3 files changed, 27 insertions(+)
 create mode 100755 packages/x11/lib/libXinerama/build
 create mode 100755 packages/x11/lib/libXinerama/install
 create mode 100644 packages/x11/lib/libXinerama/url

diff --git a/packages/x11/lib/libXinerama/build b/packages/x11/lib/libXinerama/build
new file mode 100755
index 0000000000..52252950d6
--- /dev/null
+++ b/packages/x11/lib/libXinerama/build
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+$SCRIPTS/build xineramaproto
+
+cd $PKG_BUILD
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --localstatedir=/var \
+            --disable-static \
+            --enable-shared \
+            --enable-malloc0returnsnull \
+
+make
+
+$MAKEINSTALL
diff --git a/packages/x11/lib/libXinerama/install b/packages/x11/lib/libXinerama/install
new file mode 100755
index 0000000000..8e76a6ee4c
--- /dev/null
+++ b/packages/x11/lib/libXinerama/install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options
+
+mkdir -p $INSTALL/usr/lib
+  cp -P $PKG_BUILD/src/.libs/libXinerama.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/libXinerama/url b/packages/x11/lib/libXinerama/url
new file mode 100644
index 0000000000..4f49da1e41
--- /dev/null
+++ b/packages/x11/lib/libXinerama/url
@@ -0,0 +1 @@
+http://xorg.freedesktop.org/archive/individual/lib/libXinerama-1.1.tar.bz2
\ No newline at end of file

From bf7477bba3a932e20e06dc0f738360fa5682b40d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Wed, 10 Mar 2010 21:04:32 +0100
Subject: [PATCH 3/8] xorg-server: - build with xinerama support again (needed
 by nvidia driver)

---
 packages/x11/xserver/xorg-server/build   | 3 ++-
 packages/x11/xserver/xorg-server/install | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index d17c28edbd..0f6dab84ef 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -19,6 +19,7 @@ $SCRIPTS/build libX11
 $SCRIPTS/build libXfont
 $SCRIPTS/build libxkbfile
 $SCRIPTS/build libXv
+$SCRIPTS/build libXinerama
 $SCRIPTS/build $LIBDRM
 $SCRIPTS/build $MESA
 $SCRIPTS/build openssl
@@ -49,7 +50,7 @@ cd $PKG_BUILD
             --enable-glx-tls \
             --enable-registry \
             --disable-composite \
-            --disable-xinerama \
+            --enable-xinerama \
             --enable-mitshm \
             --disable-xres \
             --disable-record \
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index 7e8cc420df..d51ab4067d 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -8,6 +8,7 @@ $SCRIPTS/install openssl
 $SCRIPTS/install libX11
 $SCRIPTS/install libXfont
 $SCRIPTS/install libXv
+$SCRIPTS/install libXinerama
 $SCRIPTS/install $LIBDRM
 $SCRIPTS/install $MESA
 $SCRIPTS/install pixman

From 082b1d4dd03d2fccfea7cc86182117597549efb1 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Thu, 11 Mar 2010 01:27:15 +0100
Subject: [PATCH 4/8] config/path: - cleanup old geexbox code

---
 config/path | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/config/path b/config/path
index f0b285335d..34de21a595 100644
--- a/config/path
+++ b/config/path
@@ -195,19 +195,9 @@ INDENT_SIZE=4
 
 OPENELEC_SRC=http://sources.geexbox.org/src/$OPENELEC_VERSION
 
-# GEEXBOX_SRCS=http://www.geexbox.org/src/$GEEXBOX_VERSION
-#[ "$GEEXBOX_VERSION" = devel ] && GEEXBOX_VERSION=$GEEXBOX_VERSION-`date +%Y%m%d` #-r`hg tip --template={rev}`
-#[ "$OPENELEC_VERSION" = devel ] && OPENELEC_VERSION=$OPENELEC_VERSION-`date +%Y%m%d`-r`bzr version-info --custom --template={revno}`
-#[ -n "$GEEXBOX_VERSION_EXTRA" ] && GEEXBOX_VERSION=$GEEXBOX_VERSION-$GEEXBOX_VERSION_EXTRA
-
 VERSION_SUFFIX=$TARGET_ARCH
 [ -n "$TARGET_PLATFORM" ] && VERSION_SUFFIX=$TARGET_PLATFORM
 
-ISO=geexbox-$GEEXBOX_VERSION-$MENU_LANG.$VERSION_SUFFIX.iso
-GENERATOR_NAME=geexbox-generator-$GEEXBOX_VERSION.$VERSION_SUFFIX
-PXE_NAME=geexbox-pxe/GEEXBOX.$VERSION_SUFFIX
-VMX_NAME=geexbox-vmx
-
 
 kernel_path() {
   ls -d $ROOT/$BUILD/linux*

From 5a852181318e0254c8a9d86706db93d4dd25da73 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Thu, 11 Mar 2010 01:28:04 +0100
Subject: [PATCH 5/8] xorg-server: - build with xinerama support only if
 requested

---
 packages/x11/xserver/xorg-server/build   | 10 ++++++++--
 packages/x11/xserver/xorg-server/install |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index 0f6dab84ef..8a7d8249e1 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -19,7 +19,6 @@ $SCRIPTS/build libX11
 $SCRIPTS/build libXfont
 $SCRIPTS/build libxkbfile
 $SCRIPTS/build libXv
-$SCRIPTS/build libXinerama
 $SCRIPTS/build $LIBDRM
 $SCRIPTS/build $MESA
 $SCRIPTS/build openssl
@@ -30,6 +29,13 @@ $SCRIPTS/build fontsproto
 $SCRIPTS/build xf86bigfontproto
 $SCRIPTS/build udev
 
+if test "$XINERAMA_SUPPORT" = "yes" ; then
+  $SCRIPTS/build libXinerama
+  XORG_XINERAMA="--enable-xinerama"
+else
+  XORG_XINERAMA="--disable-xinerama"
+fi
+
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -50,7 +56,7 @@ cd $PKG_BUILD
             --enable-glx-tls \
             --enable-registry \
             --disable-composite \
-            --enable-xinerama \
+            $XORG_XINERAMA \
             --enable-mitshm \
             --disable-xres \
             --disable-record \
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index d51ab4067d..a781274106 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -8,12 +8,13 @@ $SCRIPTS/install openssl
 $SCRIPTS/install libX11
 $SCRIPTS/install libXfont
 $SCRIPTS/install libXv
-$SCRIPTS/install libXinerama
 $SCRIPTS/install $LIBDRM
 $SCRIPTS/install $MESA
 $SCRIPTS/install pixman
 $SCRIPTS/install udev
 
+[ "$XINERAMA_SUPPORT" = "yes" ] && $SCRIPTS/install libXinerama
+
 XORG_SRC="$PKG_BUILD/hw/xfree86"
 XORG_DST="$INSTALL/$XORG_PATH_MODULES"
 PKG_DIR=`find $PACKAGES -type d -name $1`

From 624a984d22f41f0461968614ec0f700aacd3ad2d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Thu, 11 Mar 2010 01:28:50 +0100
Subject: [PATCH 6/8] config/options: - build with xinerama support only if we
 build nvidia driver

---
 config/options | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/options b/config/options
index 278b8e4a37..637e060430 100644
--- a/config/options
+++ b/config/options
@@ -81,6 +81,7 @@ get_graphicdrivers() {
 
     if [ $drv = nvidia ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia"
+      XINERAMA_SUPPORT="yes"
     fi
 
   done

From 1c26cbb518238b00f0ff4c83f11b193a4ad07a17 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Thu, 11 Mar 2010 01:51:03 +0100
Subject: [PATCH 7/8] config/options: - cosmetics

---
 config/options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/options b/config/options
index 637e060430..e8f7a42d08 100644
--- a/config/options
+++ b/config/options
@@ -17,7 +17,7 @@ fi
 ROOT=`pwd`
 PROJECT_DIR=$ROOT/projects
 
-# read personal options if available
+# read project options if available
  if [ -f $PROJECT_DIR/$PROJECT/options ]; then
    . $PROJECT_DIR/$PROJECT/options
  fi

From 979cb62219c9ee73a883fcb44aac2bdaaf959906 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Thu, 11 Mar 2010 01:53:00 +0100
Subject: [PATCH 8/8] config/path: - hardcode $STAMPS to $BUILD/.stamps -
 adding support for ~/.openelec config dir for personal settings - adding
 support for ~/.openelec/$PROJECT config dir for personal project settings

---
 config/path | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/config/path b/config/path
index 34de21a595..594d46a366 100644
--- a/config/path
+++ b/config/path
@@ -38,7 +38,7 @@ BUILD=$BUILD_BASE.OpenELEC-$PROJECT.$TARGET_ARCH.$OPENELEC_VERSION
 [ -n "$TARGET_PLATFORM" ] && BUILD=$BUILD.$TARGET_PLATFORM
 PKG_BUILD=$BUILD/$1\[-_][0-9]*
 STAMPS_NOARCH=.stamps
-STAMPS=$BUILD/$STAMPS_NOARCH
+STAMPS=$BUILD/.stamps
 DOCS=DOCS
 TOOLCHAIN=$BUILD/toolchain
 SYSROOT_PREFIX=$ROOT/$TOOLCHAIN/$TARGET_NAME/sysroot
@@ -198,6 +198,15 @@ OPENELEC_SRC=http://sources.geexbox.org/src/$OPENELEC_VERSION
 VERSION_SUFFIX=$TARGET_ARCH
 [ -n "$TARGET_PLATFORM" ] && VERSION_SUFFIX=$TARGET_PLATFORM
 
+# read generic personal options if available
+ if [ -f ~/.openelec/options ]; then
+   . ~/.openelec/options
+ fi
+
+# read project based personal options if available
+ if [ -f ~/.openelec/$PROJECT/options ]; then
+   . ~/.openelec/$PROJECT/options
+ fi
 
 kernel_path() {
   ls -d $ROOT/$BUILD/linux*