From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:49753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gstEy-0005pS-SE for guix-patches@gnu.org; Sun, 10 Feb 2019 12:50:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gstEw-0002pE-CS for guix-patches@gnu.org; Sun, 10 Feb 2019 12:50:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43460) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gstEw-0002oQ-4z for guix-patches@gnu.org; Sun, 10 Feb 2019 12:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gstEv-0007IS-QU for guix-patches@gnu.org; Sun, 10 Feb 2019 12:50:01 -0500 Subject: [bug#34189] [PATCH] gnu: Add arcan. Resent-Message-ID: From: L p R n d n References: <8736p08uwu.fsf@gnu.org> <87ftswr64a.fsf@gnu.org> Date: Sun, 10 Feb 2019 19:49:30 +0100 In-Reply-To: <87ftswr64a.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Sat, 09 Feb 2019 22:42:29 +0100") Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 34189@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > It is indeed fairly complex. To make things worse, the =E2=80=98COPYING= =E2=80=99 file > mixes licenses of arcan itself and licenses of its dependencies. It > would appear that that the 3 licenses you list above are those that > matter indeed and the combination is presumably GPLv2+. > > I think that =E2=80=9CLGPL=E2=80=9D means =E2=80=99lgpl2.0+=E2=80=99 thou= gh, not =E2=80=98lgpl2.0=E2=80=99. Could you > check whether source files that have a GPL or LGPL license header carry > the =E2=80=9Cor any later version=E2=80=9D wording? >From what I found, there are both lgpl2.0 and lgpl2.0+ in the package so I put both. I also added public-domain license as it seems quite a few files use it. >> From 5fba415f14018b66439520eedab1997c688fa158 Mon Sep 17 00:00:00 2001 >> From: Lprndn >> Date: Thu, 24 Jan 2019 13:29:21 +0100 >> Subject: [PATCH] gnu: Add arcan. >> >> * gnu/packages/arcan.scm: New file. > > With this patch and the changes below, I get: > > [ 73%] Performing build step for 'openal_lwa' > cd /tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/build/openal_lwa_= static && /gnu/store/a97p7wsm6y2g3qixx6hl9lzl2g0m3xpb-cmake-3.13.1/bin/cmak= e -Dmake=3Dmake -P /tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/bui= ld/openal_lwa-prefix/src/openal_lwa-stamp/openal_lwa-build-RelWithDebInfo.c= make > [ 74%] Building C object CMakeFiles/arcan.dir/platform/posix/psep_open.c.o > /gnu/store/n2p1zs14y89lwkg9da68y12pc10c6sw9-gcc-5.5.0/bin/gcc -DFRAMESERV= ER_MODESTRING=3D"\"terminal game net decode encode encode avfeed \"" -DOPEN= GL -DPLATFORM_HEADER=3D\"/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/sour= ce/src/platform/platform.h\" -DPOSIX_C_SOURCE -DUSB_SUPPORT -D_GNU_SOURCE -= D__LINUX -D__UNIX -I/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/sr= c/shmif/../shmif -I/gnu/store/j6g996l8kxxv8c76a9c61n3gi4s0wvdr-mesa-18.3.1/= include -I/gnu/store/j4pb0w8pn0kzy7v8lxcgf49jximznlh2-libdrm-2.4.96/include= /libdrm -I/gnu/store/8vcxd51d6n0sn2qmdn5m5c5pqr6bppn6-libxkbcommon-0.8.2/in= clude -I/gnu/store/mn9zmy5r2ja71i7slmbaaf2p6yp5bwk5-luajit-2.1.0-beta3/incl= ude/luajit-2.1 -I/gnu/store/apnls761623b73ky5xj0jwsbip8kz48f-openal-1.19.1/= include/AL -I/gnu/store/5dnkbi6zchkisgwx2914k0iafllcvv93-freetype-2.9.1/inc= lude/freetype2 -I/gnu/store/pba3xzrkq2k4wgh3arif4xpkblr5qz2n-sqlite-3.24.0/= include -I/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/src/platform= -I/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/src/../external -I/= tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/src/engine -I/gnu/store= /k8cixdby57xrmwqycc5870pb7gjv46z8-libusb-1.0.22/include/libusb-1.0 -O2 -g = -DNDEBUG -Wall -Wno-missing-braces -Wno-unused-function -Wno-unused-value= -Wno-unused-variable -Wformat=3D0 -std=3Dgnu11 -o CMakeFiles/arcan.dir/pla= tform/posix/psep_open.c.o -c /tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-= 0/source/src/platform/posix/psep_open.c > [ 74%] Building C object CMakeFiles/arcan.dir/platform/agp/glshared.c.o > /gnu/store/n2p1zs14y89lwkg9da68y12pc10c6sw9-gcc-5.5.0/bin/gcc -DFRAMESERV= ER_MODESTRING=3D"\"terminal game net decode encode encode avfeed \"" -DOPEN= GL -DPLATFORM_HEADER=3D\"/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/sour= ce/src/platform/platform.h\" -DPOSIX_C_SOURCE -DUSB_SUPPORT -D_GNU_SOURCE -= D__LINUX -D__UNIX -I/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/sr= c/shmif/../shmif -I/gnu/store/j6g996l8kxxv8c76a9c61n3gi4s0wvdr-mesa-18.3.1/= include -I/gnu/store/j4pb0w8pn0kzy7v8lxcgf49jximznlh2-libdrm-2.4.96/include= /libdrm -I/gnu/store/8vcxd51d6n0sn2qmdn5m5c5pqr6bppn6-libxkbcommon-0.8.2/in= clude -I/gnu/store/mn9zmy5r2ja71i7slmbaaf2p6yp5bwk5-luajit-2.1.0-beta3/incl= ude/luajit-2.1 -I/gnu/store/apnls761623b73ky5xj0jwsbip8kz48f-openal-1.19.1/= include/AL -I/gnu/store/5dnkbi6zchkisgwx2914k0iafllcvv93-freetype-2.9.1/inc= lude/freetype2 -I/gnu/store/pba3xzrkq2k4wgh3arif4xpkblr5qz2n-sqlite-3.24.0/= include -I/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/src/platform= -I/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/src/../external -I/= tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/src/engine -I/gnu/store= /k8cixdby57xrmwqycc5870pb7gjv46z8-libusb-1.0.22/include/libusb-1.0 -O2 -g = -DNDEBUG -Wall -Wno-missing-braces -Wno-unused-function -Wno-unused-value= -Wno-unused-variable -Wformat=3D0 -std=3Dgnu11 -o CMakeFiles/arcan.dir/pla= tform/agp/glshared.c.o -c /tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/s= ource/src/platform/agp/glshared.c > [ 75%] Building C object CMakeFiles/arcan.dir/platform/agp/shdrmgmt.c.o > /gnu/store/n2p1zs14y89lwkg9da68y12pc10c6sw9-gcc-5.5.0/bin/gcc -DFRAMESERV= ER_MODESTRING=3D"\"terminal game net decode encode encode avfeed \"" -DOPEN= GL -DPLATFORM_HEADER=3D\"/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/sour= ce/src/platform/platform.h\" -DPOSIX_C_SOURCE -DUSB_SUPPORT -D_GNU_SOURCE -= D__LINUX -D__UNIX -I/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/sr= c/shmif/../shmif -I/gnu/store/j6g996l8kxxv8c76a9c61n3gi4s0wvdr-mesa-18.3.1/= include -I/gnu/store/j4pb0w8pn0kzy7v8lxcgf49jximznlh2-libdrm-2.4.96/include= /libdrm -I/gnu/store/8vcxd51d6n0sn2qmdn5m5c5pqr6bppn6-libxkbcommon-0.8.2/in= clude -I/gnu/store/mn9zmy5r2ja71i7slmbaaf2p6yp5bwk5-luajit-2.1.0-beta3/incl= ude/luajit-2.1 -I/gnu/store/apnls761623b73ky5xj0jwsbip8kz48f-openal-1.19.1/= include/AL -I/gnu/store/5dnkbi6zchkisgwx2914k0iafllcvv93-freetype-2.9.1/inc= lude/freetype2 -I/gnu/store/pba3xzrkq2k4wgh3arif4xpkblr5qz2n-sqlite-3.24.0/= include -I/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/src/platform= -I/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/src/../external -I/= tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/src/engine -I/gnu/store= /k8cixdby57xrmwqycc5870pb7gjv46z8-libusb-1.0.22/include/libusb-1.0 -O2 -g = -DNDEBUG -Wall -Wno-missing-braces -Wno-unused-function -Wno-unused-value= -Wno-unused-variable -Wformat=3D0 -std=3Dgnu11 -o CMakeFiles/arcan.dir/pla= tform/agp/shdrmgmt.c.o -c /tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/s= ource/src/platform/agp/shdrmgmt.c > CMake Error at /tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/build= /openal_lwa-prefix/src/openal_lwa-stamp/openal_lwa-build-RelWithDebInfo.cma= ke:16 (message): > Command failed: 2 > > 'make' > > See also > > /tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/build/openal_lwa= -prefix/src/openal_lwa-stamp/openal_lwa-build-*.log > > > make[2]: *** [CMakeFiles/openal_lwa.dir/build.make:114: openal_lwa-prefix= /src/openal_lwa-stamp/openal_lwa-build] Error 1 > make[2]: Leaving directory '/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0= /source/build' > make[1]: *** [CMakeFiles/Makefile2:116: CMakeFiles/openal_lwa.dir/all] Er= ror 2 > > And the changes that were needed: > > diff --git a/gnu/local.mk b/gnu/local.mk > index 1ea8069308..97962110c4 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -65,6 +65,7 @@ GNU_SYSTEM_MODULES =3D \ > %D%/packages/antivirus.scm \ > %D%/packages/apl.scm \ > %D%/packages/apr.scm \ > + %D%/packages/arcan.scm \ > %D%/packages/aspell.scm \ > %D%/packages/assembly.scm \ > %D%/packages/astronomy.scm \ > diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm > index 9ff72a429b..e706f11edf 100644 > --- a/gnu/packages/arcan.scm > +++ b/gnu/packages/arcan.scm > @@ -21,8 +21,6 @@ > #:use-module (guix git-download) > #:use-module ((guix licenses) #:prefix license:) > #:use-module (guix packages) > - #:use-module (guix utils) > - > #:use-module (gnu packages apr) > #:use-module (gnu packages audio) > #:use-module (gnu packages compression) > @@ -38,6 +36,7 @@ > #:use-module (gnu packages pcre) > #:use-module (gnu packages pkg-config) > #:use-module (gnu packages ruby) > + #:use-module (gnu packages sqlite) > #:use-module (gnu packages video) > #:use-module (gnu packages xdisorg)) Unfortunately, I didn't manage to build the package with the changes you provided. I don't know what changed but after some investigation it seemed that arcan-openal wasn't found during build process. I switched from symlink to full copy-recursively and it seems to be ok now. Can you confirm? I join the 3 first patches again as some conflicts arised from he changes. Thanks! Have a nice day, Lprndn --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-arcan.patch Content-Transfer-Encoding: quoted-printable >From d6c6aeb76c97c8f7a3eb68a115bf2cb59715bac2 Mon Sep 17 00:00:00 2001 From: Lprndn Date: Thu, 24 Jan 2019 13:29:21 +0100 Subject: [PATCH] gnu: Add arcan. * gnu/packages/arcan.scm: New file. --- gnu/packages/arcan.scm | 160 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100644 gnu/packages/arcan.scm diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm new file mode 100644 index 0000000000..de2a839c13 --- /dev/null +++ b/gnu/packages/arcan.scm @@ -0,0 +1,160 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2019, L p R n d n +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages arcan) + #:use-module (guix build-system cmake) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix utils) + + #:use-module (gnu packages apr) + #:use-module (gnu packages audio) + #:use-module (gnu packages compression) + #:use-module (gnu packages databases) + #:use-module (gnu packages fontutils) + #:use-module (gnu packages gl) + #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) + #:use-module (gnu packages image) + #:use-module (gnu packages libusb) + #:use-module (gnu packages lua) + #:use-module (gnu packages ocr) + #:use-module (gnu packages pcre) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages ruby) + #:use-module (gnu packages sqlite) + #:use-module (gnu packages video) + #:use-module (gnu packages xdisorg)) + +(define-public arcan + (let ((commit "b4dd1fbd1938492ff4b269189d3c8524be7450a9") + (revision "1")) + (package + (name "arcan") + (version (git-version "0.5.5.2" revision commit)) + (source (origin + (method git-fetch) + (file-name (git-file-name name version)) + (uri (git-reference + (url "https://github.com/letoram/arcan.git") + (commit commit))) + (sha256 + (base32 "1pd0avlzc2rig1hd37zbhc7r2s6fjzdhshfg9l9cfzibl7ca= clyw")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DVIDEO_PLATFORM=3Degl-dri" "-DBUILTIN_LUA= =3Doff" + "-DSTATIC_OPENAL=3Doff""-DENABLE_LWA=3Don" + "-DSTATIC_SQLITE3=3Doff" "-DSTATIC_FREETYPE= =3Doff" + "-DSHMIF_TUI_ACCEL=3Don") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cmake-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/platform/cmake/modules/FindGBMKMS.cmake" + (("/usr/local/include/libdrm") + (string-append (assoc-ref inputs "libdrm") + "/include/libdrm"))) + (substitute* "src/platform/cmake/modules/FindAPR.cmake" + (("/usr/local/apr/include/apr-1") + (string-append (assoc-ref inputs "apr") + "/include/apr-1"))) + #t)) + ;; Normally, it tries to fetch patched openal with git + ;; but copying files manually in the right place seems to work = too. + (add-after 'unpack 'prepare-static-openal + (lambda* (#:key inputs #:allow-other-keys) + (let ((arcan-openal (assoc-ref inputs "arcan-openal"))) + (copy-recursively arcan-openal "external/git/openal")) + #t)) + (add-after 'prepare-static-openal 'generate-man + (lambda _ + (with-directory-excursion "doc" + (invoke "ruby" "docgen.rb" "mangen")) + #t)) + (add-before 'configure 'chdir + (lambda _ + (chdir "src") + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/arcan") + `("ARCAN_RESOURCEPATH" ":" suffix + (,(string-append out "/share/arcan/resources"))) + `("ARCAN_STATEBASEPATH" ":" =3D + ("$HOME/.arcan/resources/savestates")) + `("ARCAN_STATEPATH" ":" =3D + ("$HOME/.arcan/resources/savestates")) + `("ARCAN_BINPATH" ":" =3D + (,(string-append out "/bin/arcan_frameserver"))))) + #t))) + #:tests? #f)) + (native-search-paths + (list (search-path-specification + (variable "ARCAN_APPLBASEPATH") + (separator #f) + (files '("share/arcan/appl"))) + (search-path-specification + (variable "ARCAN_SCRIPTPATH") + (separator #f) + (files '("share/arcan/scripts"))))) + (inputs + `(("apr" ,apr) + ("ffmpeg" ,ffmpeg) + ("freetype" ,freetype) + ("glib" ,glib) + ("glu" ,glu) + ("harfbuzz" ,harfbuzz) + ("libdrm" ,libdrm) + ("libusb" ,libusb) + ("libxkbcommon" ,libxkbcommon) + ("lua" ,luajit) + ("lzip" ,lzip) + ("openal" ,openal) + ("pcre" ,pcre) + ("sqlite" ,sqlite) + ("tesseract-ocr" ,tesseract-ocr) + ("leptonica" ,leptonica) + ("vlc" ,vlc) + ;; To build arcan_lwa, we need a patched version of openal. + ;; https://github.com/letoram/arcan/wiki/packaging + ("arcan-openal" ,(origin + (method git-fetch) + (file-name "arcan-openal-0.5.4") + (uri (git-reference + (url "https://github.com/letoram/openal.= git") + (commit "1c7302c580964fee9ee9e1d89ff56d2= 4f934bdef"))) + (sha256 + (base32 + "0dcxcnqjkyyqdr2yk84mprvkncy5g172kfs6vc4zrkk= lsbkr8yi2")))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("ruby" ,ruby))) ; For documentation and testing + (home-page "https://arcan-fe.com") + (synopsis "Display server, multimedia framework and game engine (egl= -dri)") + (description "Arcan is a development framework for creating virtually +anything from user interfaces for specialized embedded applications +all the way to full-blown desktop environments. At its heart lies a multi= media +engine programmable using Lua.") + ;; https://github.com/letoram/arcan/blob/master/COPYING + (license (list license:gpl2+ + license:lgpl2.0 + license:lgpl2.0+ + license:public-domain + license:bsd-3))))) --=20 2.19.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-arcan-sdl.patch >From 4517b292cc36382ee0b855e3a5caf6c3ba5f4c2d Mon Sep 17 00:00:00 2001 From: Lprndn Date: Thu, 24 Jan 2019 13:34:26 +0100 Subject: [PATCH] gnu: Add arcan-sdl. * gnu/packages/arcan.scm (arcan-sdl): New variable. --- gnu/packages/arcan.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index de2a839c13..aa32acfb9f 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -38,9 +38,11 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages ruby) + #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) #:use-module (gnu packages video) - #:use-module (gnu packages xdisorg)) + #:use-module (gnu packages xdisorg) + #:use-module (srfi srfi-1)) (define-public arcan (let ((commit "b4dd1fbd1938492ff4b269189d3c8524be7450a9") @@ -158,3 +160,21 @@ engine programmable using Lua.") license:lgpl2.0+ license:public-domain license:bsd-3))))) + +(define-public arcan-sdl + (package + (inherit arcan) + (name "arcan-sdl") + (inputs + `(("sdl" ,sdl) + ,@(fold alist-delete (package-inputs arcan) + '("libdrm")))) + (arguments + `(,@(ensure-keyword-arguments + (package-arguments arcan) + '(#:configure-flags + '("-DVIDEO_PLATFORM=sdl" "-DBUILTIN_LUA=off" + "-DSTATIC_OPENAL=off" "-DDISABLE_JIT=off" + "-DENABLE_LWA=on" "-DSTATIC_SQLITE3=off" + "-DSTATIC_FREETYPE=off" "-DSHMIF_TUI_ACCEL=on"))))) + (synopsis "Combined display server, multimedia framework and game engine (sdl)"))) -- 2.19.2 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-xarcan.patch >From a0a69b664c3ada7522f42b8ea28ad08d8f39a5d4 Mon Sep 17 00:00:00 2001 From: Lprndn Date: Thu, 24 Jan 2019 13:39:06 +0100 Subject: [PATCH] gnu: Add xarcan. * gnu/packages/arcan.scm (xarcan): New variable. --- gnu/packages/arcan.scm | 67 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index aa32acfb9f..ba1526f10b 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -18,6 +18,7 @@ (define-module (gnu packages arcan) #:use-module (guix build-system cmake) + #:use-module (guix build-system gnu) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -25,6 +26,7 @@ #:use-module (gnu packages apr) #:use-module (gnu packages audio) + #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages fontutils) @@ -40,8 +42,10 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) + #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) (define-public arcan @@ -178,3 +182,66 @@ engine programmable using Lua.") "-DENABLE_LWA=on" "-DSTATIC_SQLITE3=off" "-DSTATIC_FREETYPE=off" "-DSHMIF_TUI_ACCEL=on"))))) (synopsis "Combined display server, multimedia framework and game engine (sdl)"))) + +(define-public xarcan + (package + (name "xarcan") + (version "0.5.4") + (source + (origin + (method git-fetch) + (file-name (git-file-name name version)) + (uri (git-reference + (url "https://github.com/letoram/xarcan.git") + (commit "8e6ee029388326cfe5cddeffe482eb3702e9b7f3"))) + (sha256 + (base32 "0zng7cs6733mnf0p6g5wv02981f2sf567n56csax6cmzb8fpamym")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + `("--enable-kdrive" "--enable-xarcan" + "--disable-xorg" "--disable-xwayland" + "--disable-xnest" "--disable-xvfb" + "--enable-glamor" "--enable-glx" + "--disable-int10-module" "--enable-ipv6" + "--enable-record" "--without-systemd-daemon" + "--enable-xcsecurity" "--disable-static" + ,(string-append "--with-xkb-path=" + (assoc-ref %build-inputs "xkeyboard-config") + "/share/X11/xkb") + ,(string-append "--with-xkb-bin-directory=" + (assoc-ref %build-inputs "xkbcomp") + "/bin") + ,(string-append "--with-xkb-output=" + "/tmp")) ; FIXME: Copied from xorg + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'noconfigure + (lambda _ + (setenv "NOCONFIGURE" "true") + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("util-macros" ,util-macros))) + (inputs + `(("arcan" ,arcan) + ("font-util" ,font-util) + ("libdrm" ,libdrm) + ("libepoxy" ,libepoxy) + ("libkbfile" ,libxkbfile) + ("libressl" ,libressl) + ("libx11" ,libx11) + ("libxfont2" ,libxfont2) + ("mesa" ,mesa) + ("pixman" ,pixman) + ("xkeyboard-config" ,xkeyboard-config) + ("xkbcomp" ,xkbcomp) + ("xorgproto" ,xorgproto) + ("xtrans" ,xtrans))) + (home-page "https://arcan-fe.com") + (synopsis "Patched Xserver that bridges connections to Arcan") + (description "Patched Xserver that bridges connections to Arcan.") + (license license:expat))) -- 2.19.2 --=-=-=--