merging branch devel

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
@@ -81,6 +81,7 @@ get_graphicdrivers() {
 
     if [ $drv = nvidia ]; then
       XORG_DRIVERS="$XORG_DRIVERS nvidia"
+      XINERAMA_SUPPORT="yes"
     fi
 
   done

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
@@ -195,19 +195,18 @@ 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
+# read generic personal options if available
-GENERATOR_NAME=geexbox-generator-$GEEXBOX_VERSION.$VERSION_SUFFIX
+ if [ -f ~/.openelec/options ]; then
-PXE_NAME=geexbox-pxe/GEEXBOX.$VERSION_SUFFIX
+   . ~/.openelec/options
-VMX_NAME=geexbox-vmx
+ 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*

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

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

packages/x11/lib/libXinerama/url

@@ -0,0 +1 @@
+http://xorg.freedesktop.org/archive/individual/lib/libXinerama-1.1.tar.bz2

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

packages/x11/proto/xineramaproto/url

@@ -0,0 +1 @@
+http://xorg.freedesktop.org/archive/individual/proto/xineramaproto-1.2.tar.bz2

packages/x11/xserver/xorg-server/build

@@ -29,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 \
@@ -49,7 +56,7 @@ cd $PKG_BUILD
             --enable-glx-tls \
             --enable-registry \
             --disable-composite \
-            --disable-xinerama \
+            $XORG_XINERAMA \
             --enable-mitshm \
             --disable-xres \
             --disable-record \

packages/x11/xserver/xorg-server/install

@@ -13,6 +13,8 @@ $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`