From ee23d62f494e1247fb47ee95657410632c14f2c5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 12 Jan 2014 16:03:01 +0100 Subject: [PATCH] xorg-server: enable xinerama support, libXinerama is needed for xorg-server-1.15, so remove optional support for now Signed-off-by: Stephan Raue --- config/graphic | 5 ----- packages/x11/xserver/xorg-server/package.mk | 14 +++----------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/config/graphic b/config/graphic index e292936b9d..f57527acf1 100644 --- a/config/graphic +++ b/config/graphic @@ -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 diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk index 3e1de6485c..697484d1a1 100644 --- a/packages/x11/xserver/xorg-server/package.mk +++ b/packages/x11/xserver/xorg-server/package.mk @@ -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 \