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

xorg-server: use $OPENGL instead hardcoded 'Mesa' as GL provider, disable dependencies of 'libepoxy' and 'glu' and 'libglamor' support for non GL builds

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-10-12 16:40:59 +02:00
parent c98854a689
commit 240523fe76
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="OSS" PKG_LICENSE="OSS"
PKG_SITE="http://www.X.org" PKG_SITE="http://www.X.org"
PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS_TARGET="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto dri3proto fixesproto damageproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto presentproto libpciaccess libX11 libXfont libXinerama libxshmfence libxkbfile libdrm libressl freetype pixman fontsproto libepoxy systemd xorg-launch-helper" PKG_DEPENDS_TARGET="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto dri3proto fixesproto damageproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto presentproto libpciaccess libX11 libXfont libXinerama libxshmfence libxkbfile libdrm libressl freetype pixman fontsproto systemd xorg-launch-helper"
PKG_PRIORITY="optional" PKG_PRIORITY="optional"
PKG_SECTION="x11/xserver" PKG_SECTION="x11/xserver"
PKG_SHORTDESC="xorg-server: The Xorg X server" PKG_SHORTDESC="xorg-server: The Xorg X server"
@ -41,11 +41,11 @@ else
XORG_COMPOSITE="--disable-composite" XORG_COMPOSITE="--disable-composite"
fi fi
if [ "$OPENGL" = "Mesa" ]; then if [ ! "$OPENGL" = "no" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Mesa glu" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET glproto $OPENGL libepoxy glu"
XORG_MESA="--enable-glx --enable-dri" XORG_MESA="--enable-glx --enable-dri --enable-glamor"
else else
XORG_MESA="--disable-glx --disable-dri" XORG_MESA="--disable-glx --disable-dri --disable-glamor"
fi fi
PKG_CONFIGURE_OPTS_TARGET="--disable-debug \ PKG_CONFIGURE_OPTS_TARGET="--disable-debug \
@ -105,7 +105,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-debug \
--disable-xquartz \ --disable-xquartz \
--disable-standalone-xpbproxy \ --disable-standalone-xpbproxy \
--disable-xwin \ --disable-xwin \
--enable-glamor \
--disable-kdrive \ --disable-kdrive \
--disable-xephyr \ --disable-xephyr \
--disable-xfake \ --disable-xfake \
@ -150,11 +149,13 @@ post_makeinstall_target() {
mkdir -p $INSTALL/usr/lib/xorg mkdir -p $INSTALL/usr/lib/xorg
cp -P $PKG_DIR/scripts/xorg-configure $INSTALL/usr/lib/xorg cp -P $PKG_DIR/scripts/xorg-configure $INSTALL/usr/lib/xorg
if [ ! "$OPENGL" = "no" ]; then
if [ -f $INSTALL/usr/lib/xorg/modules/extensions/libglx.so ]; then if [ -f $INSTALL/usr/lib/xorg/modules/extensions/libglx.so ]; then
mv $INSTALL/usr/lib/xorg/modules/extensions/libglx.so \ mv $INSTALL/usr/lib/xorg/modules/extensions/libglx.so \
$INSTALL/usr/lib/xorg/modules/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers $INSTALL/usr/lib/xorg/modules/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers
ln -sf /var/lib/libglx.so $INSTALL/usr/lib/xorg/modules/extensions/libglx.so ln -sf /var/lib/libglx.so $INSTALL/usr/lib/xorg/modules/extensions/libglx.so
fi fi
fi
mkdir -p $INSTALL/etc/X11 mkdir -p $INSTALL/etc/X11
if [ -f $PROJECT_DIR/$PROJECT/xorg/xorg.conf ]; then if [ -f $PROJECT_DIR/$PROJECT/xorg/xorg.conf ]; then