From 42fd79f137f800e5956204e1c26e9e95a2705712 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 30 Jan 2012 15:42:42 +0100 Subject: [PATCH] projects/*/options: rework OPENGL and DISPLAYSERVER options, add OPENGLES option Signed-off-by: Stephan Raue --- config/graphic | 14 ++++++++++++++ projects/ATV/options | 12 ++++++------ projects/Fusion/options | 12 ++++++------ projects/Generic/options | 12 ++++++------ projects/Generic_OSS/options | 12 ++++++------ projects/ION/options | 12 ++++++------ projects/Intel/options | 12 ++++++------ projects/Ultra/options | 12 ++++++------ scripts/image | 2 +- 9 files changed, 57 insertions(+), 43 deletions(-) diff --git a/config/graphic b/config/graphic index f5860da128..a4f0d237f8 100644 --- a/config/graphic +++ b/config/graphic @@ -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() { if [ "$GRAPHIC_DRIVERS" = "all" ]; then GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx nvidia vmware" diff --git a/projects/ATV/options b/projects/ATV/options index 5cd4886f96..6883166fe2 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -213,16 +213,16 @@ # build and install hfs filesystem utilities (yes / no) HFSTOOLS="yes" -# Displayserver to use (xorg-server / no) - DISPLAYSERVER="xorg-server" +# OpenGL(X) implementation to use (no / Mesa) + OPENGL="Mesa" + +# OpenGL-ES implementation to use (no) + OPENGLES="no" # Windowmanager to use (ratpoison / none) WINDOWMANAGER="ratpoison" -# GL/GLES implementation to use (Mesa) - OPENGL="Mesa" - -# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware) +# Xorg 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" GRAPHIC_DRIVERS="nouveau" diff --git a/projects/Fusion/options b/projects/Fusion/options index 88741aca96..edfc4f0b65 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -213,16 +213,16 @@ # build and install hfs filesystem utilities (yes / no) HFSTOOLS="yes" -# Displayserver to use (xorg-server / no) - DISPLAYSERVER="xorg-server" +# OpenGL(X) implementation to use (no / Mesa) + OPENGL="Mesa" + +# OpenGL-ES implementation to use (no) + OPENGLES="no" # Windowmanager to use (ratpoison / none) WINDOWMANAGER="ratpoison" -# GL/GLES implementation to use (Mesa) - OPENGL="Mesa" - -# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware) +# Xorg 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" GRAPHIC_DRIVERS="fglrx" diff --git a/projects/Generic/options b/projects/Generic/options index c416e8c75e..48b29b1c74 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -213,16 +213,16 @@ # build and install hfs filesystem utilities (yes / no) HFSTOOLS="yes" -# Displayserver to use (xorg-server / no) - DISPLAYSERVER="xorg-server" +# OpenGL(X) implementation to use (no / Mesa) + OPENGL="Mesa" + +# OpenGL-ES implementation to use (no) + OPENGLES="no" # Windowmanager to use (ratpoison / none) WINDOWMANAGER="ratpoison" -# GL/GLES implementation to use (Mesa) - OPENGL="Mesa" - -# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware) +# Xorg 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" GRAPHIC_DRIVERS="fglrx i915 i965 nvidia vmware" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 56a3c872b4..d74a2be677 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -213,16 +213,16 @@ # build and install hfs filesystem utilities (yes / no) HFSTOOLS="yes" -# Displayserver to use (xorg-server / no) - DISPLAYSERVER="xorg-server" +# OpenGL(X) implementation to use (no / Mesa) + OPENGL="Mesa" + +# OpenGL-ES implementation to use (no) + OPENGLES="no" # Windowmanager to use (ratpoison / none) WINDOWMANAGER="ratpoison" -# GL/GLES implementation to use (Mesa) - OPENGL="Mesa" - -# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware) +# Xorg 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" GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nouveau vmware" diff --git a/projects/ION/options b/projects/ION/options index 70aebb116f..965f0c4f39 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -213,16 +213,16 @@ # build and install hfs filesystem utilities (yes / no) HFSTOOLS="yes" -# Displayserver to use (xorg-server / no) - DISPLAYSERVER="xorg-server" +# OpenGL(X) implementation to use (no / Mesa) + OPENGL="Mesa" + +# OpenGL-ES implementation to use (no) + OPENGLES="no" # Windowmanager to use (ratpoison / none) WINDOWMANAGER="ratpoison" -# GL/GLES implementation to use (Mesa) - OPENGL="Mesa" - -# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware) +# Xorg 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" GRAPHIC_DRIVERS="nvidia" diff --git a/projects/Intel/options b/projects/Intel/options index 7f58017094..c99d5ae6b1 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -213,16 +213,16 @@ # build and install hfs filesystem utilities (yes / no) HFSTOOLS="yes" -# Displayserver to use (xorg-server / no) - DISPLAYSERVER="xorg-server" +# OpenGL(X) implementation to use (no / Mesa) + OPENGL="Mesa" + +# OpenGL-ES implementation to use (no) + OPENGLES="no" # Windowmanager to use (ratpoison / none) WINDOWMANAGER="ratpoison" -# GL/GLES implementation to use (Mesa) - OPENGL="Mesa" - -# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware) +# Xorg 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" GRAPHIC_DRIVERS="i915 i965" diff --git a/projects/Ultra/options b/projects/Ultra/options index 01683b7011..05284de01a 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -213,16 +213,16 @@ # build and install hfs filesystem utilities (yes / no) HFSTOOLS="yes" -# Displayserver to use (xorg-server / no) - DISPLAYSERVER="xorg-server" +# OpenGL(X) implementation to use (no / Mesa) + OPENGL="Mesa" + +# OpenGL-ES implementation to use (no) + OPENGLES="no" # Windowmanager to use (ratpoison / none) WINDOWMANAGER="ratpoison" -# GL/GLES implementation to use (Mesa) - OPENGL="Mesa" - -# Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware) +# Xorg 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" GRAPHIC_DRIVERS="nvidia" diff --git a/scripts/image b/scripts/image index c789709124..60d27a37cf 100755 --- a/scripts/image +++ b/scripts/image @@ -111,7 +111,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" [ "$NETWORK" = "yes" ] && $SCRIPTS/install network # Graphic support - [ ! "$DISPLAYSERVER" = "no" ] && $SCRIPTS/install $DISPLAYSERVER + [ "$XORG_SUPPORT" = "yes" ] && $SCRIPTS/install xorg-server # Multimedia support [ ! "$MEDIACENTER" = "no" ] && $SCRIPTS/install mediacenter