From 8d93bc0533462a48f510e898879efac2265ad34a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 9 Jun 2012 11:44:19 +0200 Subject: [PATCH] projects/*/options: readd option to specify Displayserver Signed-off-by: Stephan Raue --- config/graphic | 10 ++++++---- packages/mediacenter/xbmc-frodo/build | 4 ++-- packages/mediacenter/xbmc-frodo/install | 2 +- packages/mediacenter/xbmc-frodo/meta | 2 +- packages/mediacenter/xbmc-rpi/build | 4 ++-- packages/mediacenter/xbmc-rpi/install | 2 +- packages/mediacenter/xbmc-rpi/meta | 2 +- packages/mediacenter/xbmc/build | 4 ++-- packages/mediacenter/xbmc/install | 2 +- packages/mediacenter/xbmc/meta | 2 +- packages/multimedia/SDL/build | 2 +- packages/multimedia/SDL/meta | 2 +- projects/ATV/options | 3 +++ projects/Fusion/options | 3 +++ projects/Generic/options | 3 +++ projects/Generic_OSS/options | 3 +++ projects/ION/options | 3 +++ projects/Intel/options | 3 +++ projects/RPi/options | 3 +++ projects/Ultra/options | 3 +++ projects/Virtual/options | 3 +++ scripts/image | 2 +- 22 files changed, 48 insertions(+), 19 deletions(-) diff --git a/config/graphic b/config/graphic index 91f106387b..763e008a5b 100644 --- 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 diff --git a/packages/mediacenter/xbmc-frodo/build b/packages/mediacenter/xbmc-frodo/build index 1f8757c037..1d775e5788 100755 --- 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 diff --git a/packages/mediacenter/xbmc-frodo/install b/packages/mediacenter/xbmc-frodo/install index 1ef389cc02..134e62c73e 100755 --- 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 diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta index efa69890cf..266581ed0c 100644 --- 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" diff --git a/packages/mediacenter/xbmc-rpi/build b/packages/mediacenter/xbmc-rpi/build index b79eb7cbd7..f836182f46 100755 --- 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 diff --git a/packages/mediacenter/xbmc-rpi/install b/packages/mediacenter/xbmc-rpi/install index 1ef389cc02..134e62c73e 100755 --- 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 diff --git a/packages/mediacenter/xbmc-rpi/meta b/packages/mediacenter/xbmc-rpi/meta index 548c9055a8..21578d3f35 100644 --- 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" diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index e72cd67fdf..017ef42042 100755 --- 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 diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index 8cb8a5ca0e..49c30ab180 100755 --- 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 diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 0bfc8977fb..57d07c340c 100644 --- 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" diff --git a/packages/multimedia/SDL/build b/packages/multimedia/SDL/build index 39220d1562..457b2ae9f3 100755 --- 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" diff --git a/packages/multimedia/SDL/meta b/packages/multimedia/SDL/meta index 751980ec77..e92ab73d99 100644 --- 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 diff --git a/projects/ATV/options b/projects/ATV/options index 283f560712..19a3e15e78 100755 --- 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" diff --git a/projects/Fusion/options b/projects/Fusion/options index 147a5bc4cd..acdaa315ef 100755 --- 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" diff --git a/projects/Generic/options b/projects/Generic/options index f4859c3c4a..1902c00a99 100755 --- 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" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index 2e556ed665..0998a8f2c4 100755 --- 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" diff --git a/projects/ION/options b/projects/ION/options index c575b90f25..a7ce8aced0 100755 --- 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" diff --git a/projects/Intel/options b/projects/Intel/options index 5e4553fb49..1257a9c170 100755 --- 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" diff --git a/projects/RPi/options b/projects/RPi/options index eaec299261..af6aa6cc5b 100755 --- 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" diff --git a/projects/Ultra/options b/projects/Ultra/options index 76680e1e0a..671e2ea888 100755 --- 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" diff --git a/projects/Virtual/options b/projects/Virtual/options index 358195c6c6..74014d69f9 100755 --- 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" diff --git a/scripts/image b/scripts/image index 0b125a474c..631336fb3d 100755 --- 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