projects/*/options: rework OPENGL and DISPLAYSERVER options, add OPENGLES option

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-01-30 15:42:42 +01:00
parent 1293554302
commit 42fd79f137
9 changed files with 57 additions and 43 deletions

View File

@ -1,3 +1,17 @@
if [ "$OPENGL" = no ]; then
OPENGL_SUPPORT="no"
XORG_SUPPORT="no"
else
OPENGL_SUPPORT="yes"
XORG_SUPPORT="yes"
fi
if [ "$OPENGLES" = no ]; then
OPENGLES_SUPPORT="no"
else
OPENGLES_SUPPORT="yes"
fi
get_graphicdrivers() { get_graphicdrivers() {
if [ "$GRAPHIC_DRIVERS" = "all" ]; then if [ "$GRAPHIC_DRIVERS" = "all" ]; then
GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx nvidia vmware" GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx nvidia vmware"

View File

@ -213,16 +213,16 @@
# build and install hfs filesystem utilities (yes / no) # build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes" HFSTOOLS="yes"
# Displayserver to use (xorg-server / no) # OpenGL(X) implementation to use (no / Mesa)
DISPLAYSERVER="xorg-server" OPENGL="Mesa"
# OpenGL-ES implementation to use (no)
OPENGLES="no"
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# GL/GLES implementation to use (Mesa) # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
OPENGL="Mesa"
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported, # Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="nouveau" GRAPHIC_DRIVERS="nouveau"

View File

@ -213,16 +213,16 @@
# build and install hfs filesystem utilities (yes / no) # build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes" HFSTOOLS="yes"
# Displayserver to use (xorg-server / no) # OpenGL(X) implementation to use (no / Mesa)
DISPLAYSERVER="xorg-server" OPENGL="Mesa"
# OpenGL-ES implementation to use (no)
OPENGLES="no"
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# GL/GLES implementation to use (Mesa) # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
OPENGL="Mesa"
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported, # Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau"
GRAPHIC_DRIVERS="fglrx" GRAPHIC_DRIVERS="fglrx"

View File

@ -213,16 +213,16 @@
# build and install hfs filesystem utilities (yes / no) # build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes" HFSTOOLS="yes"
# Displayserver to use (xorg-server / no) # OpenGL(X) implementation to use (no / Mesa)
DISPLAYSERVER="xorg-server" OPENGL="Mesa"
# OpenGL-ES implementation to use (no)
OPENGLES="no"
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# GL/GLES implementation to use (Mesa) # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
OPENGL="Mesa"
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported, # Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
GRAPHIC_DRIVERS="fglrx i915 i965 nvidia vmware" GRAPHIC_DRIVERS="fglrx i915 i965 nvidia vmware"

View File

@ -213,16 +213,16 @@
# build and install hfs filesystem utilities (yes / no) # build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes" HFSTOOLS="yes"
# Displayserver to use (xorg-server / no) # OpenGL(X) implementation to use (no / Mesa)
DISPLAYSERVER="xorg-server" OPENGL="Mesa"
# OpenGL-ES implementation to use (no)
OPENGLES="no"
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# GL/GLES implementation to use (Mesa) # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
OPENGL="Mesa"
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported, # Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nouveau vmware" GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nouveau vmware"

View File

@ -213,16 +213,16 @@
# build and install hfs filesystem utilities (yes / no) # build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes" HFSTOOLS="yes"
# Displayserver to use (xorg-server / no) # OpenGL(X) implementation to use (no / Mesa)
DISPLAYSERVER="xorg-server" OPENGL="Mesa"
# OpenGL-ES implementation to use (no)
OPENGLES="no"
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# GL/GLES implementation to use (Mesa) # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
OPENGL="Mesa"
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported, # Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="nvidia" GRAPHIC_DRIVERS="nvidia"

View File

@ -213,16 +213,16 @@
# build and install hfs filesystem utilities (yes / no) # build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes" HFSTOOLS="yes"
# Displayserver to use (xorg-server / no) # OpenGL(X) implementation to use (no / Mesa)
DISPLAYSERVER="xorg-server" OPENGL="Mesa"
# OpenGL-ES implementation to use (no)
OPENGLES="no"
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# GL/GLES implementation to use (Mesa) # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
OPENGL="Mesa"
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported, # Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="i915 i965" GRAPHIC_DRIVERS="i915 i965"

View File

@ -213,16 +213,16 @@
# build and install hfs filesystem utilities (yes / no) # build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes" HFSTOOLS="yes"
# Displayserver to use (xorg-server / no) # OpenGL(X) implementation to use (no / Mesa)
DISPLAYSERVER="xorg-server" OPENGL="Mesa"
# OpenGL-ES implementation to use (no)
OPENGLES="no"
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" WINDOWMANAGER="ratpoison"
# GL/GLES implementation to use (Mesa) # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
OPENGL="Mesa"
# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported, # Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="nvidia" GRAPHIC_DRIVERS="nvidia"

View File

@ -111,7 +111,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
[ "$NETWORK" = "yes" ] && $SCRIPTS/install network [ "$NETWORK" = "yes" ] && $SCRIPTS/install network
# Graphic support # Graphic support
[ ! "$DISPLAYSERVER" = "no" ] && $SCRIPTS/install $DISPLAYSERVER [ "$XORG_SUPPORT" = "yes" ] && $SCRIPTS/install xorg-server
# Multimedia support # Multimedia support
[ ! "$MEDIACENTER" = "no" ] && $SCRIPTS/install mediacenter [ ! "$MEDIACENTER" = "no" ] && $SCRIPTS/install mediacenter