jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

projects/*/options: readd option to specify Displayserver

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-06-09 11:44:19 +02:00
parent 1683868bdd
commit 8d93bc0533
22 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/graphic
View File

@ -1,11 +1,13 @@
if [ "$DISPLAYSERVER" = "xorg-server" ]; then
SDL_SUPPORT="yes"
else
SDL_SUPPORT="no"
fi
if [ "$OPENGL" = no ]; then if [ "$OPENGL" = no ]; then
OPENGL_SUPPORT="no" OPENGL_SUPPORT="no"
XORG_SUPPORT="no"
SDL_SUPPORT="no"
else else
OPENGL_SUPPORT="yes" OPENGL_SUPPORT="yes"
XORG_SUPPORT="yes"
SDL_SUPPORT="yes"
fi fi
if [ "$OPENGLES" = no ]; then if [ "$OPENGLES" = no ]; then

4
packages/mediacenter/xbmc-frodo/build
View File

@ -25,7 +25,7 @@
# disable build of GOOM until its fixed # disable build of GOOM until its fixed
XBMC_VIS_GOOM="no" XBMC_VIS_GOOM="no"
if [ "$XORG_SUPPORT" = yes ]; then if [ "$DISPLAYSERVER" = "xorg-server" ]; then
XBMC_XORG="--enable-x11 --enable-xrandr" XBMC_XORG="--enable-x11 --enable-xrandr"
else else
XBMC_XORG="--disable-x11 --disable-xrandr" XBMC_XORG="--disable-x11 --disable-xrandr"
@ -305,6 +305,6 @@ cd $PKG_BUILD
make externals make externals
make xbmc.bin make xbmc.bin
if [ "$XORG_SUPPORT" = yes ]; then if [ "$DISPLAYSERVER" = "xorg-server" ]; then
make xbmc-xrandr make xbmc-xrandr
fi fi

2
packages/mediacenter/xbmc-frodo/install
View File

@ -35,7 +35,7 @@ mkdir -p $INSTALL/usr/bin
mkdir -p $INSTALL/usr/lib/xbmc mkdir -p $INSTALL/usr/lib/xbmc
cp $PKG_BUILD/xbmc.bin $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 cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc
fi fi

2
packages/mediacenter/xbmc-frodo/meta
View File

@ -39,7 +39,7 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no" PKG_AUTORECONF="no"
if [ "$XORG_SUPPORT" = yes ]; then if [ "$DISPLAYSERVER" = "xorg-server" ]; then
# for libX11 support # for libX11 support
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext" PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext"
PKG_DEPENDS="$PKG_DEPENDS libX11 libXext" PKG_DEPENDS="$PKG_DEPENDS libX11 libXext"

4
packages/mediacenter/xbmc-rpi/build
View File

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

2
packages/mediacenter/xbmc-rpi/install
View File

@ -35,7 +35,7 @@ mkdir -p $INSTALL/usr/bin
mkdir -p $INSTALL/usr/lib/xbmc mkdir -p $INSTALL/usr/lib/xbmc
cp $PKG_BUILD/xbmc.bin $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 cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc
fi fi

2
packages/mediacenter/xbmc-rpi/meta
View File

@ -35,7 +35,7 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no" PKG_AUTORECONF="no"
if [ "$XORG_SUPPORT" = yes ]; then if [ "$DISPLAYSERVER" = "xorg-server" ]; then
# for libX11 support # for libX11 support
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext" PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext"
PKG_DEPENDS="$PKG_DEPENDS libX11 libXext" PKG_DEPENDS="$PKG_DEPENDS libX11 libXext"

4
packages/mediacenter/xbmc/build
View File

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

2
packages/mediacenter/xbmc/install
View File

@ -35,7 +35,7 @@ mkdir -p $INSTALL/usr/bin
mkdir -p $INSTALL/usr/lib/xbmc mkdir -p $INSTALL/usr/lib/xbmc
cp $PKG_BUILD/xbmc.bin $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 cp $PKG_BUILD/xbmc-xrandr $INSTALL/usr/lib/xbmc
fi fi

2
packages/mediacenter/xbmc/meta
View File

@ -39,7 +39,7 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no" PKG_AUTORECONF="no"
if [ "$XORG_SUPPORT" = yes ]; then if [ "$DISPLAYSERVER" = "xorg-server" ]; then
# for libX11 support # for libX11 support
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext" PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXext"
PKG_DEPENDS="$PKG_DEPENDS libX11 libXext" PKG_DEPENDS="$PKG_DEPENDS libX11 libXext"

2
packages/multimedia/SDL/build
View File

@ -22,7 +22,7 @@
. config/options $1 . 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="--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 --disable-video-x11-xinerama --disable-video-x11-xme"
SDL_X11="$SDL_X11 --enable-video-x11-xrandr --enable-video-x11" SDL_X11="$SDL_X11 --enable-video-x11-xrandr --enable-video-x11"

2
packages/multimedia/SDL/meta
View File

@ -35,7 +35,7 @@ PKG_IS_ADDON="no"
PKG_AUTORECONF="no" PKG_AUTORECONF="no"
if [ "$XORG_SUPPORT" = yes ]; then if [ "$DISPLAYSERVER" = "xorg-server" ]; then
PKG_DEPENDS="$PKG_DEPENDS libX11 libXrandr" PKG_DEPENDS="$PKG_DEPENDS libX11 libXrandr"
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXrandr" PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libX11 libXrandr"
fi fi

3
projects/ATV/options
View File

@ -235,6 +235,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" 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) # Xorg 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"

3
projects/Fusion/options
View File

@ -234,6 +234,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" 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) # Xorg 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"

3
projects/Generic/options
View File

@ -234,6 +234,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" 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) # Xorg 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"

3
projects/Generic_OSS/options
View File

@ -234,6 +234,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" 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) # Xorg 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"

3
projects/ION/options
View File

@ -234,6 +234,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" 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) # Xorg 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"

3
projects/Intel/options
View File

@ -234,6 +234,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" 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) # Xorg 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"

3
projects/RPi/options
View File

@ -236,6 +236,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="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) # Xorg 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"

3
projects/Ultra/options
View File

@ -234,6 +234,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" 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) # Xorg 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"

3
projects/Virtual/options
View File

@ -230,6 +230,9 @@
# Windowmanager to use (ratpoison / none) # Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison" 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) # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware,virtualbox)
# 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"

2
scripts/image
View File

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