From fdd3521d71e00215314c57532f00647af5ef62b4 Mon Sep 17 00:00:00 2001 From: q66 Date: Sat, 8 Feb 2020 16:20:32 +0100 Subject: [PATCH] arcan: remove arch-specific checks --- srcpkgs/arcan/template | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template index 57c143cf3a7..89e5693175a 100644 --- a/srcpkgs/arcan/template +++ b/srcpkgs/arcan/template @@ -1,11 +1,11 @@ # Template file for 'arcan' pkgname=arcan version=0.5.5.2 -revision=2 +revision=3 build_wrksrc=src build_style=cmake configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri" -makedepends="ffmpeg-devel harfbuzz-devel liblzma-devel +makedepends="ffmpeg-devel harfbuzz-devel liblzma-devel MesaLib-devel libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel') vlc-devel" short_desc="Combined display server, multimedia framework and game engine" @@ -18,20 +18,17 @@ distfiles="https://github.com/letoram/${pkgname}/archive/${version}.tar.gz checksum="a5f775789e22f6a4f16742ae9375bb5b7999aab83398adeab2bdc3f70c321cc0 3a50a87c05b67c466a868cc77f8dc7f9cfc9466aeeafcd823daca0d108c504da" -case "${XBPS_TARGET_MACHINE}" in - i686*|x86_64*|ppc64*) - makedepends+=" LuaJIT-devel" - ;; - armv7*|aarch64*) - configure_args+=" -DDISABLE_JIT=ON" - makedepends+=" MesaLib-devel lua51-devel" - ;; - armv[56]*|ppc*) - configure_args+=" -DDISABLE_JIT=ON" - makedepends+=" MesaLib-devel lua51-devel libatomic-devel" - CFLAGS+=" -latomic" - ;; -esac +if [ "$CROSS_BUILD" -a "$XBPS_TARGET_WORDSIZE" != "$XBPS_WORDSIZE" ]; then + configure_args+=" -DDISABLE_JIT=ON" + makedepends+=" lua51-devel" +else + makedepends+=" LuaJIT-devel" +fi + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + CFLAGS+=" -latomic" +fi build_options="tesseract" desc_option_tesseract="Enable support for OCR via tesseract"