mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
xorg-server: make OPENGL support optional
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
8d93bc0533
commit
2b3b60ee6a
@ -38,6 +38,12 @@ else
|
|||||||
XORG_XINERAMA="--disable-xinerama"
|
XORG_XINERAMA="--disable-xinerama"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$OPENGL" = "Mesa" ]; then
|
||||||
|
XORG_MESA="--enable-glx --enable-dri"
|
||||||
|
else
|
||||||
|
XORG_MESA="--disable-glx --disable-dri"
|
||||||
|
fi
|
||||||
|
|
||||||
# hack to prevent a build error
|
# hack to prevent a build error
|
||||||
CFLAGS=`echo $CFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"`
|
CFLAGS=`echo $CFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"`
|
||||||
LDFLAGS=`echo $LDFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"`
|
LDFLAGS=`echo $LDFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"`
|
||||||
@ -75,8 +81,7 @@ cd $PKG_BUILD
|
|||||||
--disable-screensaver \
|
--disable-screensaver \
|
||||||
--disable-xdmcp \
|
--disable-xdmcp \
|
||||||
--disable-xdm-auth-1 \
|
--disable-xdm-auth-1 \
|
||||||
--enable-glx \
|
$XORG_MESA \
|
||||||
--enable-dri \
|
|
||||||
--enable-dri2 \
|
--enable-dri2 \
|
||||||
--enable-xf86vidmode \
|
--enable-xf86vidmode \
|
||||||
--disable-xace \
|
--disable-xace \
|
||||||
|
@ -48,11 +48,16 @@ mkdir -p $XORG_DST
|
|||||||
mkdir -p $XORG_DST/extensions
|
mkdir -p $XORG_DST/extensions
|
||||||
cp -P $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions
|
cp -P $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions
|
||||||
cp -P $XORG_SRC/dixmods/.libs/librecord.so $XORG_DST/extensions
|
cp -P $XORG_SRC/dixmods/.libs/librecord.so $XORG_DST/extensions
|
||||||
cp -P $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions
|
|
||||||
cp -P $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions
|
cp -P $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions
|
||||||
cp -P $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions
|
cp -P $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions
|
||||||
cp -P $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers
|
|
||||||
ln -sf /var/lib/libglx.so $XORG_DST/extensions/libglx.so
|
if [ -f $XORG_SRC/dri/.libs/libdri.so ]; then
|
||||||
|
cp -P $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions
|
||||||
|
fi
|
||||||
|
if [ -f $XORG_SRC/dixmods/.libs/libglx.so ]; then
|
||||||
|
cp -P $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers
|
||||||
|
ln -sf /var/lib/libglx.so $XORG_DST/extensions/libglx.so
|
||||||
|
fi
|
||||||
|
|
||||||
mkdir -p $XORG_DST/multimedia
|
mkdir -p $XORG_DST/multimedia
|
||||||
cp -P $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia
|
cp -P $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia
|
||||||
|
@ -25,8 +25,8 @@ 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="libpciaccess libX11 libXfont libdrm Mesa openssl pixman systemd"
|
PKG_DEPENDS="libpciaccess libX11 libXfont libdrm openssl pixman systemd"
|
||||||
PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa openssl freetype pixman fontsproto systemd"
|
PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm openssl freetype pixman fontsproto systemd"
|
||||||
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"
|
||||||
@ -46,6 +46,11 @@ if [ "$XINERAMA_SUPPORT" = "yes" ]; then
|
|||||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXinerama"
|
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libXinerama"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$OPENGL" = "Mesa" ]; then
|
||||||
|
PKG_DEPENDS="$PKG_DEPENDS Mesa"
|
||||||
|
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS Mesa"
|
||||||
|
fi
|
||||||
|
|
||||||
# Additional packages we need for using xorg-server:
|
# Additional packages we need for using xorg-server:
|
||||||
# Fonts
|
# Fonts
|
||||||
PKG_DEPENDS="$PKG_DEPENDS encodings font-xfree86-type1 font-bitstream-type1 font-misc-misc"
|
PKG_DEPENDS="$PKG_DEPENDS encodings font-xfree86-type1 font-bitstream-type1 font-misc-misc"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user