projects/options:

- big rework of projects/*/options, config/options, config/path.
- most configurable options now under project folder

config/options

@@ -1,125 +1,82 @@
 # Project name
 PROJECT=${PROJECT}
 
-MESA=Mesa
+ROOT=`pwd`
-LIBDRM=libdrm
+PROJECT_DIR=$ROOT/projects
-DRIDRIVERS="swrast,unichrome,r200,r300,radeon,i810,i915,i965"
 
-# Target system we want to cross compile for (i386/x86_64/powerpc)
+# read personal options if available
-TARGET_ARCH=i386
+ if [ -f $PROJECT_DIR/$PROJECT/options ]; then
-
+ . $PROJECT_DIR/$PROJECT/options
-# Target platform we want to run GeeXboX on (keep it blank for generic)
+ fi
-# Available: linutop/easygate/eeepc
-TARGET_PLATFORM=
-
-# The TARGET_CPU variable controls which processor should be targeted for
-# generated code.
-case $TARGET_ARCH in
-  i386)
-    # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
-    #               athlon-fx athlon-mp athlon-xp athlon-4
-    #               athlon-tbird athlon k6-3 k6-2 k6 geode
-    # (Intel CPUs)  core2 nocona prescott pentium4[m] pentium3[m] pentium-m
-    #               pentium2 pentiumpro pentium-mmx pentium
-    #               i686 i586 i486 i386
-    # (VIA CPUs)    c3 c3-2
-    #
-    #TARGET_CPU=i686
-    ;;
-
-  x86_64)
-    # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
-    #               athlon-fx amdfam10 barcelona
-    # (Intel CPUs)  core2 nocona
-    #
-    #TARGET_CPU=generic
-    ;;
-esac
-
-# Build optimizations (size/speed)
-OPTIMIZATIONS=size
 
 # Target system library C (uClibc/eglibc)
-TARGET_LIBC=eglibc
+  TARGET_LIBC=eglibc
 
 # Library strip
-LIBSTRIP=yes
+  LIBSTRIP=yes
 
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC don't point to it
-LOCAL_CC=`which gcc`
+  LOCAL_CC=`which gcc`
 
 # Need to point to your actual g++
 # If you have ccache installed, take care that LOCAL_CXX don't point to it
-LOCAL_CXX=`which g++`
+  LOCAL_CXX=`which g++`
 
 # Support C++ in toolchain
-TOOLCHAIN_CXX=yes
+  TOOLCHAIN_CXX=yes
 
-# Menu language (ar/bg/br/ca/cs/de/en/es/et/fi/fr/gr/he/hu/it/nl/no/pl/ro/ru/sk/sr/sv/vn)
+# MESA to use (Mesa / Mesa-master)
-MENU_LANG=de
+  MESA=Mesa-master
 
-# Subtitle charset (ar/bg/br/ca/cs/de/en/es/et/fi/fr/gr/he/hu/it/nl/no/pl/ro/ru/sk/sr/sv/vn)
+# libdrm to use (libdrm / libdrm-master)
-# Can also be set to a charset code (iso-8859-{1,2,6,7,8,9}/windows-125{0,1,3,6}/koi8-r)
+  LIBDRM=libdrm-master
-# when empty it defaults to $MENU_LANG
-SUB_CHARSET=
-
-# Timezone to use (empty disables timezone support)
-# if TARGET_LIBC=uClibc use a TZ environment string
-# if TARGET_LIBC=glibc use a zoneinfo name and remember to set INCLUDED_TIMEZONES accordingly
-TIMEZONE=
-
-# Keymap (qwerty/azerty/qwertz)
-KEYMAP=qwertz
-
-# Remote to Use (pctv/logitech/hauppauge/realmagic/creative/leadtek/
-# leadtek-pvr2000/RM-S6/RX-V850/animax/askey/avermedia/packard_bell/atiusb/
-# atiusb2/LG/D-10/digimatrix/mceusb/streamzap/cinergy1400/nova-s-plus/twinhan/
-# tosh-vt76f/flytv-prime/Medion-X10/imonknob/ultrax/dvico/MCE-X10)
-REMOTE=atiusb
-
-# Remote receiver to use (animax/askey/avermedia/atiusb/atiusb2/creative/
-# hauppauge/homemade/irman/leadtek/leadtek-pvr2000/logitech/pctv/realmagic/
-# digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
-RECEIVER=atiusb
-# 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="ati nouveau nv vesa openchrome intel"
-
-# LCD display support (yes/no)
-LCD4LINUX=yes
-
-# Enable LCD display by default (yes/no)
-LCD_ENABLED=yes
-
-# Select the LCD display model (cf. packages/lcd4linux/config/lcd4linux.conf)
-# (SerDispLib / Trefon / LK204 / MI240 / CW12232 / CF631 / CF632 / CF633 /
-#  HD44780-generic / HD44780-winamp / HD44780-kernelconcepts / SC1602D /
-#  LCM-162 / HD44780-I2C / LCDTerm / SimpleLCD / M50530-24x8 / CT20x4 /
-#  USBLCD / BWCT / T6963-240x64)
-LCD_MODEL=HD44780-winamp
-LCD_WIDTH=16
-LCD_HEIGHT=2
 
 # verbose compilation mode (yes/no)
-VERBOSE=yes
+  VERBOSE=yes
 
 # download new sources when url file is updated (yes/no/ask)
-AUTOUPDATE=ask
+  AUTOUPDATE=ask
 
 # 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
+  CONCURRENCY_MAKE_LEVEL=1
 
-# Select building with Debug Support
+if [ "$MEDIACENTER" = xbmc ]; then
-# (this is on by default if VERSION contains "debug")
+  MESA_GLU=yes
-DEBUG=no
+fi
 
-# Select building of Development and Testtools
+get_graphicdrivers() {
-# (this is on by default if VERSION contains "devel" or "debug")
+  if [ "$GRAPHIC_DRIVERS" = all ]; then
-DEVTOOLS=no
+    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nvidia"
+  fi
 
-. config/path
+  for drv in $GRAPHIC_DRIVERS; do
+    [ $drv = i915 ] && MESA_DRIVERS="$MESA_DRIVERS,i915"
+    [ $drv = i965 ] && MESA_DRIVERS="$MESA_DRIVERS,i965"
+    [ $drv = r200 ] && MESA_DRIVERS="$MESA_DRIVERS,r200"
+    [ $drv = r300 ] && MESA_DRIVERS="$MESA_DRIVERS,r300"
+    [ $drv = r600 ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
+    [ $drv = radeon ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
 
+    if [ $drv = i915 -o $drv = i965 ]; then
+      MESA_CONFIG="$MESA_CONFIG --enable-gallium-intel"
+      XORG_DRIVERS="$XORG_DRIVERS intel"
+      DRM_DRIVERS="$DRM_DRIVERS intel"
+    fi
+
+    if [ $drv = r200 -o $drv = r300 -o $drv = r600 -o  $drv = radeon ]; then
+      MESA_CONFIG="$MESA_CONFIG --enable-gallium-radeon"
+      XORG_DRIVERS="$XORG_DRIVERS ati"
+      DRM_DRIVERS="$DRM_DRIVERS radeon"
+    fi
+
+    if [ $drv = nvidia ]; then
+      XORG_DRIVERS="$XORG_DRIVERS nvidia"
+    fi
+
+  done
+}
+
+. config/path

config/path

@@ -49,8 +49,8 @@ PKG_BUILD=$BUILD/$1\[-_][0-9]*
 STAMPS_NOARCH=.stamps
 STAMPS=$BUILD/$STAMPS_NOARCH
 DOCS=DOCS
-ROOT=`pwd`
+# ROOT=`pwd`
-PROJECT_DIR=$ROOT/projects
+# PROJECT_DIR=$ROOT/projects
 TOOLCHAIN=$BUILD/toolchain
 SYSROOT_PREFIX=$ROOT/$TOOLCHAIN/$TARGET_NAME/sysroot
 LIB_PREFIX=$SYSROOT_PREFIX/usr
@@ -88,7 +88,7 @@ XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 TOOLCHAIN_LANGUAGES=c
 [ "$TOOLCHAIN_CXX" = yes ] && TOOLCHAIN_LANGUAGES=${TOOLCHAIN_LANGUAGES},c++
 
-[ "$OPTIMIZATIONS" = speed ] && GCC_OPTIM="-O3" || GCC_OPTIM="-Os"
+[ "$OPTIMIZATIONS" = speed ] && GCC_OPTIM="-O3 $PROJECT_CFLAGS" || GCC_OPTIM="-Os"
 
 TARGET_CC=${TARGET_PREFIX}gcc
 TARGET_CXX=${TARGET_PREFIX}g++

packages/audio/alsa-utils/build

@@ -4,12 +4,7 @@
 
 $SCRIPTS/build toolchain
 $SCRIPTS/build alsa-lib
-[ "$DEVTOOLS" = yes ] && $SCRIPTS/build ncurses
+$SCRIPTS/build ncurses
-
-ALSAMIXER_CONFIG="--disable-alsamixer"
-ALSATEST_CONFIG="--disable-alsatest"
-[ "$DEVTOOLS" = yes ] && ALSAMIXER_CONFIG="--enable-alsamixer"
-[ "$DEVTOOLS" = yes ] && ALSATEST_CONFIG="--enable-alsatest"
 
 export CPPFLAGS="$CPPFLAGS -I$SYSROOT_PREFIX/usr/include/ncurses"
 export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/usr/lib64 -L$LIB_PREFIX/lib"
@@ -22,20 +17,14 @@ cd $PKG_BUILD
             --localstatedir=/var \
             --disable-dependency-tracking \
             --disable-xmlto \
-            $ALSAMIXER_CONFIG \
+            --enable-alsamixer \
-            $ALSATEST_CONFIG \
+            --enable-alsatest \
             --disable-nls
 
-#sed -i -e 's/^\(man_MANS[ \t]*=[ \t]*\).*$/\1/' alsactl/Makefile.*
-
 make -C amixer
 make -C alsactl
 
-if [ "$DEVTOOLS" = yes ]; then
+make -C alsamixer
-  make -C alsamixer
+make -C aplay
-  make -C aplay
+make -C iecset
-  make -C iecset
+make -C speaker-test
-  make -C speaker-test
-fi
-
-exit 0

packages/audio/alsa-utils/need_unpack

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-STAMP=$STAMPS/$1/unpack
-. $STAMP
-
-test $STAMP_DEVTOOLS != $DEVTOOLS && rm -f $STAMP
-
-exit 0

packages/firmware/install

@@ -12,3 +12,5 @@ for firmware in $FIRMWARE; do
   [ $firmware = iwl6000 ] && $SCRIPTS/install iwlwifi-6000-ucode
 
 done
+
+exit 0

packages/sysutils/busybox/need_unpack

@@ -8,6 +8,6 @@ PKG_DIR=`find $PACKAGES -type d -name $1`
 . $STAMP
 
 test $PKG_DIR/config/$1.conf -nt $STAMP && rm -f $STAMP
-test $STAMP_DEVTOOLS != $DEVTOOLS && rm -f $STAMP
+# test $STAMP_DEVTOOLS != $DEVTOOLS && rm -f $STAMP
 
 exit 0

projects/ION/options

@@ -8,27 +8,60 @@
 # Root password to integrate in the target system
   ROOT_PASSWORD="openelec"
 
+# Target system we want to cross compile for (i386/x86_64/powerpc)
+  TARGET_ARCH="i386"
+
+# The TARGET_CPU variable controls which processor should be targeted for
+# generated code.
+  case $TARGET_ARCH in
+    i386)
+      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
+      #               athlon-fx athlon-mp athlon-xp athlon-4
+      #               athlon-tbird athlon k6-3 k6-2 k6 geode
+      # (Intel CPUs)  core2 nocona prescott pentium4[m] pentium3[m] pentium-m
+      #               pentium2 pentiumpro pentium-mmx pentium
+      #               i686 i586 i486 i386
+      # (VIA CPUs)    c3 c3-2
+      #
+      #TARGET_CPU="i686"
+      ;;
+
+    x86_64)
+      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
+      #               athlon-fx amdfam10 barcelona
+      # (Intel CPUs)  core2 nocona
+      #
+      #TARGET_CPU="generic"
+      ;;
+  esac
+
+# Build optimizations (size/speed)
+  OPTIMIZATIONS="speed"
+
+# Project CFLAGS
+  PROJECT_CFLAGS="-mmmx -msse -msse2 -msse3 -mssse3 -mfpmath=sse"
+
 # Timezone to use (empty disables timezone support)
 # use a TZ environment string
-  TIMEZONE=
+  TIMEZONE=""
 
 # Mediacenter tu use (xbmc)
-  MEDIACENTER=xbmc
+  MEDIACENTER="xbmc"
 
 # Skins to install (Vision2)
-  SKINS=Vision2
+  SKINS="Vision2"
 
 # build with network support (yes / no)
-  NETWORK=yes
+  NETWORK="yes"
 
 # build and install Samba Server (yes / no)
-  SAMBA_SERVER=yes
+  SAMBA_SERVER="yes"
 
 # todo (need for vdr?)
-  SERVICES=yes
+  SERVICES="yes"
 
 # Displayserver to use (xorg-server / no)
-  DISPLAYSERVER=xorg-server
+  DISPLAYSERVER="xorg-server"
 
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nouveau)
 # Space separated list is supported, 
@@ -38,98 +71,35 @@
 # Use internal or external ffmpeg. Internal means included ffmpeg in XBMC,
 # external means seperate ffmpeg library. External ffmpeg is needed for
 # multithreading support and future vaapi support (internal / external)
-  FFMPEG=internal
+  FFMPEG="internal"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
-  VDPAU=yes
+  VDPAU="yes"
 
 # Use VAAPI video acceleration (needs intel i965 driver and a supported card)
-  VAAPI=no
+  VAAPI="no"
 
 # Remote to Use (pctv/logitech/hauppauge/realmagic/creative/leadtek/
 # leadtek-pvr2000/RM-S6/RX-V850/animax/askey/avermedia/packard_bell/atiusb/
 # atiusb2/LG/D-10/digimatrix/mceusb/streamzap/cinergy1400/nova-s-plus/twinhan/
 # tosh-vt76f/flytv-prime/Medion-X10/imonknob/ultrax/dvico/MCE-X10)
-  REMOTE=mceusb
+  REMOTE="mceusb"
 
 # Remote receiver to use (animax/askey/avermedia/atiusb/atiusb2/creative/
 # hauppauge/homemade/irman/leadtek/leadtek-pvr2000/logitech/pctv/realmagic/
 # digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
-  RECEIVER=mceusb
+  RECEIVER="mceusb"
 
 # Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000)
 # Space separated list is supported, 
 # e.g. FIRMWARE="iwl3945 iwl5000"
   FIRMWARE=""
 
-# Locales to include in the ISO
-# can be empty or a list of locale names
-# e.g. "en_US.ISO-8859-1 it_IT.UTF-8"
-# used only when TARGET_LIBC=glibc
-  INCLUDED_LOCALES=
-
-# Default locale to use (empty disables locale support)
-# remember to set INCLUDED_LOCALES accordingly
-# used only when TARGET_LIBC=glibc
-  DEFAULT_LOCALE=
-
-# Timezones to include in the ISO
-# can be empty, "all" or a list of zoneinfo names
-# e.g. "Europe/Rome GMT Africa America/Kentucky"
-# used only when TARGET_LIBC=glibc
-  INCLUDED_TIMEZONES=all
-
-# MESA to use (Mesa / Mesa-master)
-  MESA=Mesa-master
-
-# libdrm to use (libdrm / libdrm-master)
-  LIBDRM=libdrm-master
-
 # build with games support (yes / no)
-  GAMES=no
+  GAMES="no"
 
 # build with emulator support (yes / no)
-  EMULATORS=no
+  EMULATORS="no"
 
 # Coreboot support (yes / no)
-  COREBOOT=no
+  COREBOOT="no"
-
-#####################################################################
-## Do not change anything below this line
-#####################################################################
-
-if [ "$MEDIACENTER" = xbmc ]; then
-  MESA_GLU=yes
-fi
-
-get_graphicdrivers() {
-  if [ "$GRAPHIC_DRIVERS" = all ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nvidia"
-  fi
-
-  for drv in $GRAPHIC_DRIVERS; do
-    [ $drv = i915 ] && MESA_DRIVERS="$MESA_DRIVERS,i915"
-    [ $drv = i965 ] && MESA_DRIVERS="$MESA_DRIVERS,i965"
-    [ $drv = r200 ] && MESA_DRIVERS="$MESA_DRIVERS,r200"
-    [ $drv = r300 ] && MESA_DRIVERS="$MESA_DRIVERS,r300"
-    [ $drv = r600 ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
-    [ $drv = radeon ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
-
-    if [ $drv = i915 -o $drv = i965 ]; then
-      MESA_CONFIG="$MESA_CONFIG --enable-gallium-intel"
-      XORG_DRIVERS="$XORG_DRIVERS intel"
-      DRM_DRIVERS="$DRM_DRIVERS intel"
-    fi
-
-    if [ $drv = r200 -o $drv = r300 -o $drv = r600 -o  $drv = radeon ]; then
-      MESA_CONFIG="$MESA_CONFIG --enable-gallium-radeon"
-      XORG_DRIVERS="$XORG_DRIVERS ati"
-      DRM_DRIVERS="$DRM_DRIVERS radeon"
-    fi
-
-    if [ $drv = nvidia ]; then
-      XORG_DRIVERS="$XORG_DRIVERS nvidia"
-    fi
-
-  done
-}

projects/generic/options

@@ -8,94 +8,98 @@
 # Root password to integrate in the target system
   ROOT_PASSWORD="openelec"
 
+# Target system we want to cross compile for (i386/x86_64/powerpc)
+  TARGET_ARCH="i386"
+
+# The TARGET_CPU variable controls which processor should be targeted for
+# generated code.
+  case $TARGET_ARCH in
+    i386)
+      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
+      #               athlon-fx athlon-mp athlon-xp athlon-4
+      #               athlon-tbird athlon k6-3 k6-2 k6 geode
+      # (Intel CPUs)  core2 nocona prescott pentium4[m] pentium3[m] pentium-m
+      #               pentium2 pentiumpro pentium-mmx pentium
+      #               i686 i586 i486 i386
+      # (VIA CPUs)    c3 c3-2
+      #
+      #TARGET_CPU="i686"
+      ;;
+
+    x86_64)
+      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
+      #               athlon-fx amdfam10 barcelona
+      # (Intel CPUs)  core2 nocona
+      #
+      #TARGET_CPU="generic"
+      ;;
+  esac
+
+# Build optimizations (size/speed)
+  OPTIMIZATIONS="speed"
+
+# Project CFLAGS
+  PROJECT_CFLAGS=""
+
 # Timezone to use (empty disables timezone support)
 # use a TZ environment string
-  TIMEZONE=
+  TIMEZONE=""
 
 # Mediacenter tu use (xbmc)
-  MEDIACENTER=xbmc
+  MEDIACENTER="xbmc"
 
 # Skins to install (Vision2)
-  SKINS=Vision2
+  SKINS="Vision2"
 
 # build with network support (yes / no)
-  NETWORK=yes
+  NETWORK="yes"
 
 # build and install Samba Server (yes / no)
-  SAMBA_SERVER=yes
+  SAMBA_SERVER="yes"
+
+# todo (need for vdr?)
+  SERVICES="yes"
 
 # Displayserver to use (xorg-server / no)
-  DISPLAYSERVER=xorg-server
+  DISPLAYSERVER="xorg-server"
 
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nouveau)
 # Space separated list is supported, 
-# e.g. GRAPHIC_DRIVERS="i915 i965 radeon nouveau"
+# e.g. GRAPHIC_DRIVERS="i915 i965 radeon nvidia"
-  GRAPHIC_DRIVERS="all"
+  GRAPHIC_DRIVERS="i915 i965 nvidia"
+
+# Use internal or external ffmpeg. Internal means included ffmpeg in XBMC,
+# external means seperate ffmpeg library. External ffmpeg is needed for
+# multithreading support and future vaapi support (internal / external)
+  FFMPEG="internal"
+
+# Use VDPAU video acceleration (needs nVidia driver and a supported card)
+  VDPAU="yes"
+
+# Use VAAPI video acceleration (needs intel i965 driver and a supported card)
+  VAAPI="no"
 
 # Remote to Use (pctv/logitech/hauppauge/realmagic/creative/leadtek/
 # leadtek-pvr2000/RM-S6/RX-V850/animax/askey/avermedia/packard_bell/atiusb/
 # atiusb2/LG/D-10/digimatrix/mceusb/streamzap/cinergy1400/nova-s-plus/twinhan/
 # tosh-vt76f/flytv-prime/Medion-X10/imonknob/ultrax/dvico/MCE-X10)
-  REMOTE=mceusb
+  REMOTE="mceusb"
 
 # Remote receiver to use (animax/askey/avermedia/atiusb/atiusb2/creative/
 # hauppauge/homemade/irman/leadtek/leadtek-pvr2000/logitech/pctv/realmagic/
 # digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
-  RECEIVER=mceusb
+  RECEIVER="mceusb"
 
-# MESA to use (Mesa / Mesa-master)
+# Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000)
-  MESA=Mesa-master
+# Space separated list is supported, 
-
+# e.g. FIRMWARE="iwl3945 iwl5000"
-# libdrm to use (libdrm / libdrm-master)
+  FIRMWARE="iwl1000 iwl3945 iwl4965 iwl5000 iwl5150 iwl6000"
-  LIBDRM=libdrm
 
 # build with games support (yes / no)
-  GAMES=no
+  GAMES="no"
 
 # build with emulator support (yes / no)
-  EMULATORS=no
+  EMULATORS="no"
 
 # Coreboot support (yes / no)
-  COREBOOT=no
+  COREBOOT="no"
-
-#####################################################################
-## Do not change anything below this line
-#####################################################################
-
-if [ "$MEDIACENTER" = xbmc ]; then
-  MESA_GLU=yes
-fi
-
-get_graphicdrivers() {
-  if [ "$GRAPHIC_DRIVERS" = all ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nouveau"
-  fi
-
-  for drv in $GRAPHIC_DRIVERS; do
-    [ $drv = i915 ] && MESA_DRIVERS="$MESA_DRIVERS,i915"
-    [ $drv = i965 ] && MESA_DRIVERS="$MESA_DRIVERS,i965"
-    [ $drv = r200 ] && MESA_DRIVERS="$MESA_DRIVERS,r200"
-    [ $drv = r300 ] && MESA_DRIVERS="$MESA_DRIVERS,r300"
-    [ $drv = r600 ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
-    [ $drv = radeon ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
-
-    if [ $drv = i915 -o $drv = i965 ]; then
-      MESA_CONFIG="$MESA_CONFIG --enable-gallium-intel"
-      XORG_DRIVERS="$XORG_DRIVERS intel"
-      DRM_DRIVERS="$DRM_DRIVERS intel"
-    fi
-
-    if [ $drv = r200 -o $drv = r300 -o $drv = r600 -o  $drv = radeon ]; then
-      MESA_CONFIG="$MESA_CONFIG --enable-gallium-radeon"
-      XORG_DRIVERS="$XORG_DRIVERS ati"
-      DRM_DRIVERS="$DRM_DRIVERS radeon"
-    fi
-  
-    if [ $drv = nouveau ]; then
-      MESA_CONFIG="$MESA_CONFIG --enable-gallium-nouveau"
-      XORG_DRIVERS="$XORG_DRIVERS nouveau"
-      DRM_DRIVERS="$DRM_DRIVERS nouveau"
-    fi
-
-  done
-}

projects/intel/options

@@ -8,27 +8,60 @@
 # Root password to integrate in the target system
   ROOT_PASSWORD="openelec"
 
+# Target system we want to cross compile for (i386/x86_64/powerpc)
+  TARGET_ARCH="i386"
+
+# The TARGET_CPU variable controls which processor should be targeted for
+# generated code.
+  case $TARGET_ARCH in
+    i386)
+      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
+      #               athlon-fx athlon-mp athlon-xp athlon-4
+      #               athlon-tbird athlon k6-3 k6-2 k6 geode
+      # (Intel CPUs)  core2 nocona prescott pentium4[m] pentium3[m] pentium-m
+      #               pentium2 pentiumpro pentium-mmx pentium
+      #               i686 i586 i486 i386
+      # (VIA CPUs)    c3 c3-2
+      #
+      TARGET_CPU="core2"
+      ;;
+
+    x86_64)
+      # (AMD CPUs)    k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
+      #               athlon-fx amdfam10 barcelona
+      # (Intel CPUs)  core2 nocona
+      #
+      #TARGET_CPU="generic"
+      ;;
+  esac
+
+# Build optimizations (size/speed)
+  OPTIMIZATIONS="speed"
+
+# Project CFLAGS
+  PROJECT_CFLAGS="-mmmx -msse -msse2 -msse3 -mssse3 -mfpmath=sse"
+
 # Timezone to use (empty disables timezone support)
 # use a TZ environment string
-  TIMEZONE=
+  TIMEZONE=""
 
 # Mediacenter tu use (xbmc)
-  MEDIACENTER=xbmc
+  MEDIACENTER="xbmc"
 
 # Skins to install (Vision2)
-  SKINS=Vision2
+  SKINS="Vision2"
 
 # build with network support (yes / no)
-  NETWORK=yes
+  NETWORK="yes"
 
 # build and install Samba Server (yes / no)
-  SAMBA_SERVER=yes
+  SAMBA_SERVER="yes"
 
 # todo (need for vdr?)
-  SERVICES=yes
+  SERVICES="yes"
 
 # Displayserver to use (xorg-server / no)
-  DISPLAYSERVER=xorg-server
+  DISPLAYSERVER="xorg-server"
 
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nouveau)
 # Space separated list is supported, 
@@ -38,98 +71,35 @@
 # Use internal or external ffmpeg. Internal means included ffmpeg in XBMC,
 # external means seperate ffmpeg library. External ffmpeg is needed for
 # multithreading support and future vaapi support (internal / external)
-  FFMPEG=external
+  FFMPEG="external"
 
 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
-  VDPAU=no
+  VDPAU="no"
 
 # Use VAAPI video acceleration (needs intel i965 driver and a supported card)
-  VAAPI=yes
+  VAAPI="yes"
 
 # Remote to Use (pctv/logitech/hauppauge/realmagic/creative/leadtek/
 # leadtek-pvr2000/RM-S6/RX-V850/animax/askey/avermedia/packard_bell/atiusb/
 # atiusb2/LG/D-10/digimatrix/mceusb/streamzap/cinergy1400/nova-s-plus/twinhan/
 # tosh-vt76f/flytv-prime/Medion-X10/imonknob/ultrax/dvico/MCE-X10)
-  REMOTE=mceusb
+  REMOTE="mceusb"
 
 # Remote receiver to use (animax/askey/avermedia/atiusb/atiusb2/creative/
 # hauppauge/homemade/irman/leadtek/leadtek-pvr2000/logitech/pctv/realmagic/
 # digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
-  RECEIVER=mceusb
+  RECEIVER="mceusb"
 
 # Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000)
 # Space separated list is supported, 
 # e.g. FIRMWARE="iwl3945 iwl5000"
-  FIRMWARE="iwl5000 iwl6000"
+  FIRMWARE="iwl5000"
-
-# Locales to include in the ISO
-# can be empty or a list of locale names
-# e.g. "en_US.ISO-8859-1 it_IT.UTF-8"
-# used only when TARGET_LIBC=glibc
-  INCLUDED_LOCALES=
-
-# Default locale to use (empty disables locale support)
-# remember to set INCLUDED_LOCALES accordingly
-# used only when TARGET_LIBC=glibc
-  DEFAULT_LOCALE=
-
-# Timezones to include in the ISO
-# can be empty, "all" or a list of zoneinfo names
-# e.g. "Europe/Rome GMT Africa America/Kentucky"
-# used only when TARGET_LIBC=glibc
-  INCLUDED_TIMEZONES=all
-
-# MESA to use (Mesa / Mesa-master)
-  MESA=Mesa-master
-
-# libdrm to use (libdrm / libdrm-master)
-  LIBDRM=libdrm-master
 
 # build with games support (yes / no)
-  GAMES=no
+  GAMES="no"
 
 # build with emulator support (yes / no)
-  EMULATORS=no
+  EMULATORS="no"
 
 # Coreboot support (yes / no)
-  COREBOOT=no
+  COREBOOT="no"
-
-#####################################################################
-## Do not change anything below this line
-#####################################################################
-
-if [ "$MEDIACENTER" = xbmc ]; then
-  MESA_GLU=yes
-fi
-
-get_graphicdrivers() {
-  if [ "$GRAPHIC_DRIVERS" = all ]; then
-    GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 radeon nvidia"
-  fi
-
-  for drv in $GRAPHIC_DRIVERS; do
-    [ $drv = i915 ] && MESA_DRIVERS="$MESA_DRIVERS,i915"
-    [ $drv = i965 ] && MESA_DRIVERS="$MESA_DRIVERS,i965"
-    [ $drv = r200 ] && MESA_DRIVERS="$MESA_DRIVERS,r200"
-    [ $drv = r300 ] && MESA_DRIVERS="$MESA_DRIVERS,r300"
-    [ $drv = r600 ] && MESA_DRIVERS="$MESA_DRIVERS,r600"
-    [ $drv = radeon ] && MESA_DRIVERS="$MESA_DRIVERS,radeon"
-
-    if [ $drv = i915 -o $drv = i965 ]; then
-      MESA_CONFIG="$MESA_CONFIG --enable-gallium-intel"
-      XORG_DRIVERS="$XORG_DRIVERS intel"
-      DRM_DRIVERS="$DRM_DRIVERS intel"
-    fi
-
-    if [ $drv = r200 -o $drv = r300 -o $drv = r600 -o  $drv = radeon ]; then
-      MESA_CONFIG="$MESA_CONFIG --enable-gallium-radeon"
-      XORG_DRIVERS="$XORG_DRIVERS ati"
-      DRM_DRIVERS="$DRM_DRIVERS radeon"
-    fi
-
-    if [ $drv = nvidia ]; then
-      XORG_DRIVERS="$XORG_DRIVERS nvidia"
-    fi
-
-  done
-}

scripts/build

@@ -66,8 +66,8 @@ if [ ! -f $STAMP ]; then
     make -C $PKG_BUILD $1 >&$VERBOSE_OUT
   fi
 
-  . $CONFIG/options
+  . $PROJECT_DIR/$PROJECT/options
-  for i in `sed -n "s/^\([^#].*\)=.*$/\1/p" $CONFIG/options | grep -v "#"`; do
+  for i in `sed -n "s/^\([^#].*\)=\".*$/\1/p" $PROJECT_DIR/$PROJECT/options | grep -v "#"`; do
     eval val=\$$i
     echo "STAMP_$i=\"$val\"" >> $STAMP
   done

scripts/unpack

@@ -66,8 +66,8 @@ $SCRIPTS/fixconfigtools $BUILD/$1*
 [ -f $PKG_DIR/unpack ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT
 
 rm -f $STAMPS/$1/build
-. $CONFIG/options
+. $PROJECT_DIR/$PROJECT/options
-for i in `sed -n "s/^\([^#].*\)=.*$/\1/p" $CONFIG/options | grep -v "#"`; do
+for i in `sed -n "s/^\([^#].*\)=\".*$/\1/p" $PROJECT_DIR/$PROJECT/options | grep -v "#"`; do
   eval val=\$$i
   echo "STAMP_$i=\"$val"\" >> $STAMP
 done