diff --git a/common/shlibs b/common/shlibs index 76b3f458b15..01cc7e86e1f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3262,10 +3262,11 @@ libaacs.so.0 libaacs-0.9.0_1 libttfautohint.so.1 ttfautohint-1.8.1_1 libcob.so.4 gnucobol-libs-2.2_1 libkrfbprivate.so.5.0 krfb-17.08.1_1 -libarcan_shmif.so.0.11 arcan-0.5.4.3_1 -libarcan_shmif_ext.so.0.11 arcan-0.5.4.3_1 -libarcan_shmif_server.so.0.11 arcan-0.5.4.3_1 -libarcan_tui.so.0.11 arcan-0.5.4.3_1 +libarcan_shmif.so.0.13 arcan-0.6.0_1 +libarcan_shmif_ext.so.0.13 arcan-0.6.0_1 +libarcan_shmif_server.so.0.13 arcan-0.6.0_1 +libarcan_tui.so.0.13 arcan-0.6.0_1 +libarcan_a12.so.0.1 arcan-0.6.0_1 liblwipv6.so.2 lwipv6-1.5a_1 libpipewire-0.2.so.1 libpipewire0.2-0.2.7_1 libpipewire-0.3.so.0 libpipewire-0.3.6_1 diff --git a/srcpkgs/arcan/patches/010-tesseract-include.patch b/srcpkgs/arcan/patches/010-tesseract-include.patch deleted file mode 100644 index 78714b92e57..00000000000 --- a/srcpkgs/arcan/patches/010-tesseract-include.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- src/frameserver/encode/default/ocr.c -+++ src/frameserver/encode/default/ocr.c -@@ -1,4 +1,4 @@ --#include -+#include - #include - #include - #include "util/utf8.c" diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template index 2e97c411161..9c891aa8238 100644 --- a/srcpkgs/arcan/template +++ b/srcpkgs/arcan/template @@ -1,13 +1,21 @@ # Template file for 'arcan' pkgname=arcan -version=0.5.5.2 -revision=3 +version=0.6.0.1 +revision=1 build_wrksrc=src build_style=cmake -configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri" -makedepends="ffmpeg-devel harfbuzz-devel liblzma-devel MesaLib-devel +configure_args="-DDISTR_TAG='Void Linux' -DVIDEO_PLATFORM=egl-dri + $(vopt_if luajit '-DDISABLE_JIT=OFF' '-DDISABLE_JIT=ON')" +hostmakedepends="pkg-config + $(vopt_if wayland wayland-devel)" +makedepends="MesaLib-devel ffmpeg-devel file-devel freetype-devel liblzma-devel libopenal-devel libusb-devel libvncserver-devel libxkbcommon-devel sqlite-devel - $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel') vlc-devel" + vlc-devel + $(vopt_if tts 'libespeak-devel') + $(vopt_if luajit 'LuaJIT-devel' 'lua51-devel') + $(vopt_if tesseract 'tesseract-ocr-devel leptonica-devel') + $(vopt_if wayland 'wayland-devel wayland-protocols libxcb-devel xcb-util-wm-devel') + " short_desc="Combined display server, multimedia framework and game engine" maintainer="Piraty " license="GPL-2.0-or-later, LGPL-2.0-or-later, BSD-3-Clause" @@ -15,31 +23,31 @@ homepage="https://arcan-fe.com/" _versionOpenal=0.5.4 distfiles="https://github.com/letoram/${pkgname}/archive/${version}.tar.gz https://github.com/letoram/openal/archive/${_versionOpenal}.tar.gz>openal_arcan.${_versionOpenal}.tar.gz" -checksum="a5f775789e22f6a4f16742ae9375bb5b7999aab83398adeab2bdc3f70c321cc0 +checksum="7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed 3a50a87c05b67c466a868cc77f8dc7f9cfc9466aeeafcd823daca0d108c504da" +patch_args="-Np1" -if [ "$XBPS_TARGET_WORDSIZE" != "$XBPS_WORDSIZE" ]; then - configure_args+=" -DDISABLE_JIT=ON" - makedepends+=" lua51-devel" -else - makedepends+=" LuaJIT-devel" +replaces="arcan-wayland>=0" + +build_options="luajit tesseract tts wayland" +desc_option_tts="Enable support for text-to-speech via espeak" +desc_option_tesseract="Enable support for OCR via tesseract" +desc_option_luajit="Enable support for LuaJIT" +build_options_default="tesseract wayland" + +# luajit is restricted to matching wordsize of host/target +if [ "$XBPS_TARGET_WORDSIZE" = "$XBPS_WORDSIZE" ]; then + build_options_default+=" luajit" fi -CFLAGS="-fcommon" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" CFLAGS="-latomic" fi -build_options="tesseract" -desc_option_tesseract="Enable support for OCR via tesseract" -build_options_default="tesseract" - -# the _lwa part of the build relies on a patched openAL implementation -# that is statically linked - pre_configure() { - # provide patched openAL + # provide patched openAL. the _lwa part of the build relies on a patched + # openAL implementation that is statically linked ln -s ${XBPS_BUILDDIR}/openal-${_versionOpenal} ${XBPS_BUILDDIR}/arcan-${version}/external/git/openal }