From patchwork Sat Feb 9 21:42:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 1008 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 BA40216BE5; Sat, 9 Feb 2019 21:43:12 +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 30E5016BE2 for ; Sat, 9 Feb 2019 21:43:12 +0000 (GMT) Received: from localhost ([127.0.0.1]:50259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsaP1-0002La-RS for patchwork@mira.cbaines.net; Sat, 09 Feb 2019 16:43:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gsaOv-0002LU-9K for guix-patches@gnu.org; Sat, 09 Feb 2019 16:43:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gsaOt-0006W3-DC for guix-patches@gnu.org; Sat, 09 Feb 2019 16:43:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42317) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gsaOs-0006Vh-Jt for guix-patches@gnu.org; Sat, 09 Feb 2019 16:43:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gsaOs-00074c-AE for guix-patches@gnu.org; Sat, 09 Feb 2019 16:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34189] [PATCH] gnu: Add arcan. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Feb 2019 21:43:02 +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: L p R n d n Received: via spool by 34189-submit@debbugs.gnu.org id=B34189.154974855527158 (code B ref 34189); Sat, 09 Feb 2019 21:43:02 +0000 Received: (at 34189) by debbugs.gnu.org; 9 Feb 2019 21:42:35 +0000 Received: from localhost ([127.0.0.1]:41598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gsaOR-00073y-5h for submit@debbugs.gnu.org; Sat, 09 Feb 2019 16:42:35 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:54858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gsaOP-00073p-0C for 34189@debbugs.gnu.org; Sat, 09 Feb 2019 16:42:34 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 8F98EDDF3; Sat, 9 Feb 2019 22:42:31 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hccfEgMd6j8r; Sat, 9 Feb 2019 22:42:30 +0100 (CET) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 741AADDD4; Sat, 9 Feb 2019 22:42:30 +0100 (CET) From: Ludovic =?utf-8?q?Court=C3=A8s?= In-Reply-To: (L. p. R. n. d. n.'s message of "Thu, 07 Feb 2019 22:32:50 +0100") References: <8736p08uwu.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 21 =?utf-8?b?UGx1dmnDtHNl?= an 227 de la =?utf-8?q?R?= =?utf-8?q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sat, 09 Feb 2019 22:42:29 +0100 Message-ID: <87ftswr64a.fsf@gnu.org> 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 Hello! (Please keep 34189@debbugs.gnu.org Cc’d.) L p R n d n skribis: > Ludovic Courtès writes: [...] >> Did you try vanilla OpenAL instead? If you have a pointer to a page >> explaining why this variant is needed, that’d be great! Also please add >> a ‘file-name’ for this ‘origin’. > > Vanilla OpenAl is used for the biggest part of the build but the patched > version is needed to build arcan_lwa. I put a link to packaging > guidelines. Is it enough? Yes (at least upstream does recognize that it’s “sub-optimal”, so there’s hope ;-)). >>> + (license (list license:gpl2+ >>> + license:lgpl2.0 >>> + license:bsd-3)))) >> >> Could you add a comment above explaining the meaning of the list >> (whether it’s triple-licensed or what)? > > I also put a link for that. Licenses here seem a little complexe and a bit > out of my reach. Should I put all the licenses used in COPYING file? 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 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: --8<---------------cut here---------------start------------->8--- [ 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 --8<---------------cut here---------------end--------------->8--- And the changes that were needed: Thanks, Ludo’. 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))