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
This commit is contained in:
Stephan Raue
2011-09-14 19:56:56 +02:00
12 changed files with 374 additions and 78 deletions
+9
View File
@@ -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"