Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv into openelec-eden

Conflicts:
	packages/mediacenter/xbmc/build
	packages/mediacenter/xbmc/meta
	projects/Ultra/options

config/release/create_installstick.bat

@@ -1,114 +1,169 @@
 @ECHO OFF
+TITLE OpenELEC USB Installer
+mode con:cols=67 lines=17
+COLOR 17
+SET DRIVE=
+
+:checkPrivileges
+mkdir "%windir%\OEAdminCheck"
+if '%errorlevel%' == '0' (
+rmdir "%windir%\OEAdminCheck" & goto gotPrivileges 
+) else ( goto getPrivileges )
+
+:getPrivileges
 CLS
 ECHO.
+ECHO.
 ECHO                     OpenELEC.tv USB Installer
 ECHO.
 ECHO.
-ECHO ******************************************************
+ECHO  *****************************************************************
 ECHO.
-ECHO This will wipe any data off your chosen drive
+ECHO      Administrator Rights are required for USB Stick creation
-ECHO Please read the instructions and use very carefully...
+ECHO               Invoking UAC for Privilege Escalation
+ECHO.
+ECHO  *****************************************************************
 ECHO.
-ECHO ******************************************************
 ECHO.
 ECHO.
-ECHO. Are you running this USB Wizard for the first time 
-ECHO. on Windows 7 or Windows Vista? [Y/N]
 ECHO.
 ECHO.
 
-SET /P OS= --
+ECHO Set UAC = CreateObject^("Shell.Application"^) > "%temp%\OEgetPrivileges.vbs"
-IF "%OS%"=="n" GOTO INSTALL 
+ECHO UAC.ShellExecute %0, "", "", "runas", 1 >> "%temp%\OEgetPrivileges.vbs"
-IF "%OS%"=="N" GOTO INSTALL 
+"%temp%\OEgetPrivileges.vbs"
+exit /B
 
-:NOTES
+:gotPrivileges
-CLS
+if exist "%temp%\OEgetPrivileges.vbs" ( del "%temp%\OEgetPrivileges.vbs" )
-ECHO.
+pushd "%CD%"      
-ECHO ******************************************************
+CD /D "%~dp0"
-ECHO. 
-ECHO.
-ECHO Due to UAC in Windows 7 / Windows Vista we need to run
-ECHO syslinux.exe as 'Administrator'
-ECHO.
-ECHO After pressing any key the folder containing syslinux.exe
-ECHO will pop up automatically.
-ECHO.
-ECHO 1. Right click on syslinux.exe
-ECHO 2. Click on 'Properties' 
-ECHO 3. Change to the 'Compatibility' tab
-ECHO 4. Check the 'Run this program as an administrator' checkbox
-ECHO.
-ECHO.
-ECHO.
-ECHO ******************************************************
-ECHO.
-ECHO Press any key to open the syslinux directory
-ECHO.
-pause >NUL
-explorer "%CD%\3rdparty\syslinux\win32"
-ECHO When finished changing the administrator rights,
-ECHO please press any key to continue with the installation
-pause >NUL
-GOTO :INSTALL 
 
-:INSTALL
+:HashCheck
 3rdparty\md5sum\md5sum.exe -c "%CD%\target\SYSTEM.md5"
-IF ERRORLEVEL 1 GOTO BADMD5
+IF ERRORLEVEL 1 GOTO BadMD5
 3rdparty\md5sum\md5sum.exe -c "%CD%\target\KERNEL.md5"
-IF ERRORLEVEL 1 GOTO BADMD5
+IF ERRORLEVEL 1 GOTO BadMD5
+
+:InstallOE
 CLS
 ECHO.
+ECHO.
 ECHO                     OpenELEC.tv USB Installer
 ECHO.
 ECHO.
-ECHO ******************************************************
+ECHO  *****************************************************************
 ECHO.
-ECHO This will wipe any data off your chosen drive
+ECHO          This WILL wipe ALL data off the selected drive
-ECHO Please read the instructions and use very carefully...
+ECHO                      Please use carefully...
 ECHO.
-ECHO ******************************************************
+ECHO  *****************************************************************
 ECHO.
 ECHO.
+
+:SelectDrive
 ECHO Enter USB Drive letter
 ECHO eg. d:
 ECHO.
 
 SET /P DRIVE= -- 
-if %DRIVE%!==! goto INSTALL
+IF NOT DEFINED DRIVE goto InvalidDrive
-format %DRIVE% /V:OPENELEC /Q /FS:FAT32
+if %DRIVE%==c: goto InvalidDrive
-3rdparty\syslinux\win32\syslinux.exe -f -m -a %DRIVE%
+if %DRIVE%==C: goto InvalidDrive
-ECHO Copying necessary files to %DRIVE%
-copy target\* %DRIVE%
-copy Autorun.inf %DRIVE%
-copy CHANGELOG %DRIVE%
-copy INSTALL %DRIVE%
-copy README %DRIVE%
-copy RELEASE %DRIVE%
-copy openelec.ico %DRIVE%
-FOR /F "tokens=5" %%G IN ('vol %DRIVE% ^|find "-"') DO SET DRIVEUUID=%%G
-echo DEFAULT linux > %DRIVE%\syslinux.cfg
-echo PROMPT 0 >> %DRIVE%\syslinux.cfg
-echo. >> %DRIVE%\syslinux.cfg
-echo LABEL linux >> %DRIVE%\syslinux.cfg
-echo KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
-echo APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg
-GOTO END
 
-:BADMD5
 CLS
 ECHO.
 ECHO.
-ECHO  ***** OpenELEC.tv failed md5 check - Installation will quit *****
+ECHO                     OpenELEC.tv USB Installer
+ECHO.
+ECHO.
+ECHO  *****************************************************************
+ECHO.
+ECHO                     Installing OpenELEC to %DRIVE%
+ECHO              Please wait approximately 20 seconds...
+ECHO.
+ECHO  *****************************************************************
 ECHO.
 ECHO.
 ECHO.
-ECHO          Your original download was probably corrupt.
+ECHO.
-ECHO          Please visit www.openelec.tv and get another copy
+ECHO.
+
+ECHO. | >NUL format %DRIVE% /V:OPENELEC /Q /FS:FAT32 /X
+IF ERRORLEVEL 1 goto InvalidDrive
+>NUL 3rdparty\syslinux\win32\syslinux.exe -f -m -a %DRIVE%
+>NUL copy target\* %DRIVE%
+>NUL copy Autorun.inf %DRIVE%
+>NUL copy CHANGELOG %DRIVE%
+>NUL copy INSTALL %DRIVE%
+>NUL copy README %DRIVE%
+>NUL copy RELEASE %DRIVE%
+>NUL copy openelec.ico %DRIVE%
+FOR /F "tokens=5" %%G IN ('vol %DRIVE% ^|find "-"') DO SET DRIVEUUID=%%G
+ECHO DEFAULT linux > %DRIVE%\syslinux.cfg
+ECHO PROMPT 0 >> %DRIVE%\syslinux.cfg
+ECHO. >> %DRIVE%\syslinux.cfg
+ECHO LABEL linux >> %DRIVE%\syslinux.cfg
+ECHO KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
+ECHO APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg
+GOTO END
+
+:InvalidDrive
+CLS
+ECHO.
+ECHO.
+ECHO                     OpenELEC.tv USB Installer
+ECHO.
+ECHO.
+ECHO  *****************************************************************
+ECHO.
+ECHO                     Invalid Drive Selected...
+ECHO         Please confirm the drive letter of your USB stick
+ECHO.
+ECHO  *****************************************************************
+ECHO.
+ECHO.
+GOTO SelectDrive
+
+:BadMD5
+CLS
+ECHO.
+ECHO.
+ECHO                     OpenELEC.tv USB Installer
+ECHO.
+ECHO.
+ECHO  *****************************************************************
+ECHO.
+ECHO     OpenELEC.tv failed md5 check - Installation will now quit
+ECHO.
+ECHO             Your original download is probably corrupt
+ECHO       Please visit www.openelec.tv and download another copy
+ECHO.
+ECHO  *****************************************************************
+ECHO.
 ECHO.
 ECHO.
 PAUSE
+EXIT
 
 :END
+CLS
+ECHO.
+ECHO.
+ECHO                     OpenELEC.tv USB Installer
+ECHO.
+ECHO.
+ECHO  *****************************************************************
+ECHO.
+ECHO    The OpenELEC USB Installer has been successfully copied to %DRIVE%
+ECHO             Please boot your HTPC off this USB stick
+ECHO.
+ECHO  *****************************************************************
+ECHO.
+ECHO.
+ECHO.
+ECHO.
+
 SET DRIVE=
-SET OS=
 SET DRIVEUUID=
+PAUSE

packages/mediacenter/xbmc/build

@@ -52,6 +52,12 @@ else
   XBMC_DVDCSS="--disable-dvdcss"
 fi
 
+if [ "$BLURAY_SUPPORT" = yes ]; then
+  XBMC_BLURAY="--enable-libbluray"
+else
+  XBMC_BLURAY="--disable-libbluray"
+fi
+
 if [ "$AVAHI_DAEMON" = yes ]; then
   XBMC_AVAHI="--enable-avahi"
 else
@@ -68,6 +74,11 @@ if [ "$AFP_SUPPORT" = yes ]; then
   XBMC_AFP="--enable-afpclient"
 else
   XBMC_AFP="--disable-afpclient"
+
+if [ "$SAMBA_CLIENT" = yes ]; then
+  XBMC_SAMBA="--enable-samba"
+else
+  XBMC_SAMBA="--disable-samba"
 fi
 
 if [ "$WEBSERVER" = yes ]; then
@@ -177,6 +188,7 @@ cd $PKG_BUILD
             --enable-rtmp \
             $XBMC_NFS \
             $XBMC_AFP \
+            $XBMC_SAMBA \
             --enable-ffmpeg-libvorbis \
             --enable-lame \
             $XBMC_DVDCSS \
@@ -186,10 +198,16 @@ cd $PKG_BUILD
             $XBMC_NONFREE \
             --disable-asap-codec \
             $XBMC_WEBSERVER \
+<<<<<<< HEAD
             --enable-optical-drive \
             --enable-libbluray \
             --enable-texturepacker \
             --disable-external-libraries \
+=======
+            --disable-libdts \
+            --disable-liba52 \
+            $XBMC_BLURAY \
+>>>>>>> 8c05f3c4f8219cd1d7543041e180d64933df95fd
             --disable-external-ffmpeg \
 
 # setup default skin inside the sources

packages/mediacenter/xbmc/meta

@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba alsa bc xbmc-addon-settings"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 SDL SDL_mixer SDL_image sqlite mysql alsa bc xbmc-addon-settings"
-PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 libbluray SDL SDL_mixer SDL_image yajl sqlite mysql samba"
+PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 SDL SDL_mixer SDL_image sqlite mysql"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="xbmc: XBMC Mediacenter"
@@ -57,6 +57,11 @@ if [ "$FAAC_SUPPORT" = yes ]; then
   PKG_DEPENDS="$PKG_DEPENDS faac"
 fi
 
+if [ "$BLURAY_SUPPORT" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libbluray"
+  PKG_DEPENDS="$PKG_DEPENDS libbluray"
+fi
+
 if [ "$AVAHI_DAEMON" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS avahi"
   PKG_DEPENDS="$PKG_DEPENDS avahi"
@@ -70,6 +75,10 @@ fi
 if [ "$AFP_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS afpfs-ng"
   PKG_DEPENDS="$PKG_DEPENDS afpfs-ng"
+
+if [ "$SAMBA_CLIENT" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS samba"
+  PKG_DEPENDS="$PKG_DEPENDS samba"
 fi
 
 if [ "$WEBSERVER" = yes ]; then

packages/mediacenter/xbmc/patches/xbmc-8cb8ae1-203-let_select_Samba-0.1.patch

@@ -0,0 +1,147 @@
+diff -Naur xbmc-8cb8ae1/configure.in xbmc-8cb8ae1.patch/configure.in
+--- xbmc-8cb8ae1/configure.in	2011-09-14 19:15:24.254033004 +0200
++++ xbmc-8cb8ae1.patch/configure.in	2011-09-14 19:30:06.249526898 +0200
+@@ -111,6 +111,8 @@
+ libnfs_disabled="== NFS support disabled. =="
+ libafpclient_not_found="== Could not find libafpclient. AFP support disabled. =="
+ libafpclient_disabled="== AFP support disabled. =="
++samba_not_found="== Could not find libsmbclient. SAMBA support disabled. =="
++samba_disabled="== SAMBA support disabled. =="
+ alsa_not_found="== Could not find ALSA. ALSA support disabled. =="
+ dbus_not_found="== Could not find DBUS. DBUS support disabled. =="
+ 
+@@ -270,6 +272,12 @@
+   [use_librtmp=$enableval],
+   [use_librtmp=auto])
+ 
++AC_ARG_ENABLE([samba],
++  [AS_HELP_STRING([--disable-samba],
++  [disable SAMBA support (default is enabled if libsmbclient is found)])],
++  [use_samba=$enableval],
++  [use_samba=yes])
++
+ AC_ARG_ENABLE([nfs],
+   [AS_HELP_STRING([--enable-nfs],
+   [enable NFS support via libnfs (default is auto)])],
+@@ -655,7 +663,6 @@
+ AC_CHECK_LIB([ssl],         [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([ssh],         [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
+-AC_CHECK_LIB([smbclient],   [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([bluetooth],   [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth]))
+ AC_CHECK_LIB([yajl],        [main],, AC_MSG_ERROR($missing_library))
+ 
+@@ -942,6 +949,18 @@
+   AC_MSG_NOTICE($librtmp_disabled)
+ fi
+ 
++# samba
++if test "$use_samba" = "yes"; then
++  AC_CHECK_LIB([smbclient], [main],,
++    use_samba=no;AC_MSG_RESULT($samba_not_found))
++else
++  AC_MSG_RESULT($samba_disabled)
++fi
++
++if test "$use_samba" = "yes"; then
++  AC_DEFINE([HAVE_LIBSMBCLIENT], [1], [Define to 1 if you have Samba installed])
++fi
++
+ # libnfs
+ if test "$use_libnfs" != "no"; then
+   AC_CHECK_HEADERS([nfsc/libnfs.h],,
+@@ -1563,6 +1582,12 @@
+   final_message="$final_message\n  libRTMP support:\tNo"
+ fi
+ 
++if test "$use_samba" = "yes"; then
++  final_message="$final_message\n  Samba:\tYes"
++else
++  final_message="$final_message\n  Samba:\tNo"
++fi
++
+ if test "$use_libnfs" != "no"; then
+   final_message="$final_message\n  libnfs support:\tYes"
+ else
+diff -Naur xbmc-8cb8ae1/xbmc/dialogs/GUIDialogMediaSource.cpp xbmc-8cb8ae1.patch/xbmc/dialogs/GUIDialogMediaSource.cpp
+--- xbmc-8cb8ae1/xbmc/dialogs/GUIDialogMediaSource.cpp	2011-09-13 05:37:49.000000000 +0200
++++ xbmc-8cb8ae1.patch/xbmc/dialogs/GUIDialogMediaSource.cpp	2011-09-14 19:18:27.456425046 +0200
+@@ -237,9 +237,11 @@
+     share1.m_ignore = true;
+     extraShares.push_back(share1);
+ 
++#ifdef HAS_FILESYSTEM_SMB
+     share1.strPath = "smb://";
+     share1.strName = g_localizeStrings.Get(20171);
+     extraShares.push_back(share1);
++#endif
+ 
+ #ifdef HAS_FILESYSTEM_NFS
+     share1.strPath = "nfs://";
+@@ -285,9 +287,11 @@
+     share1.strName = "ReplayTV Devices";
+     extraShares.push_back(share1);
+ 
++#ifdef HAS_FILESYSTEM_SMB
+     share1.strPath = "smb://";
+     share1.strName = g_localizeStrings.Get(20171);
+     extraShares.push_back(share1);
++#endif
+ 
+ #ifdef HAS_FILESYSTEM_NFS
+     share1.strPath = "nfs://";
+@@ -322,9 +326,11 @@
+       extraShares.push_back(share1);
+     }
+ 
++#ifdef HAS_FILESYSTEM_SMB
+     share1.strPath = "smb://";
+     share1.strName = g_localizeStrings.Get(20171);
+     extraShares.push_back(share1);
++#endif
+ 
+ #ifdef HAS_FILESYSTEM_NFS
+     share1.strPath = "nfs://";
+diff -Naur xbmc-8cb8ae1/xbmc/network/GUIDialogNetworkSetup.cpp xbmc-8cb8ae1.patch/xbmc/network/GUIDialogNetworkSetup.cpp
+--- xbmc-8cb8ae1/xbmc/network/GUIDialogNetworkSetup.cpp	2011-09-13 05:37:54.000000000 +0200
++++ xbmc-8cb8ae1.patch/xbmc/network/GUIDialogNetworkSetup.cpp	2011-09-14 19:18:45.745663929 +0200
+@@ -127,7 +127,9 @@
+     return;
+ 
+   pSpin->Clear();
++#ifdef HAS_FILESYSTEM_SMB
+   pSpin->AddLabel(g_localizeStrings.Get(20171), NET_PROTOCOL_SMB);
++#endif
+   pSpin->AddLabel(g_localizeStrings.Get(20256), NET_PROTOCOL_HTSP);
+   pSpin->AddLabel(g_localizeStrings.Get(20257), NET_PROTOCOL_VTP);
+   pSpin->AddLabel(g_localizeStrings.Get(20258), NET_PROTOCOL_MYTH);
+diff -Naur xbmc-8cb8ae1/xbmc/system.h xbmc-8cb8ae1.patch/xbmc/system.h
+--- xbmc-8cb8ae1/xbmc/system.h	2011-09-13 05:37:53.000000000 +0200
++++ xbmc-8cb8ae1.patch/xbmc/system.h	2011-09-14 19:34:09.853626990 +0200
+@@ -52,7 +52,6 @@
+ #endif
+ 
+ #define HAS_FILESYSTEM
+-#define HAS_FILESYSTEM_SMB
+ #define HAS_FILESYSTEM_CDDA
+ #define HAS_FILESYSTEM_RTV
+ #define HAS_FILESYSTEM_DAAP
+@@ -60,6 +59,10 @@
+ #define HAS_FILESYSTEM_VTP
+ #define HAS_FILESYSTEM_HTSP
+ 
++#ifdef HAVE_LIBSMBCLIENT
++  #define HAS_FILESYSTEM_SMB
++#endif
++
+ #ifdef HAVE_LIBNFS
+   #define HAS_FILESYSTEM_NFS
+ #endif
+@@ -99,6 +102,7 @@
+ #define HAVE_LIBBLURAY
+ #define HAS_ASAP_CODEC
+ #define HAVE_YAJL_YAJL_VERSION_H
++#define HAS_FILESYSTEM_SMB
+ #define HAS_FILESYSTEM_NFS
+ #endif
+ 

packages/x11/xserver/xorg-server/meta

@@ -61,4 +61,8 @@ fi
   done
 
 # Tools
-  PKG_DEPENDS="$PKG_DEPENDS pciutils ratpoison xrandr setxkbmap"
+  PKG_DEPENDS="$PKG_DEPENDS pciutils xrandr setxkbmap"
+
+if [ -n "$WINDOWMANAGER" -a "$WINDOWMANAGER" != "none" ]; then
+  PKG_DEPENDS="$PKG_DEPENDS $WINDOWMANAGER"
+fi

projects/ATV/options

@@ -134,6 +134,9 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
+# build and install with BluRay support (yes / no)
+  BLURAY_SUPPORT="yes"
+
 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
@@ -158,6 +161,9 @@
 # build and install Avahi (Zeroconf) daemon (yes / no)
   AVAHI_DAEMON="yes"
 
+# build and install Samba Client support (yes / no)
+  SAMBA_CLIENT="yes"
+
 # build and install Samba Server (yes / no)
   SAMBA_SERVER="yes"
 
@@ -187,6 +193,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"

projects/Fusion/options

@@ -134,6 +134,9 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
+# build and install with BluRay support (yes / no)
+  BLURAY_SUPPORT="yes"
+
 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
@@ -158,6 +161,9 @@
 # build and install Avahi (Zeroconf) daemon (yes / no)
   AVAHI_DAEMON="yes"
 
+# build and install Samba Client support (yes / no)
+  SAMBA_CLIENT="yes"
+
 # build and install Samba Server (yes / no)
   SAMBA_SERVER="yes"
 
@@ -187,6 +193,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau"

projects/Generic/options

@@ -134,6 +134,9 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
+# build and install with BluRay support (yes / no)
+  BLURAY_SUPPORT="yes"
+
 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
@@ -158,6 +161,9 @@
 # build and install Avahi (Zeroconf) daemon (yes / no)
   AVAHI_DAEMON="yes"
 
+# build and install Samba Client support (yes / no)
+  SAMBA_CLIENT="yes"
+
 # build and install Samba Server (yes / no)
   SAMBA_SERVER="yes"
 
@@ -187,6 +193,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"

projects/Generic_OSS/options

@@ -134,6 +134,9 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
+# build and install with BluRay support (yes / no)
+  BLURAY_SUPPORT="yes"
+
 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
@@ -158,6 +161,9 @@
 # build and install Avahi (Zeroconf) daemon (yes / no)
   AVAHI_DAEMON="yes"
 
+# build and install Samba Client support (yes / no)
+  SAMBA_CLIENT="yes"
+
 # build and install Samba Server (yes / no)
   SAMBA_SERVER="yes"
 
@@ -187,6 +193,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"

projects/ION/options

@@ -134,6 +134,9 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
+# build and install with BluRay support (yes / no)
+  BLURAY_SUPPORT="yes"
+
 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
@@ -158,8 +161,11 @@
 # build and install Avahi (Zeroconf) daemon (yes / no)
   AVAHI_DAEMON="yes"
 
+# build and install Samba Client support (yes / no)
+  SAMBA_CLIENT="yes"
+
 # build and install Samba Server (yes / no)
-  SAMBA_SERVER="yes"
+  SAMBA_SERVER="no"
 
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
@@ -187,6 +193,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"

projects/Intel/options

@@ -134,6 +134,9 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
+# build and install with BluRay support (yes / no)
+  BLURAY_SUPPORT="yes"
+
 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
@@ -158,6 +161,9 @@
 # build and install Avahi (Zeroconf) daemon (yes / no)
   AVAHI_DAEMON="yes"
 
+# build and install Samba Client support (yes / no)
+  SAMBA_CLIENT="yes"
+
 # build and install Samba Server (yes / no)
   SAMBA_SERVER="yes"
 
@@ -187,6 +193,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"

projects/Ultra/options

@@ -134,6 +134,9 @@
 # (DVD decryption support in XBMC) (yes / no)
   DVDCSS_SUPPORT="yes"
 
+# build and install with BluRay support (yes / no)
+  BLURAY_SUPPORT="yes"
+
 # additional drivers to install:
 # asix-ax887xx:     Asix AX887xx USB LAN Driver
 # Space separated list is supported,
@@ -158,6 +161,9 @@
 # build with afpfs-ng support (mounting AFP shares with XBMC) (yes / no)
   AFP_SUPPORT="yes"
 
+# build and install Samba Client support (yes / no)
+  SAMBA_CLIENT="yes"
+
 # build and install Samba Server (yes / no)
   SAMBA_SERVER="yes"
 
@@ -187,6 +193,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"