From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#34189] [PATCH] gnu: Add arcan. Resent-Message-ID: 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> Date: Sat, 09 Feb 2019 22:42:29 +0100 Message-ID: <87ftswr64a.fsf@gnu.org> 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: L p R n d n Cc: 34189@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello! (Please keep 34189@debbugs.gnu.org Cc=E2=80=99d.) L p R n d n skribis: > Ludovic Court=C3=A8s writes: [...] >> Did you try vanilla OpenAL instead? If you have a pointer to a page >> explaining why this variant is needed, that=E2=80=99d be great! Also pl= ease add >> a =E2=80=98file-name=E2=80=99 for this =E2=80=98origin=E2=80=99. > > 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=E2=80=99s =E2=80=9Csub-optima= l=E2=80=9D, so there=E2=80=99s 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=E2=80=99s 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 =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 though= , 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 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_st= atic && /gnu/store/a97p7wsm6y2g3qixx6hl9lzl2g0m3xpb-cmake-3.13.1/bin/cmake = -Dmake=3Dmake -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.cma= ke [ 74%] Building C object CMakeFiles/arcan.dir/platform/posix/psep_open.c.o /gnu/store/n2p1zs14y89lwkg9da68y12pc10c6sw9-gcc-5.5.0/bin/gcc -DFRAMESERVER= _MODESTRING=3D"\"terminal game net decode encode encode avfeed \"" -DOPENGL= -DPLATFORM_HEADER=3D\"/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/in= clude -I/gnu/store/j4pb0w8pn0kzy7v8lxcgf49jximznlh2-libdrm-2.4.96/include/l= ibdrm -I/gnu/store/8vcxd51d6n0sn2qmdn5m5c5pqr6bppn6-libxkbcommon-0.8.2/incl= ude -I/gnu/store/mn9zmy5r2ja71i7slmbaaf2p6yp5bwk5-luajit-2.1.0-beta3/includ= e/luajit-2.1 -I/gnu/store/apnls761623b73ky5xj0jwsbip8kz48f-openal-1.19.1/in= clude/AL -I/gnu/store/5dnkbi6zchkisgwx2914k0iafllcvv93-freetype-2.9.1/inclu= de/freetype2 -I/gnu/store/pba3xzrkq2k4wgh3arif4xpkblr5qz2n-sqlite-3.24.0/in= clude -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/tm= p/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/src/engine -I/gnu/store/k= 8cixdby57xrmwqycc5870pb7gjv46z8-libusb-1.0.22/include/libusb-1.0 -O2 -g -D= NDEBUG -Wall -Wno-missing-braces -Wno-unused-function -Wno-unused-value -= Wno-unused-variable -Wformat=3D0 -std=3Dgnu11 -o CMakeFiles/arcan.dir/platf= orm/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=3D"\"terminal game net decode encode encode avfeed \"" -DOPENGL= -DPLATFORM_HEADER=3D\"/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/in= clude -I/gnu/store/j4pb0w8pn0kzy7v8lxcgf49jximznlh2-libdrm-2.4.96/include/l= ibdrm -I/gnu/store/8vcxd51d6n0sn2qmdn5m5c5pqr6bppn6-libxkbcommon-0.8.2/incl= ude -I/gnu/store/mn9zmy5r2ja71i7slmbaaf2p6yp5bwk5-luajit-2.1.0-beta3/includ= e/luajit-2.1 -I/gnu/store/apnls761623b73ky5xj0jwsbip8kz48f-openal-1.19.1/in= clude/AL -I/gnu/store/5dnkbi6zchkisgwx2914k0iafllcvv93-freetype-2.9.1/inclu= de/freetype2 -I/gnu/store/pba3xzrkq2k4wgh3arif4xpkblr5qz2n-sqlite-3.24.0/in= clude -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/tm= p/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/src/engine -I/gnu/store/k= 8cixdby57xrmwqycc5870pb7gjv46z8-libusb-1.0.22/include/libusb-1.0 -O2 -g -D= NDEBUG -Wall -Wno-missing-braces -Wno-unused-function -Wno-unused-value -= Wno-unused-variable -Wformat=3D0 -std=3Dgnu11 -o CMakeFiles/arcan.dir/platf= orm/agp/glshared.c.o -c /tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/sou= rce/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=3D"\"terminal game net decode encode encode avfeed \"" -DOPENGL= -DPLATFORM_HEADER=3D\"/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/in= clude -I/gnu/store/j4pb0w8pn0kzy7v8lxcgf49jximznlh2-libdrm-2.4.96/include/l= ibdrm -I/gnu/store/8vcxd51d6n0sn2qmdn5m5c5pqr6bppn6-libxkbcommon-0.8.2/incl= ude -I/gnu/store/mn9zmy5r2ja71i7slmbaaf2p6yp5bwk5-luajit-2.1.0-beta3/includ= e/luajit-2.1 -I/gnu/store/apnls761623b73ky5xj0jwsbip8kz48f-openal-1.19.1/in= clude/AL -I/gnu/store/5dnkbi6zchkisgwx2914k0iafllcvv93-freetype-2.9.1/inclu= de/freetype2 -I/gnu/store/pba3xzrkq2k4wgh3arif4xpkblr5qz2n-sqlite-3.24.0/in= clude -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/tm= p/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/src/engine -I/gnu/store/k= 8cixdby57xrmwqycc5870pb7gjv46z8-libusb-1.0.22/include/libusb-1.0 -O2 -g -D= NDEBUG -Wall -Wno-missing-braces -Wno-unused-function -Wno-unused-value -= Wno-unused-variable -Wformat=3D0 -std=3Dgnu11 -o CMakeFiles/arcan.dir/platf= orm/agp/shdrmgmt.c.o -c /tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/sou= rce/src/platform/agp/shdrmgmt.c CMake Error at /tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/source/build/o= penal_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-p= refix/src/openal_lwa-stamp/openal_lwa-build-*.log make[2]: *** [CMakeFiles/openal_lwa.dir/build.make:114: openal_lwa-prefix/s= rc/openal_lwa-stamp/openal_lwa-build] Error 1 make[2]: Leaving directory '/tmp/guix-build-arcan-0.5.5.2-1.b4dd1fb.drv-0/s= ource/build' make[1]: *** [CMakeFiles/Makefile2:116: CMakeFiles/openal_lwa.dir/all] Erro= r 2 --8<---------------cut here---------------end--------------->8--- And the changes that were needed: --=-=-= Content-Type: text/x-patch Content-Disposition: inline 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)) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: base64 DQpUaGFua3MsDQpMdWRv4oCZLg0K --=-=-=--