* [bug#34189] [PATCH] gnu: Add arcan.
@ 2019-01-24 12:54 L p R n d n
[not found] ` <handler.34189.B.154833088612044.ack@debbugs.gnu.org>
` (2 more replies)
0 siblings, 3 replies; 15+ messages in thread
From: L p R n d n @ 2019-01-24 12:54 UTC (permalink / raw)
To: 34189
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-Add-arcan.patch --]
[-- Type: text/x-patch, Size: 6121 bytes --]
From f1d5416c9d7a8a5ba5ecb4d380d06ee066b62a29 Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
Date: Thu, 24 Jan 2019 13:29:21 +0100
Subject: [PATCH] gnu: Add arcan.
* gnu/packages/arcan.scm New module.
* gnu/packages/arcan.scm (arcan): New variable.
---
gnu/packages/arcan.scm | 130 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 130 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 000000000..910464dec
--- /dev/null
+++ b/gnu/packages/arcan.scm
@@ -0,0 +1,130 @@
+(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 video)
+ #:use-module (gnu packages xdisorg))
+
+(define-public arcan
+ (package
+ (name "arcan")
+ (version "0.5.5.2") ;A few commits ahead, really. To fix some bugs.
+ (source (origin
+ (method git-fetch)
+ (file-name (git-file-name name version))
+ (uri (git-reference
+ (url "https://github.com/letoram/arcan.git")
+ (commit "b4dd1fbd1938492ff4b269189d3c8524be7450a9")))
+ (sha256
+ (base32
+ "1pd0avlzc2rig1hd37zbhc7r2s6fjzdhshfg9l9cfzibl7caclyw"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags '("-DVIDEO_PLATFORM=egl-dri" "-DBUILTIN_LUA=off"
+ "-DSTATIC_OPENAL=off""-DENABLE_LWA=on"
+ "-DSTATIC_SQLITE3=off" "-DSTATIC_FREETYPE=off"
+ "-DSHMIF_TUI_ACCEL=on")
+ #: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))
+ (add-after 'unpack 'prepare-static-openal ; For building arcan_lwa
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((arcan-openal (assoc-ref inputs "arcan-openal")))
+ (mkdir-p "external/openal")
+ (symlink 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" ":" =
+ ("$HOME/.arcan/resources/savestates"))
+ `("ARCAN_STATEPATH" ":" =
+ ("$HOME/.arcan/resources/savestates"))
+ `("ARCAN_BINPATH" ":" =
+ (,(string-append out "/bin/arcan_frameserver")))
+ `("ARCAN_SCRIPTPATH" ":" suffix
+ (,(string-append out "/share/arcan/scripts")))))
+ #t)))
+ #:tests? #f))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "ARCAN_APPLBASEPATH")
+ (separator #f)
+ (files '("share/arcan/appl")))))
+ (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)
+ ("arcan-openal" ,(origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/letoram/openal.git")
+ (commit "1c7302c580964fee9ee9e1d89ff56d24f934bdef")))
+ (sha256
+ (base32
+ "0dcxcnqjkyyqdr2yk84mprvkncy5g172kfs6vc4zrkklsbkr8yi2"))))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("ruby" ,ruby))) ; For documentation and testing
+ (home-page "https://arcan-fe.com")
+ (synopsis "Combined display server, multimedia framework and game engine (egl-dri)")
+ (description "Arcan is a powerful development framework for creating virtually
+anything from user interfaces for specialized embedded applications
+all the way to full-blown desktop environments")
+ (license (list license:gpl2+
+ license:lgpl2.0
+ license:bsd-3))))
--
2.19.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#34189] Acknowledgement ([PATCH] gnu: Add arcan.)
[not found] ` <handler.34189.B.154833088612044.ack@debbugs.gnu.org>
@ 2019-01-24 12:57 ` L p R n d n
2019-01-24 12:58 ` L p R n d n
` (4 subsequent siblings)
5 siblings, 0 replies; 15+ messages in thread
From: L p R n d n @ 2019-01-24 12:57 UTC (permalink / raw)
To: 34189
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-Add-arcan-sdl.patch --]
[-- Type: text/x-patch, Size: 1678 bytes --]
From acb1f8e7181a1e3d2b496f26e350582ca9b65db9 Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
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 910464dec..2765d805f 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -20,8 +20,10 @@
#: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 video)
- #:use-module (gnu packages xdisorg))
+ #:use-module (gnu packages xdisorg)
+ #:use-module (srfi srfi-1))
(define-public arcan
(package
@@ -128,3 +130,21 @@ all the way to full-blown desktop environments")
(license (list license:gpl2+
license:lgpl2.0
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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#34189] Acknowledgement ([PATCH] gnu: Add arcan.)
[not found] ` <handler.34189.B.154833088612044.ack@debbugs.gnu.org>
2019-01-24 12:57 ` [bug#34189] Acknowledgement ([PATCH] gnu: Add arcan.) L p R n d n
@ 2019-01-24 12:58 ` L p R n d n
2019-01-24 12:58 ` L p R n d n
` (3 subsequent siblings)
5 siblings, 0 replies; 15+ messages in thread
From: L p R n d n @ 2019-01-24 12:58 UTC (permalink / raw)
To: 34189
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-Add-xarcan.patch --]
[-- Type: text/x-patch, Size: 3926 bytes --]
From 425368a9858075a9aecf47bf5ace17eb939b43c3 Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
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 | 68 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index 2765d805f..f31fa635c 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -1,5 +1,6 @@
(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)
@@ -7,6 +8,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)
@@ -21,8 +23,10 @@
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages ruby)
#:use-module (gnu packages sdl)
+ #: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
@@ -148,3 +152,67 @@ all the way to full-blown desktop environments")
"-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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#34189] Acknowledgement ([PATCH] gnu: Add arcan.)
[not found] ` <handler.34189.B.154833088612044.ack@debbugs.gnu.org>
2019-01-24 12:57 ` [bug#34189] Acknowledgement ([PATCH] gnu: Add arcan.) L p R n d n
2019-01-24 12:58 ` L p R n d n
@ 2019-01-24 12:58 ` L p R n d n
2019-01-24 12:59 ` L p R n d n
` (2 subsequent siblings)
5 siblings, 0 replies; 15+ messages in thread
From: L p R n d n @ 2019-01-24 12:58 UTC (permalink / raw)
To: 34189
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-Add-arcan-wayland.patch --]
[-- Type: text/x-patch, Size: 2264 bytes --]
From 5b3d105490154aaf83a7cdf56f78e73829a9dfc7 Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
Date: Thu, 24 Jan 2019 13:41:30 +0100
Subject: [PATCH] gnu: Add arcan-wayland.
* gnu/packages/arcan.scm (arcan-wayland): New variable.
---
gnu/packages/arcan.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index f31fa635c..a3cdd0518 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -12,11 +12,13 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
#: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 linux)
#:use-module (gnu packages lua)
#:use-module (gnu packages ocr)
#:use-module (gnu packages pcre)
@@ -216,3 +218,33 @@ all the way to full-blown desktop environments")
(synopsis "Patched Xserver that bridges connections to Arcan")
(description "Patched Xserver that bridges connections to Arcan")
(license license:expat)))
+
+(define-public arcan-wayland
+ (package
+ (inherit arcan)
+ (name "arcan-wayland")
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("arcan" ,arcan)
+ ("libseccomp" ,libseccomp)
+ ("libxkbcommon" ,libxkbcommon)
+ ("mesa" ,mesa)
+ ("wayland" ,wayland)
+ ("wayland-protocols" ,wayland-protocols)))
+ (arguments
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "src/tools/waybridge")
+ #t))
+ (add-after 'unpack 'fix-cmake-find-shmif
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/platform/cmake/modules/Findarcan_shmif.cmake"
+ (("/usr/local") (string-append (assoc-ref inputs "arcan") "")))
+ #t)))))
+ (synopsis "Wayland protocol service for Arcan")
+ (description "Wayland protocol service for Arcan")
+ (license license:bsd-3)))
--
2.19.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#34189] Acknowledgement ([PATCH] gnu: Add arcan.)
[not found] ` <handler.34189.B.154833088612044.ack@debbugs.gnu.org>
` (2 preceding siblings ...)
2019-01-24 12:58 ` L p R n d n
@ 2019-01-24 12:59 ` L p R n d n
2019-01-24 12:59 ` L p R n d n
2019-01-24 12:59 ` L p R n d n
5 siblings, 0 replies; 15+ messages in thread
From: L p R n d n @ 2019-01-24 12:59 UTC (permalink / raw)
To: 34189
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-Add-aclip.patch --]
[-- Type: text/x-patch, Size: 1628 bytes --]
From 79b429fb23aed7c19212000a58b1c87113d66597 Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
Date: Thu, 24 Jan 2019 13:43:46 +0100
Subject: [PATCH] gnu: Add aclip.
* gnu/packages/arcan.scm (aclip): New variable.
---
gnu/packages/arcan.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index a3cdd0518..45f6329e5 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -248,3 +248,31 @@ all the way to full-blown desktop environments")
(synopsis "Wayland protocol service for Arcan")
(description "Wayland protocol service for Arcan")
(license license:bsd-3)))
+
+(define-public aclip
+ (package
+ (name "aclip")
+ (version (package-version arcan))
+ (source (package-source arcan))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("arcan" ,arcan)))
+ (arguments
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "src/tools/aclip")
+ #t))
+ (add-after 'unpack 'fix-cmake-find-shmif
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/platform/cmake/modules/Findarcan_shmif.cmake"
+ (("/usr/local") (string-append (assoc-ref inputs "arcan") "")))
+ #t)))))
+ (home-page "https://arcan-fe.com")
+ (synopsis "Clipboard manager for Arcan")
+ (description "Clipboard manager for Arcan")
+ (license license:bsd-3)))
--
2.19.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#34189] Acknowledgement ([PATCH] gnu: Add arcan.)
[not found] ` <handler.34189.B.154833088612044.ack@debbugs.gnu.org>
` (3 preceding siblings ...)
2019-01-24 12:59 ` L p R n d n
@ 2019-01-24 12:59 ` L p R n d n
2019-01-24 12:59 ` L p R n d n
5 siblings, 0 replies; 15+ messages in thread
From: L p R n d n @ 2019-01-24 12:59 UTC (permalink / raw)
To: 34189
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-Add-aloadimage.patch --]
[-- Type: text/x-patch, Size: 1665 bytes --]
From 4adf952f0363ef41d992eb5bad308da76ec44a5b Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
Date: Thu, 24 Jan 2019 13:45:03 +0100
Subject: [PATCH] gnu: Add aloadimage.
* gnu/packages/arcan.scm (aloadimage): New variable.
---
gnu/packages/arcan.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index 45f6329e5..3589ca55b 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -276,3 +276,32 @@ all the way to full-blown desktop environments")
(synopsis "Clipboard manager for Arcan")
(description "Clipboard manager for Arcan")
(license license:bsd-3)))
+
+(define-public aloadimage
+ (package
+ (name "aloadimage")
+ (version (package-version arcan))
+ (source (package-source arcan))
+ (build-system cmake-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("arcan" ,arcan)
+ ("libseccomp" ,libseccomp)))
+ (arguments
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "src/tools/aloadimage")
+ #t))
+ (add-after 'unpack 'fix-cmake-find-shmif
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/platform/cmake/modules/Findarcan_shmif.cmake"
+ (("/usr/local") (string-append (assoc-ref inputs "arcan") "")))
+ #t)))))
+ (home-page "https://arcan-fe.com")
+ (synopsis "Image viewer for Arcan")
+ (description "Image viewer for Arcan")
+ (license license:bsd-3)))
--
2.19.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#34189] Acknowledgement ([PATCH] gnu: Add arcan.)
[not found] ` <handler.34189.B.154833088612044.ack@debbugs.gnu.org>
` (4 preceding siblings ...)
2019-01-24 12:59 ` L p R n d n
@ 2019-01-24 12:59 ` L p R n d n
5 siblings, 0 replies; 15+ messages in thread
From: L p R n d n @ 2019-01-24 12:59 UTC (permalink / raw)
To: 34189
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-Add-durden.patch --]
[-- Type: text/x-patch, Size: 2570 bytes --]
From ce7d91129f67c9c9cd14c2cfcbd84c50b428f331 Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
Date: Thu, 24 Jan 2019 13:45:58 +0100
Subject: [PATCH] gnu: Add durden.
* gnu/packages/arcan.scm (durden): New variable.
---
gnu/packages/arcan.scm | 45 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index 3589ca55b..8c0bd8347 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -305,3 +305,48 @@ all the way to full-blown desktop environments")
(synopsis "Image viewer for Arcan")
(description "Image viewer for Arcan")
(license license:bsd-3)))
+
+(define-public durden
+ (package
+ (name "durden")
+ (version "0.5") ;We're actually a few commits ahead to fix some bugs
+ (source (origin
+ (method git-fetch)
+ (file-name (git-file-name name version))
+ (uri (git-reference
+ (url "https://github.com/letoram/durden.git")
+ (commit "aa95186202d2a2c6a256f8a13239d673ce54883b")))
+ (sha256
+ (base32 "09n1dc612j14jdfn0cvx8mypdv6wdw5sijlrzrfskx93lmzy918v"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (delete 'build)
+ (add-after 'unpack 'keep-env-applbase-path
+ (lambda _
+ (substitute* "distr/durden"
+ (("export ARCAN_APPLBASEPATH.*")
+ ""))
+ #t))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (appl (string-append out "/share/arcan/appl")))
+ (copy-recursively "durden" (string-append appl "/durden"))
+ (install-file "distr/durden" (string-append out "/bin"))))))))
+ (propagated-inputs
+ `(("adloadimage" ,aloadimage)
+ ("aclip" ,aclip)))
+ (home-page "http://durden.arcan-fe.com/")
+ (synopsis "Desktop Environment for Arcan")
+ (description "Durden is a desktop environment for the Arcan Display Server.
+It serves both as a reference showcase on how to take advantage of some of the
+features in Arcan, and as a very competent entry to the advanced-user
+side of the desktop environment spectrum")
+ (license (list license:bsd-3
+ license:cc-by3.0
+ license:cc-by4.0
+ license:asl2.0))))
--
2.19.2
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#34189] [PATCH] gnu: Add arcan.
2019-01-24 12:54 [bug#34189] [PATCH] gnu: Add arcan L p R n d n
[not found] ` <handler.34189.B.154833088612044.ack@debbugs.gnu.org>
@ 2019-02-06 21:32 ` Ludovic Courtès
[not found] ` <cucwombb7y5.fsf@lprndn.info>
2019-03-13 11:20 ` [bug#34189] " L p R n d n
2 siblings, 1 reply; 15+ messages in thread
From: Ludovic Courtès @ 2019-02-06 21:32 UTC (permalink / raw)
To: L p R n d n; +Cc: 34189
Hello,
Sorry for the delay! Here are some comments.
L p R n d n <guix@lprndn.info> skribis:
>>From f1d5416c9d7a8a5ba5ecb4d380d06ee066b62a29 Mon Sep 17 00:00:00 2001
> From: Lprndn <guix@lprndn.info>
> Date: Thu, 24 Jan 2019 13:29:21 +0100
> Subject: [PATCH] gnu: Add arcan.
>
> * gnu/packages/arcan.scm New module.
> * gnu/packages/arcan.scm (arcan): New variable.
Should be just:
* gnu/packages/arcan.scm: New file.
> +++ b/gnu/packages/arcan.scm
> @@ -0,0 +1,130 @@
> +(define-module (gnu packages arcan)
Please add the standard GPLv3+ header with a copyright line for yourself.
> + (package
> + (name "arcan")
> + (version "0.5.5.2") ;A few commits ahead, really. To fix some bugs.
Please use the versioning scheme for Git snapshots explained here:
https://www.gnu.org/software/guix/manual/en/html_node/Version-Numbers.html
> + `("ARCAN_SCRIPTPATH" ":" suffix
> + (,(string-append out "/share/arcan/scripts")))))
[...]
> + (native-search-paths
> + (list (search-path-specification
> + (variable "ARCAN_APPLBASEPATH")
> + (separator #f)
> + (files '("share/arcan/appl")))))
Should ARCAN_SCRIPTPATH also be here?
> + ("arcan-openal" ,(origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/letoram/openal.git")
> + (commit "1c7302c580964fee9ee9e1d89ff56d24f934bdef")))
> + (sha256
> + (base32
> + "0dcxcnqjkyyqdr2yk84mprvkncy5g172kfs6vc4zrkklsbkr8yi2"))))))
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’.
> + (native-inputs
> + `(("pkg-config" ,pkg-config)
> + ("ruby" ,ruby))) ; For documentation and testing
> + (home-page "https://arcan-fe.com")
> + (synopsis "Combined display server, multimedia framework and game engine (egl-dri)")
Maybe just “Multimedia framework and game engine”?
> + (description "Arcan is a powerful development framework for creating virtually
> +anything from user interfaces for specialized embedded applications
> +all the way to full-blown desktop environments")
Missing period at the end, “powerful” is maybe not factual enough, and
it would be good if you could expound with just a sentence or two (see
<https://www.gnu.org/software/guix/manual/en/html_node/Synopses-and-Descriptions.html>).
> + (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)?
Apart from that this LGTM. It’s great that you managed to unbundle
almost everything.
Could you send an updated patch?
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [bug#34189] [PATCH] gnu: Add arcan.
[not found] ` <cucwombb7y5.fsf@lprndn.info>
@ 2019-02-09 21:42 ` Ludovic Courtès
2019-02-10 18:49 ` L p R n d n
0 siblings, 1 reply; 15+ messages in thread
From: Ludovic Courtès @ 2019-02-09 21:42 UTC (permalink / raw)
To: L p R n d n; +Cc: 34189
[-- Attachment #1: Type: text/plain, Size: 7517 bytes --]
Hello!
(Please keep 34189@debbugs.gnu.org Cc’d.)
L p R n d n <guix@lprndn.info> skribis:
> Ludovic Courtès <ludo@gnu.org> 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 <guix@lprndn.info>
> 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:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1067 bytes --]
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))
[-- Attachment #3: Type: text/plain, Size: 21 bytes --]
Thanks,
Ludo’.
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#34189] [PATCH] gnu: Add arcan.
2019-02-09 21:42 ` Ludovic Courtès
@ 2019-02-10 18:49 ` L p R n d n
2019-03-04 14:10 ` Ludovic Courtès
0 siblings, 1 reply; 15+ messages in thread
From: L p R n d n @ 2019-02-10 18:49 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 34189
[-- Attachment #1: Type: text/plain, Size: 8210 bytes --]
Ludovic Courtès <ludo@gnu.org> 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 <guix@lprndn.info>
>> 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
[-- Attachment #2: 0001-gnu-Add-arcan.patch --]
[-- Type: text/x-patch, Size: 7828 bytes --]
From d6c6aeb76c97c8f7a3eb68a115bf2cb59715bac2 Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
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 © 2019, L p R n d n <guix@lprndn.info>
+;;;
+;;; 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 <http://www.gnu.org/licenses/>.
+
+(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 "1pd0avlzc2rig1hd37zbhc7r2s6fjzdhshfg9l9cfzibl7caclyw"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags '("-DVIDEO_PLATFORM=egl-dri" "-DBUILTIN_LUA=off"
+ "-DSTATIC_OPENAL=off""-DENABLE_LWA=on"
+ "-DSTATIC_SQLITE3=off" "-DSTATIC_FREETYPE=off"
+ "-DSHMIF_TUI_ACCEL=on")
+ #: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" ":" =
+ ("$HOME/.arcan/resources/savestates"))
+ `("ARCAN_STATEPATH" ":" =
+ ("$HOME/.arcan/resources/savestates"))
+ `("ARCAN_BINPATH" ":" =
+ (,(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 "1c7302c580964fee9ee9e1d89ff56d24f934bdef")))
+ (sha256
+ (base32
+ "0dcxcnqjkyyqdr2yk84mprvkncy5g172kfs6vc4zrkklsbkr8yi2"))))))
+ (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 multimedia
+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)))))
--
2.19.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0001-gnu-Add-arcan-sdl.patch --]
[-- Type: text/x-patch, Size: 1768 bytes --]
From 4517b292cc36382ee0b855e3a5caf6c3ba5f4c2d Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0001-gnu-Add-xarcan.patch --]
[-- Type: text/x-patch, Size: 3914 bytes --]
From a0a69b664c3ada7522f42b8ea28ad08d8f39a5d4 Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
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
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#34189] [PATCH] gnu: Add arcan.
2019-02-10 18:49 ` L p R n d n
@ 2019-03-04 14:10 ` Ludovic Courtès
2021-07-13 13:15 ` bug#34189: " Maxim Cournoyer
0 siblings, 1 reply; 15+ messages in thread
From: Ludovic Courtès @ 2019-03-04 14:10 UTC (permalink / raw)
To: L p R n d n; +Cc: 34189
Hello,
L p R n d n <guix@lprndn.info> skribis:
>> 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.
OK.
>> 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)
I re-added these changes.
> From d6c6aeb76c97c8f7a3eb68a115bf2cb59715bac2 Mon Sep 17 00:00:00 2001
> From: Lprndn <guix@lprndn.info>
> Date: Thu, 24 Jan 2019 13:29:21 +0100
> Subject: [PATCH] gnu: Add arcan.
>
> * gnu/packages/arcan.scm: New file.
Applied (with the changes above). I confirm that it builds for me on
x86_64-linux.
> From 4517b292cc36382ee0b855e3a5caf6c3ba5f4c2d Mon Sep 17 00:00:00 2001
> From: Lprndn <guix@lprndn.info>
> Date: Thu, 24 Jan 2019 13:34:26 +0100
> Subject: [PATCH] gnu: Add arcan-sdl.
>
> * gnu/packages/arcan.scm (arcan-sdl): New variable.
Applied.
> From a0a69b664c3ada7522f42b8ea28ad08d8f39a5d4 Mon Sep 17 00:00:00 2001
> From: Lprndn <guix@lprndn.info>
> Date: Thu, 24 Jan 2019 13:39:06 +0100
> Subject: [PATCH] gnu: Add xarcan.
>
> * gnu/packages/arcan.scm (xarcan): New variable.
[...]
> +(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"))))
Please use ‘git-version’ for the ‘version’ field, like you did for
‘arcan’.
> + (home-page "https://arcan-fe.com")
> + (synopsis "Patched Xserver that bridges connections to Arcan")
> + (description "Patched Xserver that bridges connections to Arcan.")
Please expound the description a bit—see
<https://gnu.org/s/guix/manual/en/html_node/Synopses-and-Descriptions.html>.
Sorry that this is taking so long, but at least we’re making progress!
:-)
Ludo’.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [bug#34189] [PATCH] gnu: Add arcan.
2019-01-24 12:54 [bug#34189] [PATCH] gnu: Add arcan L p R n d n
[not found] ` <handler.34189.B.154833088612044.ack@debbugs.gnu.org>
2019-02-06 21:32 ` [bug#34189] [PATCH] gnu: Add arcan Ludovic Courtès
@ 2019-03-13 11:20 ` L p R n d n
2019-03-18 9:37 ` Ludovic Courtès
2 siblings, 1 reply; 15+ messages in thread
From: L p R n d n @ 2019-03-13 11:20 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 34189
[-- Attachment #1: Type: text/plain, Size: 363 bytes --]
Hello,
Ludovic Courtès <ludo@gnu.org> writes:
[...]
>
> Sorry that this is taking so long, but at least we’re making progress!
> :-)
>
> Ludo’.
Don't worry I'm not very quick to answer myself and as long as we're
going forward, everything should be fine.
I join new patches for xarcan and arcan-wayland.
Thanks for your help!
Lprndn
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-xarcan.patch --]
[-- Type: text/x-patch, Size: 4244 bytes --]
From d94d5d01f46c006473c023620441f2f34d2f52c2 Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
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 | 71 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index aa32acfb9f..c7c81241f0 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,70 @@ 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
+ (let ((commit "8e6ee029388326cfe5cddeffe482eb3702e9b7f3")
+ (revision "1" ))
+ (package
+ (name "xarcan")
+ (version (git-version "0.5.4" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (file-name (git-file-name name version))
+ (uri (git-reference
+ (url "https://github.com/letoram/xarcan.git")
+ (commit commit)))
+ (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 with a KDrive backend that uses the arcan-shmif
+ to map Xlib/Xcb/X clients to a running arcan instance. It allows running an X session
+as a window under Arcan.")
+ (license license:expat))))
--
2.20.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0001-gnu-Add-arcan-wayland.patch --]
[-- Type: text/x-patch, Size: 2341 bytes --]
From eef364a45e520a6a9b34172b1ae0455d77a6c769 Mon Sep 17 00:00:00 2001
From: Lprndn <guix@lprndn.info>
Date: Thu, 24 Jan 2019 13:41:30 +0100
Subject: [PATCH] gnu: Add arcan-wayland.
* gnu/packages/arcan.scm (arcan-wayland): New variable.
---
gnu/packages/arcan.scm | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index c7c81241f0..b59e5637be 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -30,11 +30,13 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
#: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 linux)
#:use-module (gnu packages lua)
#:use-module (gnu packages ocr)
#:use-module (gnu packages pcre)
@@ -249,3 +251,35 @@ engine programmable using Lua.")
to map Xlib/Xcb/X clients to a running arcan instance. It allows running an X session
as a window under Arcan.")
(license license:expat))))
+
+(define-public arcan-wayland
+ (package
+ (inherit arcan)
+ (name "arcan-wayland")
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("arcan" ,arcan)
+ ("libseccomp" ,libseccomp)
+ ("libxkbcommon" ,libxkbcommon)
+ ("mesa" ,mesa)
+ ("wayland" ,wayland)
+ ("wayland-protocols" ,wayland-protocols)))
+ (arguments
+ `(#:tests? #f
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "src/tools/waybridge")
+ #t))
+ (add-after 'unpack 'fix-cmake-find-shmif
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/platform/cmake/modules/Findarcan_shmif.cmake"
+ (("/usr/local") (assoc-ref inputs "arcan")))
+ #t)))))
+ (synopsis "Wayland protocol service for Arcan")
+ (description "Arcan-wayland (waybridge) bridges Wayland connections
+with an Arcan connection point. It allows Wayland compatible clients
+to connect and render using Arcan.")
+ (license license:bsd-3)))
--
2.20.1
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [bug#34189] [PATCH] gnu: Add arcan.
2019-03-13 11:20 ` [bug#34189] " L p R n d n
@ 2019-03-18 9:37 ` Ludovic Courtès
2019-03-18 11:02 ` L p R n d n
0 siblings, 1 reply; 15+ messages in thread
From: Ludovic Courtès @ 2019-03-18 9:37 UTC (permalink / raw)
To: L p R n d n; +Cc: 34189
Hello,
L p R n d n <guix@lprndn.info> skribis:
> I join new patches for xarcan and arcan-wayland.
Perfect, I’ve applied both!
Are we done?
Thank you,
Ludo’.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [bug#34189] [PATCH] gnu: Add arcan.
2019-03-18 9:37 ` Ludovic Courtès
@ 2019-03-18 11:02 ` L p R n d n
0 siblings, 0 replies; 15+ messages in thread
From: L p R n d n @ 2019-03-18 11:02 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 34189
Hello,
Ludovic Courtès <ludo@gnu.org> writes:
> Hello,
>
> L p R n d n <guix@lprndn.info> skribis:
>
>> I join new patches for xarcan and arcan-wayland.
>
> Perfect, I’ve applied both!
>
> Are we done?
>
> Thank you,
> Ludo’.
Sorry, there are still aclip, aloadimage and durden. I didn't send a new
patch because they were not impacted by the previous changes. Do you
want me to send them again?
Thank you very much!
Lprndn
^ permalink raw reply [flat|nested] 15+ messages in thread
* bug#34189: [PATCH] gnu: Add arcan.
2019-03-04 14:10 ` Ludovic Courtès
@ 2021-07-13 13:15 ` Maxim Cournoyer
0 siblings, 0 replies; 15+ messages in thread
From: Maxim Cournoyer @ 2021-07-13 13:15 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 34189-done, L p R n d n
Hello,
I see the lats bit that appeared unresolved here has been committed, as
we have a 'xarcan' package in Guix now.
Thanks to both of you for your efforts!
Closing.
Maxim
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2021-07-13 13:17 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-24 12:54 [bug#34189] [PATCH] gnu: Add arcan L p R n d n
[not found] ` <handler.34189.B.154833088612044.ack@debbugs.gnu.org>
2019-01-24 12:57 ` [bug#34189] Acknowledgement ([PATCH] gnu: Add arcan.) L p R n d n
2019-01-24 12:58 ` L p R n d n
2019-01-24 12:58 ` L p R n d n
2019-01-24 12:59 ` L p R n d n
2019-01-24 12:59 ` L p R n d n
2019-01-24 12:59 ` L p R n d n
2019-02-06 21:32 ` [bug#34189] [PATCH] gnu: Add arcan Ludovic Courtès
[not found] ` <cucwombb7y5.fsf@lprndn.info>
2019-02-09 21:42 ` Ludovic Courtès
2019-02-10 18:49 ` L p R n d n
2019-03-04 14:10 ` Ludovic Courtès
2021-07-13 13:15 ` bug#34189: " Maxim Cournoyer
2019-03-13 11:20 ` [bug#34189] " L p R n d n
2019-03-18 9:37 ` Ludovic Courtès
2019-03-18 11:02 ` L p R n d n
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).