[bug#34189] [PATCH] gnu: Add arcan.

[L p R n d n]

Ludovic Courtès <address@hidden> 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 <address@hidden>
>> 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

0001-gnu-Add-arcan.patch
Description: Text Data

0001-gnu-Add-arcan-sdl.patch
Description: Text Data

0001-gnu-Add-xarcan.patch
Description: Text Data