Re: [PR PATCH] [Updated] Arcan 0.6

[Piraty <Piraty@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

There is an updated pull request by Piraty against master on the void-packages repository

https://github.com/Piraty/void-packages arcan-0.6
https://github.com/void-linux/void-packages/pull/26915

Arcan 0.6
ping @letoram

A patch file from https://github.com/void-linux/void-packages/pull/26915.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-arcan-0.6-26915.patch --]
[-- Type: text/x-diff, Size: 16860 bytes --]

From 872c33c1a565294ebdc8f56409159a08476cb74e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 28 Jan 2019 21:48:24 +0100
Subject: [PATCH 1/7] arcan: update to 0.6.0.

---
 common/shlibs                                 |  9 +--
 ...uajit-outside-of-default-search-path.patch | 64 +++++++++++++++++++
 .../arcan/patches/010-tesseract-include.patch |  8 ---
 srcpkgs/arcan/template                        | 48 ++++++++------
 4 files changed, 97 insertions(+), 32 deletions(-)
 create mode 100644 srcpkgs/arcan/patches/0001-build-detect-luajit-outside-of-default-search-path.patch
 delete mode 100644 srcpkgs/arcan/patches/010-tesseract-include.patch

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..cdfffebd978 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3267,10 +3267,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.3.so.0 libpipewire-0.3.6_1
 libvolk.so.2.2.1 volk-2.2.1_1
diff --git a/srcpkgs/arcan/patches/0001-build-detect-luajit-outside-of-default-search-path.patch b/srcpkgs/arcan/patches/0001-build-detect-luajit-outside-of-default-search-path.patch
new file mode 100644
index 00000000000..a69d35a2320
--- /dev/null
+++ b/srcpkgs/arcan/patches/0001-build-detect-luajit-outside-of-default-search-path.patch
@@ -0,0 +1,64 @@
+From 375d9696461585ac226c5015026648a555312a60 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Fri, 27 Nov 2020 11:14:00 +0000
+Subject: [PATCH] (build) detect luajit outside of default search path
+
+CMake Error at CMakeLists.txt:8 (_message):
+  Could NOT find Lua51 (missing: LUA_INCLUDE_DIR)
+
+CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
+Please set them or make sure they are set and tested correctly in the CMake files:
+src/LUA_INCLUDE_DIR
+   used as include directory in directory src
+   used as include directory in directory src
+src/frameserver/game/LUA_INCLUDE_DIR
+   used as include directory in directory src/frameserver/game
+src/shmif/LUA_INCLUDE_DIR
+   used as include directory in directory src/shmif
+   used as include directory in directory src/shmif
+   used as include directory in directory src/shmif
+   used as include directory in directory src/shmif
+
+ld: error: unable to find library -lluajit-5.1
+
+LUA_INCLUDE_DIR:PATH=LUA_INCLUDE_DIR-NOTFOUND
+LUA_LIBRARY:FILEPATH=LUA_LIBRARY-NOTFOUND
+
+LUA_CFLAGS:INTERNAL=-I/usr/local/include/luajit-2.0
+LUA_FOUND:INTERNAL=1
+LUA_INCLUDEDIR:INTERNAL=/usr/local/include/luajit-2.0
+LUA_INCLUDE_DIRS:INTERNAL=/usr/local/include/luajit-2.0
+LUA_LDFLAGS:INTERNAL=-L/usr/local/lib;-lluajit-5.1
+LUA_LIBDIR:INTERNAL=/usr/local/lib
+LUA_LIBRARIES:INTERNAL=luajit-5.1
+LUA_LIBRARY_DIRS:INTERNAL=/usr/local/lib
+LUA_MODULE_NAME:INTERNAL=luajit
+LUA_PREFIX:INTERNAL=/usr/local
+LUA_STATIC_CFLAGS:INTERNAL=-I/usr/local/include/luajit-2.0
+LUA_STATIC_INCLUDE_DIRS:INTERNAL=/usr/local/include/luajit-2.0
+LUA_STATIC_LDFLAGS:INTERNAL=-L/usr/local/lib;-lluajit-5.1;-Wl,-E;-lm
+LUA_STATIC_LDFLAGS_OTHER:INTERNAL=-Wl,-E
+LUA_STATIC_LIBRARIES:INTERNAL=luajit-5.1;m
+LUA_STATIC_LIBRARY_DIRS:INTERNAL=/usr/local/lib
+LUA_VERSION:INTERNAL=2.0.5
+---
+ src/CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ce9dbd14..15d3e1be 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -439,6 +439,9 @@ else()
+ 			set(LUA_LINKTYPE "static")
+ 		else()
+ 			pkg_check_modules(LUA luajit REQUIRED)
++			find_library(LUA_LIBRARY NAMES ${LUA_LIBRARIES} PATHS ${LUA_LIBRARY_DIRS})
++			set(LUA_INCLUDE_DIR ${LUA_INCLUDE_DIRS})
++			set(LUA_LIBRARIES ${LUA_LINK_LIBRARIES})
+ 		endif()
+ 	endif()
+ 
+-- 
+2.29.2
+
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 <capi.h>
-+#include <tesseract/capi.h>
- #include <leptonica/allheaders.h>
- #include <arcan_shmif.h>
- #include "util/utf8.c"
diff --git a/srcpkgs/arcan/template b/srcpkgs/arcan/template
index 2e97c411161..69626b35687 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
+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 <piraty1@inbox.ru>"
 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="7b7aeb0fa6b89b7e3779d2e078b626566bdfa86c756d7ea1cc4f84b9e60d16a0
  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
 }
 

From 74438a296f5ffc371498480cfea50ef234fac190 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 26 Nov 2020 16:52:18 +0100
Subject: [PATCH 2/7] arcan-wayland: remove

arcan builds with wayland support by now
---
 srcpkgs/arcan-wayland/template | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 srcpkgs/arcan-wayland/template

diff --git a/srcpkgs/arcan-wayland/template b/srcpkgs/arcan-wayland/template
deleted file mode 100644
index cb666910d68..00000000000
--- a/srcpkgs/arcan-wayland/template
+++ /dev/null
@@ -1,25 +0,0 @@
-# Template file for 'arcan-wayland'
-# needs to be synced with the arcan package
-pkgname=arcan-wayland
-version=0.5.5.2
-revision=1
-wrksrc=arcan-${version}
-build_wrksrc=src/tools/waybridge
-build_style=cmake
-hostmakedepends="pkg-config"
-makedepends="MesaLib-devel arcan-devel libseccomp-devel libxkbcommon-devel
- wayland-devel wayland-protocols"
-short_desc="Wayland protocol service for Arcan"
-maintainer="Piraty <piraty1@inbox.ru>"
-license="BSD-3-Clause"
-homepage="https://arcan-fe.com/"
-distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz"
-checksum=a5f775789e22f6a4f16742ae9375bb5b7999aab83398adeab2bdc3f70c321cc0
-
-if [ "$CROSS_BUILD" ];then
-	hostmakedepends+=" wayland-devel"
-fi
-
-post_install() {
-	vlicense ../../../COPYING
-}

From a4c0b6fa4fd161fb71ce710b8c7315d4b9d05837 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 26 Nov 2020 18:42:04 +0100
Subject: [PATCH 3/7] acfgfs: update to 0.6.0.

---
 srcpkgs/acfgfs/patches/find-pkgconfig.patch | 18 ++++++++++++++++++
 srcpkgs/acfgfs/template                     |  8 +++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/acfgfs/patches/find-pkgconfig.patch

diff --git a/srcpkgs/acfgfs/patches/find-pkgconfig.patch b/srcpkgs/acfgfs/patches/find-pkgconfig.patch
new file mode 100644
index 00000000000..6e0519d7518
--- /dev/null
+++ b/srcpkgs/acfgfs/patches/find-pkgconfig.patch
@@ -0,0 +1,18 @@
+commit 55e0712681c12d641c3bcfcb47eae2674f17e6b0
+Author: bjornstahl <arcanfe@nospam>
+Date:   Fri Nov 27 18:37:40 2020 +0100
+
+    (build) find_sse/-DENABLE_SIMD=OFF + acfg pkgtool
+
+diff --git a/src/tools/acfgfs/CMakeLists.txt b/src/tools/acfgfs/CMakeLists.txt
+index 77f19475..4c151ef7 100644
+--- a/src/tools/acfgfs/CMakeLists.txt
++++ b/src/tools/acfgfs/CMakeLists.txt
+@@ -6,6 +6,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+ 	add_definitions(-D_DEBUG)
+ endif()
+ 
++find_package(PkgConfig REQUIRED)
+ find_package(arcan_shmif REQUIRED)
+ pkg_check_modules(FUSE3 REQUIRED fuse3)
+ find_package(Math REQUIRED)
diff --git a/srcpkgs/acfgfs/template b/srcpkgs/acfgfs/template
index cc139b5939a..c1119df9119 100644
--- a/srcpkgs/acfgfs/template
+++ b/srcpkgs/acfgfs/template
@@ -1,18 +1,20 @@
 # Template file for 'acfgfs'
-# needs to be synced with the arcan package
+# !! keep synced with arcan
 pkgname=acfgfs
-version=0.5.5.2
+version=0.6.0
 revision=1
 wrksrc=arcan-${version}
 build_wrksrc=src/tools/acfgfs
 build_style=cmake
+hostmakedepends="pkg-config"
 makedepends="arcan-devel fuse3-devel"
 short_desc="Configuration file system for Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://arcan-fe.com"
 distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz"
-checksum=a5f775789e22f6a4f16742ae9375bb5b7999aab83398adeab2bdc3f70c321cc0
+checksum=7b7aeb0fa6b89b7e3779d2e078b626566bdfa86c756d7ea1cc4f84b9e60d16a0
+patch_args="-Np1"
 
 case "${XBPS_TARGET_MACHINE}" in
 	i686|armv6l|armv7l|ppc)

From 9d03a09f3b4a2080e0c2f96f882befd3997829be Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 26 Nov 2020 18:42:08 +0100
Subject: [PATCH 4/7] aclip: update to 0.6.0.

---
 srcpkgs/aclip/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/aclip/template b/srcpkgs/aclip/template
index 8fde46c97fe..47046e557af 100644
--- a/srcpkgs/aclip/template
+++ b/srcpkgs/aclip/template
@@ -1,7 +1,7 @@
 # Template file for 'aclip'
-# needs to be synced with the arcan package
+# !! keep synced with arcan
 pkgname=aclip
-version=0.5.5.2
+version=0.6.0
 revision=1
 wrksrc=arcan-${version}
 build_wrksrc=src/tools/aclip
@@ -12,7 +12,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://arcan-fe.com/"
 distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz"
-checksum=a5f775789e22f6a4f16742ae9375bb5b7999aab83398adeab2bdc3f70c321cc0
+checksum=7b7aeb0fa6b89b7e3779d2e078b626566bdfa86c756d7ea1cc4f84b9e60d16a0
 
 post_install() {
 	vlicense ../../../COPYING

From 7442bf8c3d9257f559da7634f71fa6f70e07916b Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 26 Nov 2020 18:42:12 +0100
Subject: [PATCH 5/7] aloadimage: update to 0.6.0.

---
 srcpkgs/aloadimage/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/aloadimage/template b/srcpkgs/aloadimage/template
index fba7776c004..bd358568d9b 100644
--- a/srcpkgs/aloadimage/template
+++ b/srcpkgs/aloadimage/template
@@ -1,7 +1,7 @@
 # Template file for 'aloadimage'
-# needs to be synced with the arcan package
+# !! keep synced with arcan
 pkgname=aloadimage
-version=0.5.5.2
+version=0.6.0
 revision=1
 wrksrc="arcan-${version}"
 build_wrksrc=src/tools/aloadimage
@@ -13,7 +13,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://arcan-fe.com/"
 distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz"
-checksum=a5f775789e22f6a4f16742ae9375bb5b7999aab83398adeab2bdc3f70c321cc0
+checksum=7b7aeb0fa6b89b7e3779d2e078b626566bdfa86c756d7ea1cc4f84b9e60d16a0
 
 post_install() {
 	vlicense ../../../COPYING

From 927f1f084f82967ddc8c0f7c19a7dfadfde3ac0e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 26 Nov 2020 16:52:25 +0100
Subject: [PATCH 6/7] durden: update to 0.6.0.

---
 srcpkgs/durden/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/durden/template b/srcpkgs/durden/template
index d150a07ce5e..b466be9afb4 100644
--- a/srcpkgs/durden/template
+++ b/srcpkgs/durden/template
@@ -1,14 +1,14 @@
 # Template file for 'durden'
 pkgname=durden
-version=0.5
-revision=2
+version=0.6.0
+revision=1
 depends="aclip aloadimage"
 short_desc="Desktop environment for Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="http://durden.arcan-fe.com/"
 distfiles="https://github.com/letoram/${pkgname}/archive/${version}.tar.gz"
-checksum=f0cb0cdc6d16b4807efab5b6152b9f26813dccd2d66af5f1d80494769f840915
+checksum=6597d22f19e9c492b489305284bac955c091985d021ed2922fab22c93ed4d5c0
 
 do_install() {
 	vbin distr/durden

From 14553006eff55ac393f3a505fa6806cd64eb2b33 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 30 Nov 2020 12:29:00 +0100
Subject: [PATCH 7/7] xarcan: update to 0.6.0.

---
 srcpkgs/xarcan/template | 38 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 47ba49e376b..1c182c12d60 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,36 +1,22 @@
 # Template file for 'xarcan'
 pkgname=xarcan
-version=0.5.4
-revision=8
-build_style=gnu-configure
+version=0.6.0
+revision=1
+build_style=meson
+configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
+ -Ddefault_font_path=/usr/share/fonts/X11"
+hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
+makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
+ libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ xorgproto"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"
-license="MIT"
+license="MIT, BSD-3-Clause"
 homepage="https://github.com/letoram/xarcan"
 distfiles="https://github.com/letoram/xarcan/archive/${version}.tar.gz"
-checksum=ea37709c56b4c649ea2263531a02d511ff44dcd842833be5f8db41641045d5a1
-
-configure_args="--enable-kdrive --enable-xarcan --disable-xorg
- --disable-xwayland --disable-xnest --disable-xvfb --disable-glamor --enable-glx
- --disable-int10-module --with-xkb-path=/usr/share/X11/xkb
- --with-xkb-output=/var/lib/xkb  --enable-ipv6 --enable-record
- --with-fontrootdir=/usr/share/fonts/X11 --with-shared-memory-dir=/dev/shm
- --without-systemd-daemon --without-systemd-daemon --enable-xcsecurity --disable-static"
-
-hostmakedepends="automake libtool pkg-config xorg-util-macros font-util xtrans"
-makedepends="pixman-devel libdrm-devel libX11-devel
- MesaLib-devel libressl-devel libXfont2-devel libxkbfile-devel
- libepoxy-devel arcan-devel xorgproto"
-
-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
-}
+checksum=db582bf9c412842fb263d4eb5118f4c1eb6e7b579042a179044d9467fdb98193
 
 post_install() {
+	rm -rf ${DESTDIR}/usr/{include,lib,share}
 	vlicense COPYING
-	rm -rf ${DESTDIR}/var
-	rm -rf ${DESTDIR}/usr/{lib,share}
 }