libretro/Lakka-LibreELEC
1
0
Fork 0
mirror of https://github.com/libretro/Lakka-LibreELEC.git synced 2025-03-01 12:38:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xorg-server: enable xinerama support, libXinerama is needed for xorg-server-1.15, so remove optional support for now

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-01-12 16:03:01 +01:00
parent 132c1e92bd
commit ee23d62f49
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/graphic
View File

@ -63,18 +63,15 @@ get_graphicdrivers() {
if [ "$drv" = "nvidia" ]; then
XORG_DRIVERS="$XORG_DRIVERS nvidia"
XINERAMA_SUPPORT="yes"
fi
if [ "$drv" = "nvidia-legacy" ]; then
XORG_DRIVERS="$XORG_DRIVERS nvidia-legacy"
XINERAMA_SUPPORT="yes"
fi
if [ "$drv" = "virtualbox" ]; then
DRI_DRIVERS="$DRI_DRIVERS,swrast"
XORG_DRIVERS="$XORG_DRIVERS virtualbox"
XINERAMA_SUPPORT="yes"
fi
if [ "$drv" = "r200" ]; then
@ -95,7 +92,6 @@ get_graphicdrivers() {
XORG_DRIVERS="$XORG_DRIVERS ati"
LLVM_SUPPORT="yes"
COMPOSITE_SUPPORT="yes"
XINERAMA_SUPPORT="yes"
fi
if [ "$drv" = "radeonsi" ]; then
@ -109,7 +105,6 @@ get_graphicdrivers() {
DRI_DRIVERS="$DRI_DRIVERS,swrast"
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,svga"
XORG_DRIVERS="$XORG_DRIVERS vmware"
XINERAMA_SUPPORT="yes"
# LLVM_SUPPORT="yes"
fi

14
packages/x11/xserver/xorg-server/package.mk
View File

@ -23,8 +23,8 @@ PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.X.org"
PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="libpciaccess libX11 libXfont libdrm openssl freetype pixman systemd xorg-launch-helper"
PKG_BUILD_DEPENDS_TARGET="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto presentproto libpciaccess libX11 libXfont libxkbfile libdrm openssl freetype pixman fontsproto systemd"
PKG_DEPENDS="libpciaccess libX11 libXfont libXinerama libdrm openssl freetype pixman systemd xorg-launch-helper"
PKG_BUILD_DEPENDS_TARGET="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto presentproto libpciaccess libX11 libXfont libXinerama libxkbfile libdrm openssl freetype pixman fontsproto systemd"
PKG_PRIORITY="optional"
PKG_SECTION="x11/xserver"
PKG_SHORTDESC="xorg-server: The Xorg X server"
@ -68,14 +68,6 @@ else
XORG_COMPOSITE="--disable-composite"
fi
if [ "$XINERAMA_SUPPORT" = "yes" ]; then
PKG_DEPENDS="$PKG_DEPENDS libXinerama"
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libXinerama"
XORG_XINERAMA="--enable-xinerama"
else
XORG_XINERAMA="--disable-xinerama"
fi
if [ "$OPENGL" = "Mesa" ]; then
PKG_DEPENDS="$PKG_DEPENDS Mesa glu"
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET Mesa glu"
@ -110,7 +102,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-debug \
--enable-dri2 \
--disable-dri3 \
--enable-present \
$XORG_XINERAMA \
--enable-xinerama \
--enable-xf86vidmode \
--disable-xace \
--disable-xselinux \