From patchwork Sun Feb 10 18:49:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: L p R n d n X-Patchwork-Id: 1015 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1AA7116BF3; Sun, 10 Feb 2019 17:50:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2DFFA16BEE for ; Sun, 10 Feb 2019 17:50:14 +0000 (GMT) Received: from localhost ([127.0.0.1]:33848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gstF7-0005ra-KN for patchwork@mira.cbaines.net; Sun, 10 Feb 2019 12:50:13 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#34189] [PATCH] gnu: Add arcan. Resent-From: L p R n d n Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Feb 2019 17:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34189 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 34189-submit@debbugs.gnu.org id=B34189.154982097428002 (code B ref 34189); Sun, 10 Feb 2019 17:50:01 +0000 Received: (at 34189) by debbugs.gnu.org; 10 Feb 2019 17:49:34 +0000 Received: from localhost ([127.0.0.1]:42741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gstET-0007HZ-RR for submit@debbugs.gnu.org; Sun, 10 Feb 2019 12:49:34 -0500 Received: from mout01.posteo.de ([185.67.36.141]:55790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gstEQ-0007HL-NK for 34189@debbugs.gnu.org; Sun, 10 Feb 2019 12:49:32 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id C383816005D for <34189@debbugs.gnu.org>; Sun, 10 Feb 2019 18:49:24 +0100 (CET) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 43yGdH2x44z6tmM; Sun, 10 Feb 2019 18:49:23 +0100 (CET) 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: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 34189@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Ludovic Courtès writes: > It is indeed fairly complex. To make things worse, the ‘COPYING’ 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 “LGPL” means ’lgpl2.0+’ though, not ‘lgpl2.0’. Could you > check whether source files that have a GPL or LGPL license header carry > the “or any later version” 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/cmake -Dmake=make -P /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.cmake > [ 74%] Building C object CMakeFiles/arcan.dir/platform/posix/psep_open.c.o > /gnu/store/n2p1zs14y89lwkg9da68y12pc10c6sw9-gcc-5.5.0/bin/gcc -DFRAMESERVER_MODESTRING="\"terminal game net decode encode encode avfeed \"" -DOPENGL -DPLATFORM_HEADER=\"/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/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/src/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/include -I/gnu/store/mn9zmy5r2ja71i7slmbaaf2p6yp5bwk5-luajit-2.1.0-beta3/include/luajit-2.1 -I/gnu/store/apnls761623b73ky5xj0jwsbip8kz48f-openal-1.19.1/include/AL -I/gnu/store/5dnkbi6zchkisgwx2914k0iafllcvv93-freetype-2.9.1/include/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=0 -std=gnu11 -o CMakeFiles/arcan.dir/platform/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 -DFRAMESERVER_MODESTRING="\"terminal game net decode encode encode avfeed \"" -DOPENGL -DPLATFORM_HEADER=\"/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/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/src/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/include -I/gnu/store/mn9zmy5r2ja71i7slmbaaf2p6yp5bwk5-luajit-2.1.0-beta3/include/luajit-2.1 -I/gnu/store/apnls761623b73ky5xj0jwsbip8kz48f-openal-1.19.1/include/AL -I/gnu/store/5dnkbi6zchkisgwx2914k0iafllcvv93-freetype-2.9.1/include/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=0 -std=gnu11 -o CMakeFiles/arcan.dir/platform/agp/glshared.c.o -c /tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/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 -DFRAMESERVER_MODESTRING="\"terminal game net decode encode encode avfeed \"" -DOPENGL -DPLATFORM_HEADER=\"/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/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/src/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/include -I/gnu/store/mn9zmy5r2ja71i7slmbaaf2p6yp5bwk5-luajit-2.1.0-beta3/include/luajit-2.1 -I/gnu/store/apnls761623b73ky5xj0jwsbip8kz48f-openal-1.19.1/include/AL -I/gnu/store/5dnkbi6zchkisgwx2914k0iafllcvv93-freetype-2.9.1/include/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=0 -std=gnu11 -o CMakeFiles/arcan.dir/platform/agp/shdrmgmt.c.o -c /tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/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.cmake: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] Error 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 = \ > %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 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