xarcan: fix build

The package won't build if glamor is enabled because of a conflicting
declaration of GC thus disable glamor for now.
This commit is contained in:
Jürgen Buchmüller 2020-03-22 19:29:10 +01:00
parent 7073861336
commit c45a6a13a9

View file

@ -1,7 +1,7 @@
# Template file for 'xarcan' # Template file for 'xarcan'
pkgname=xarcan pkgname=xarcan
version=0.5.4 version=0.5.4
revision=6 revision=7
build_style=gnu-configure build_style=gnu-configure
short_desc="Patched Xserver that bridges connections to Arcan" short_desc="Patched Xserver that bridges connections to Arcan"
maintainer="Piraty <piraty1@inbox.ru>" maintainer="Piraty <piraty1@inbox.ru>"
@ -11,18 +11,21 @@ distfiles="https://github.com/letoram/xarcan/archive/${version}.tar.gz"
checksum=ea37709c56b4c649ea2263531a02d511ff44dcd842833be5f8db41641045d5a1 checksum=ea37709c56b4c649ea2263531a02d511ff44dcd842833be5f8db41641045d5a1
configure_args="--enable-kdrive --enable-xarcan --disable-xorg configure_args="--enable-kdrive --enable-xarcan --disable-xorg
--disable-xwayland --disable-xnest --disable-xvfb --enable-glamor --enable-glx --disable-xwayland --disable-xnest --disable-xvfb --disable-glamor --enable-glx
--disable-int10-module --with-xkb-path=/usr/share/X11/xkb --disable-int10-module --with-xkb-path=/usr/share/X11/xkb
--with-xkb-output=/var/lib/xkb --enable-ipv6 --enable-record --with-xkb-output=/var/lib/xkb --enable-ipv6 --enable-record
--with-fontrootdir=/usr/share/fonts/X11 --with-shared-memory-dir=/dev/shm --with-fontrootdir=/usr/share/fonts/X11 --with-shared-memory-dir=/dev/shm
--without-systemd-daemon --without-systemd-daemon --enable-xcsecurity --disable-static" --without-systemd-daemon --without-systemd-daemon --enable-xcsecurity --disable-static"
hostmakedepends="pkg-config autoconf automake libtool xorg-util-macros font-util xtrans" hostmakedepends="automake libtool pkg-config xorg-util-macros font-util xtrans"
makedepends=" makedepends="pixman-devel libdrm-devel libX11-devel
pixman-devel libdrm-devel libX11-devel MesaLib-devel libressl-devel MesaLib-devel libressl-devel libXfont2-devel libxkbfile-devel
libXfont2-devel libxkbfile-devel libepoxy-devel arcan-devel xorgproto" libepoxy-devel arcan-devel xorgproto"
pre_configure() { pre_configure() {
vsed -i configure.ac \
-e "s;gl >= 7.1.0;gl >= 1.2;" \
-e "s;gl >= 9.2.0;gl >= 1.2;"
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
} }