change Projectsystem, now generic is the default Project, you can now set your Project only in ~/.openelec, add entertainer as second Mediacenter (only for test at this time).

config/options

@@ -1,6 +1,5 @@
 # Project name
-#PROJECT=generic
-PROJECT=openelec
+PROJECT=generic
 
 # Target system we want to cross compile for (i386/x86_64/powerpc)
 TARGET_ARCH=i386
@@ -53,6 +52,9 @@ LOCAL_CXX=`which g++`
 # Support C++ in toolchain
 TOOLCHAIN_CXX=yes
 
+# Mediacenter to use (elisa, entertainer)
+MEDIACENTER=elisa
+
 # Theme (omc)
 THEME=omc
 
@@ -147,7 +149,7 @@ XORG=yes
 # X.org drivers to use (all/ati/geode/glint/i740/intel/mga/nv/openchrome/
 # radeonhd/s3/s3virge/savage/sis/tdfx/trident/vesa/vmware)
 # Space separated list is supported, e.g. XORG_DRIVERS="ati s3"
-XORG_DRIVERS="intel nv s3 s3virge vesa via"
+XORG_DRIVERS="ati nv vesa openchrome"
 
 # Include nVidia proprietary X.Org video driver
 NVIDIA=no
@@ -197,47 +199,12 @@ DEVTOOLS=yes
 # verbose compilation mode (yes/no)
 VERBOSE=yes
 
-# modify the framebuffer settings to be VMware compliant (yes/no)
-VMWARE=no
-
 # download new sources when url file is updated (yes/no/ask)
 AUTOUPDATE=ask
 
-
-# Burning options
-
-# device (ex: 0,0,0). See the output of cdrecord -scanbus.
-BURNER=/dev/cdrw
-
-# blank the CD-RW before burning (yes/no)
-BLANK=yes
-
-# you can also pass options to cdrecord :
-CDRECORD_OPTS=
-
-
-# PXE boot options (nfs/smb)
-DEFAULT_PXE="nfs"
-
-DEFAULT_NFS_SERVER=192.168.0.2
-DEFAULT_NFS_DIR=/tftpboot/GEEXBOX
-
-DEFAULT_SMB_SERVER=192.168.0.2
-DEFAULT_SMB_DIR=/GEEXBOX
-DEFAULT_SMB_USER=""
-DEFAULT_SMB_PWD=""
-
-
 # Concurrency make level (-j option)
 #  Try value 1 (default) to 4 on single CPU computer, or more on
 #  multi-processor computer (like hyperthreading SMP CPU)
 CONCURRENCY_MAKE_LEVEL=1
 
-# read project spezific options
-test -f "projects/$PROJECT/options" && . "projects/$PROJECT/options"
-
-# read personal options if available
-test -f "$HOME/.openelec/projects/$PROJECT/options" \
-  && . "$HOME/.openelec/projects/$PROJECT/options"
-
 . config/path

config/path

@@ -20,7 +20,7 @@ STAMPS_NOARCH=.stamps
 STAMPS=$BUILD/$STAMPS_NOARCH
 DOCS=DOCS
 ROOT=`pwd`
-PROJECT_DIR=$ROOT/projects
+PROJECT_DIR=$HOME/.openelec/
 TOOLCHAIN=$BUILD/toolchain
 SYSROOT_PREFIX=$ROOT/$TOOLCHAIN/$TARGET_NAME/sysroot
 LIB_PREFIX=$SYSROOT_PREFIX/usr
@@ -195,3 +195,7 @@ require_cxx() {
 }
 
 INCLUDED_LANGS="en $MENU_LANG $INCLUDED_LANGS"
+
+# read personal options if available
+test -f "$PROJECT_DIR/options" \
+  && . "$PROJECT_DIR/options"

packages/audio/libogg/build

@@ -9,11 +9,11 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --enable-static \
-            --disable-shared \
+            --disable-static \
+            --enable-shared \
 
 $MAKE
 
-#$STRIP src/.libs/libogg*.so*
+$STRIP src/.libs/libogg*.so*
 
 $MAKEINSTALL

packages/audio/libogg/install

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options
+
+mkdir -p $INSTALL/usr/lib
+cp -PR $BUILD/$1*/src/.libs/libogg*.so* $INSTALL/usr/lib

packages/audio/libvorbis/build

@@ -10,12 +10,12 @@ cd $BUILD/$1*
             --build=$HOST_NAME \
             --prefix=/usr \
             --sysconfdir=/etc \
-            --enable-static \
-            --disable-shared \
+            --disable-static \
+            --enable-shared \
             --with-ogg=$SYSROOT_PREFIX/usr
 
 $MAKE
 
-#$STRIP lib/.libs/libvorbis*.so*
+$STRIP lib/.libs/libvorbis*.so*
 
 $MAKEINSTALL

packages/linux/unpack

@@ -15,10 +15,9 @@ make -C $LINUX ARCH=$TARGET_ARCH INSTALL_HDR_PATH=dest headers_install
 
 test -f "config/projects/$PROJECT/options" && 
 
-#KERNEL_CFG_FILE=$PKG_DIR/config/$1.$TARGET_ARCH.conf
-[ -f $PROJECT_DIR/$PROJECT/$1/$1.$TARGET_ARCH.conf ] && \
-  KERNEL_CFG_FILE=$PROJECT_DIR/$PROJECT/$1/$1.$TARGET_ARCH.conf || \
-  KERNEL_CFG_FILE=$PROJECT_DIR/generic/$1/$1.$TARGET_ARCH.conf
+[ -f $PROJECT_DIR/$1/$1.$TARGET_ARCH.conf ] && \
+  KERNEL_CFG_FILE=$PROJECT_DIR/$1/$1.$TARGET_ARCH.conf || \
+  KERNEL_CFG_FILE=$PKG_DIR/config/$1.$TARGET_ARCH.conf
 
 sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $HOST_CC|" \
        -e "s|^HOSTCXX[[:space:]]*=.*$|HOSTCXX = $HOST_CXX|" \

packages/multimedia/gst-plugins-base/install

@@ -4,6 +4,8 @@
 
 $SCRIPTS/install gstreamer
 $SCRIPTS/install alsa-lib
+$SCRIPTS/install libogg
+$SCRIPTS/install libvorbis
 
 mkdir -p $INSTALL/usr/lib
 cp -PR `find $BUILD/$1*/gst-libs -name *.so*` $INSTALL/usr/lib

packages/multimedia/gst-plugins-good/build

@@ -113,7 +113,6 @@ cd $BUILD/$1*
 
 make
 
-
 $STRIP `find ext gst gst-libs sys -name *.so*`
 
 $MAKEINSTALL

packages/python/multimedia/elisa/install

@@ -2,6 +2,8 @@
 
 . config/options
 
+PKG_DIR=`find $PACKAGES -type d -name $1`
+
 $SCRIPTS/install Python
 $SCRIPTS/install pigment-python
 $SCRIPTS/install TwistedCore
@@ -21,3 +23,10 @@ $SCRIPTS/install pyOpenSSL
 $SCRIPTS/install liberation-fonts
 
 cp -PR $BUILD/$1*/.install/* $INSTALL
+
+mkdir -p $INSTALL/etc/X11/xinit/xinitrc.d
+cp -PR $PKG_DIR/scripts/xinitrc.d/* $INSTALL/etc/X11/xinit/xinitrc.d
+
+$SCRIPTS/install elisa-plugins-good
+$SCRIPTS/install elisa-plugins-bad
+$SCRIPTS/install elisa-plugins-ugly

packages/python/multimedia/entertainer/build

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+$SCRIPTS/build Python
+$SCRIPTS/build pyclutter
+$SCRIPTS/build setuptools
+
+. config/options.python
+
+PYTHON_LIB_DIR=`ls -d $SYSROOT_PREFIX/usr/lib/python*`
+
+cd $BUILD/$1*
+
+# dirty hack for not existing file
+touch docs/LICENSE
+
+$PYTHON setup.py build
+$PYTHON setup.py install -O1 --skip-build --prefix /usr --root .install
+
+find .install -name "*.py" -type f -exec rm -rf "{}" ";"
+find .install -name "*.pyo" -type f -exec rm -rf "{}" ";"
+
+rm -rf .install/usr/share/{applications,entertainer/docs,man}

packages/python/multimedia/entertainer/install

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/install Python
+$SCRIPTS/install pyclutter
+$SCRIPTS/install pygtk
+$SCRIPTS/install pygobject
+$SCRIPTS/install pycairo
+
+$SCRIPTS/install gst-python
+$SCRIPTS/install TwistedCore
+$SCRIPTS/install pysqlite
+$SCRIPTS/install Imaging
+$SCRIPTS/install CDDB
+$SCRIPTS/install eyeD3
+$SCRIPTS/install feedparser
+$SCRIPTS/install IMDbPY
+$SCRIPTS/install pyvorbis
+
+PKG_DIR=`find $PACKAGES -type d -name $1`
+
+cp -PR $BUILD/$1*/.install/* $INSTALL
+
+mkdir -p $INSTALL/etc/X11/xinit/xinitrc.d
+cp -PR $PKG_DIR/scripts/xinitrc.d/* $INSTALL/etc/X11/xinit/xinitrc.d

packages/python/multimedia/entertainer/scripts/xinitrc.d/99_entertainer

@@ -0,0 +1,17 @@
+################################################################################
+# Start entertainer.
+#
+# The entertainer program (not the window manager) is the application that runs in the
+# foreground because it is the only application that we can be sure will be
+# running.
+################################################################################
+
+. /etc/sysconfig
+
+args=""
+
+if /usr/bin/test "${DEBUG}" = "yes" ; then
+  /usr/bin/entertainer 2> $LOGFILE
+else
+  /usr/bin/entertainer > /dev/null 2>&1
+fi

packages/python/multimedia/entertainer/url

@@ -0,0 +1 @@
+http://sources.openelec.tv/svn/entertainer-lp-20090401.tar.bz2

packages/python/multimedia/mutagen/build

@@ -18,5 +18,4 @@ find .install -name "*.pyo" -type f -exec rm -rf "{}" ";"
 
 rm -rf .install/usr/lib/python*/site-packages/tests
 rm -rf .install/usr/bin
-rm -rf .install/usr/share
-
+rm -rf .install/usr/share

packages/python/other/CDDB/build

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. config/options
+
+$SCRIPTS/build toolchain
+$SCRIPTS/build Python
+
+. config/options.python
+
+cd $BUILD/$1*
+$PYTHON setup.py install --prefix /usr --root .install
+
+find .install -name "*.py" -exec rm -rf "{}" ";"