projects/*/options: readd option to specify Displayserver

Signed-off-by: Stephan Raue <stephan@openelec.tv>
2025-07-29 13:46:49 +00:00 · 2012-06-09 11:44:19 +02:00 · 2012-06-09 11:44:19 +02:00 · 8d93bc0533
commit 8d93bc0533
parent 1683868bdd
22 changed files with 48 additions and 19 deletions
--- a/config/graphic
+++ b/config/graphic
@ -1,11 +1,13 @@
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
+  SDL_SUPPORT="yes"
+else
+  SDL_SUPPORT="no"
+fi
+
 if [ "$OPENGL" = no ]; then
  OPENGL_SUPPORT="no"
-  XORG_SUPPORT="no"
-  SDL_SUPPORT="no"
 else
  OPENGL_SUPPORT="yes"
-  XORG_SUPPORT="yes"
-  SDL_SUPPORT="yes"
 fi

 if [ "$OPENGLES" = no ]; then
--- a/packages/mediacenter/xbmc-frodo/build
+++ b/packages/mediacenter/xbmc-frodo/build
@ -25,7 +25,7 @@
 # disable build of GOOM until its fixed
  XBMC_VIS_GOOM="no"

-if [ "$XORG_SUPPORT" = yes ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
  XBMC_XORG="--enable-x11 --enable-xrandr"
 else
  XBMC_XORG="--disable-x11 --disable-xrandr"
@ -305,6 +305,6 @@ cd $PKG_BUILD
 make externals
 make xbmc.bin

-if [ "$XORG_SUPPORT" = yes ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
  make xbmc-xrandr
 fi
--- a/packages/mediacenter/xbmc-frodo/install
+++ b/packages/mediacenter/xbmc-frodo/install
@ -35,7 +35,7 @@ mkdir -p $INSTALL/usr/bin

 mkdir -p $INSTALL/usr/lib/xbmc
  cp $PKG_BUILD/xbmc.bin $INSTALL/usr/lib/xbmc
-  if [ "$XORG_SUPPORT" = yes ]; then
+  if [ "$DISPLAYSERVER" = "xorg-server" ]; then
    cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc
  fi

--- a/packages/mediacenter/xbmc-frodo/meta
+++ b/packages/mediacenter/xbmc-frodo/meta
@ -39,7 +39,7 @@ PKG_IS_ADDON="no"

 PKG_AUTORECONF="no"

-if [ "$XORG_SUPPORT" = yes ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
  # for libX11 support
  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext"
  PKG_DEPENDS="$PKG_DEPENDS libX11 libXext"
--- a/packages/mediacenter/xbmc-rpi/build
+++ b/packages/mediacenter/xbmc-rpi/build
@ -22,7 +22,7 @@

 . config/options $1

-if [ "$XORG_SUPPORT" = yes ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
  XBMC_XORG="--enable-x11 --enable-xrandr"
 else
  XBMC_XORG="--disable-x11 --disable-xrandr"
@ -295,6 +295,6 @@ cd $PKG_BUILD
 make externals
 make xbmc.bin

-if [ "$XORG_SUPPORT" = yes ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
  make xbmc-xrandr
 fi
--- a/packages/mediacenter/xbmc-rpi/install
+++ b/packages/mediacenter/xbmc-rpi/install
@ -35,7 +35,7 @@ mkdir -p $INSTALL/usr/bin

 mkdir -p $INSTALL/usr/lib/xbmc
  cp $PKG_BUILD/xbmc.bin $INSTALL/usr/lib/xbmc
-  if [ "$XORG_SUPPORT" = yes ]; then
+  if [ "$DISPLAYSERVER" = "xorg-server" ]; then
    cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc
  fi

--- a/packages/mediacenter/xbmc-rpi/meta
+++ b/packages/mediacenter/xbmc-rpi/meta
@ -35,7 +35,7 @@ PKG_IS_ADDON="no"

 PKG_AUTORECONF="no"

-if [ "$XORG_SUPPORT" = yes ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
  # for libX11 support
  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext"
  PKG_DEPENDS="$PKG_DEPENDS libX11 libXext"
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@ -22,7 +22,7 @@

 . config/options $1

-if [ "$XORG_SUPPORT" = yes ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
  XBMC_XORG="--enable-x11 --enable-xrandr"
 else
  XBMC_XORG="--disable-x11 --disable-xrandr"
@ -263,6 +263,6 @@ cd $PKG_BUILD
 make externals
 make xbmc.bin

-if [ "$XORG_SUPPORT" = yes ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
  make xbmc-xrandr
 fi
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@ -35,7 +35,7 @@ mkdir -p $INSTALL/usr/bin

 mkdir -p $INSTALL/usr/lib/xbmc
  cp $PKG_BUILD/xbmc.bin $INSTALL/usr/lib/xbmc
-  if [ "$XORG_SUPPORT" = yes ]; then
+  if [ "$DISPLAYSERVER" = "xorg-server" ]; then
    cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc
  fi

--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@ -39,7 +39,7 @@ PKG_IS_ADDON="no"

 PKG_AUTORECONF="no"

-if [ "$XORG_SUPPORT" = yes ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
  # for libX11 support
  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext"
  PKG_DEPENDS="$PKG_DEPENDS libX11 libXext"
--- a/packages/multimedia/SDL/build
+++ b/packages/multimedia/SDL/build
@ -22,7 +22,7 @@

 . config/options $1

-if [ "$XORG_SUPPORT" = yes ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
  SDL_X11="--enable-video --enable-x11-shared --disable-video-x11-dgamouse"
  SDL_X11="$SDL_X11 --disable-video-x11-xinerama --disable-video-x11-xme"
  SDL_X11="$SDL_X11 --enable-video-x11-xrandr --enable-video-x11"
--- a/packages/multimedia/SDL/meta
+++ b/packages/multimedia/SDL/meta
@ -35,7 +35,7 @@ PKG_IS_ADDON="no"

 PKG_AUTORECONF="no"

-if [ "$XORG_SUPPORT" = yes ]; then
+if [ "$DISPLAYSERVER" = "xorg-server" ]; then
  PKG_DEPENDS="$PKG_DEPENDS libX11 libXrandr"
  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXrandr"
 fi
--- a/projects/ATV/options
+++ b/projects/ATV/options
@ -235,6 +235,9 @@
 # Windowmanager to use (ratpoison / none)
  WINDOWMANAGER="ratpoison"

+# Displayserver to use (xorg-server / no)
+  DISPLAYSERVER="xorg-server"
+
 # 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"
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@ -234,6 +234,9 @@
 # Windowmanager to use (ratpoison / none)
  WINDOWMANAGER="ratpoison"

+# Displayserver to use (xorg-server / no)
+  DISPLAYSERVER="xorg-server"
+
 # 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"
--- a/projects/Generic/options
+++ b/projects/Generic/options
@ -234,6 +234,9 @@
 # Windowmanager to use (ratpoison / none)
  WINDOWMANAGER="ratpoison"

+# Displayserver to use (xorg-server / no)
+  DISPLAYSERVER="xorg-server"
+
 # 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"
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@ -234,6 +234,9 @@
 # Windowmanager to use (ratpoison / none)
  WINDOWMANAGER="ratpoison"

+# Displayserver to use (xorg-server / no)
+  DISPLAYSERVER="xorg-server"
+
 # 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"
--- a/projects/ION/options
+++ b/projects/ION/options
@ -234,6 +234,9 @@
 # Windowmanager to use (ratpoison / none)
  WINDOWMANAGER="ratpoison"

+# Displayserver to use (xorg-server / no)
+  DISPLAYSERVER="xorg-server"
+
 # 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"
--- a/projects/Intel/options
+++ b/projects/Intel/options
@ -234,6 +234,9 @@
 # Windowmanager to use (ratpoison / none)
  WINDOWMANAGER="ratpoison"

+# Displayserver to use (xorg-server / no)
+  DISPLAYSERVER="xorg-server"
+
 # 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"
--- a/projects/RPi/options
+++ b/projects/RPi/options
@ -236,6 +236,9 @@
 # Windowmanager to use (ratpoison / none)
  WINDOWMANAGER="none"

+# Displayserver to use (xorg-server / no)
+  DISPLAYSERVER="no"
+
 # 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"
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@ -234,6 +234,9 @@
 # Windowmanager to use (ratpoison / none)
  WINDOWMANAGER="ratpoison"

+# Displayserver to use (xorg-server / no)
+  DISPLAYSERVER="xorg-server"
+
 # 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"
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@ -230,6 +230,9 @@
 # Windowmanager to use (ratpoison / none)
  WINDOWMANAGER="ratpoison"

+# Displayserver to use (xorg-server / no)
+  DISPLAYSERVER="xorg-server"
+
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware,virtualbox)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
--- a/scripts/image
+++ b/scripts/image
@ -108,7 +108,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
  [ "$NETWORK" = "yes" ] && $SCRIPTS/install network

 # Graphic support
-  [ "$XORG_SUPPORT" = "yes" ] && $SCRIPTS/install xorg-server
+  [ ! "$DISPLAYSERVER" = "no" ] && $SCRIPTS/install $DISPLAYSERVER

 # Multimedia support
  [ ! "$MEDIACENTER" = "no" ] && $SCRIPTS/install mediacenter