From: Ahmad Draidi via Guix-patches via <guix-patches@gnu.org>
To: 64387@debbugs.gnu.org
Cc: Ahmad Draidi <a.r.draidi@redscript.org>
Subject: [bug#64387] [PATCH 5/6] gnu: arcan: Restyle format.
Date: Sat, 1 Jul 2023 02:07:10 +0400 [thread overview]
Message-ID: <c61ccac10120874e089e9275d90720e996abb450.1688161433.git.a.r.draidi@redscript.org> (raw)
In-Reply-To: <cover.1688161433.git.a.r.draidi@redscript.org>
* gnu/packages/arcan.scm (arcan): Run 'guix style' over the package and
manually break some long lines.
---
gnu/packages/arcan.scm | 200 +++++++++++++++++++++--------------------
1 file changed, 101 insertions(+), 99 deletions(-)
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index 9c6092bb9e..05d2f58fc2 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -55,108 +55,110 @@ (define-module (gnu packages arcan)
#:use-module (srfi srfi-1))
(define-public arcan
- (package
- (name "arcan")
- (version "0.6.2.1")
- (source (origin
- (method git-fetch)
- (file-name (git-file-name name version))
- (uri (git-reference
- (url "https://github.com/letoram/arcan")
- (commit version)))
- (sha256
- (base32 "14wwb7mgq8ab39dfprps7hzdz7a37r3cl8dc5q6m1r8n5daxyzgc"))
- (modules '((guix build utils)))
- (snippet
- ;; Remove some bundled packages
- #~(begin
- (delete-file-recursively "external/git")
- (delete-file-recursively "external/lua")
- (delete-file-recursively "external/sqlite")))))
- (build-system cmake-build-system)
- (arguments
- (list #:configure-flags #~'("-DBUILD_PRESET=everything"
- "-DDISTR_TAG='Guix'")
- #:phases #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-paths
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "src/platform/posix/paths.c"
- (("/usr/local")
- (assoc-ref outputs "out")))))
- ;; 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)))
- #:tests? #f))
- (inputs
- `(("bash-minimal" ,bash-minimal)
- ("espeak" ,espeak)
- ("ffmpeg" ,ffmpeg)
- ("freetype" ,freetype)
- ("gumbo-parser" ,gumbo-parser)
- ("harfbuzz" ,harfbuzz)
- ("jbig2dec" ,jbig2dec)
- ("leptonica" ,leptonica)
- ("libdrm" ,libdrm)
- ("libjpeg-turbo" ,libjpeg-turbo)
- ("libseccomp" ,libseccomp)
- ("libusb" ,libusb)
- ("libvnc" ,libvnc)
- ("libxkbcommon" ,libxkbcommon)
- ("luajit" ,luajit)
- ("mupdf" ,mupdf)
- ("openal" ,openal)
- ("openjpeg" ,openjpeg)
- ("sdl2" ,sdl2)
- ("sqlite" ,sqlite)
- ("tesseract-ocr" ,tesseract-ocr)
- ("vlc" ,vlc)
- ("wayland" ,wayland)
- ("wayland-protocols" ,wayland-protocols)
- ("xcb-util" ,xcb-util)
- ("xcb-util-wm" ,xcb-util-wm)
- ("zlib" ,zlib)
- ;; 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.6.2")
- (uri (git-reference
- (url "https://github.com/letoram/openal")
- (commit "0.6.2")))
- (sha256
- (base32
- "0vg3fda47q2dk1n43ijcc64q39z044pa8h6scmfyi22g6r6bfw2z"))))))
- (native-inputs
- (list pkg-config ruby)) ; For documentation and testing
- (home-page "https://arcan-fe.com")
- (synopsis "Display server, multimedia framework and game engine")
- (description "Arcan is a development framework for creating virtually
+ (package
+ (name "arcan")
+ (version "0.6.2.1")
+ (source (origin
+ (method git-fetch)
+ (file-name (git-file-name name version))
+ (uri (git-reference
+ (url "https://github.com/letoram/arcan")
+ (commit version)))
+ (sha256
+ (base32
+ "14wwb7mgq8ab39dfprps7hzdz7a37r3cl8dc5q6m1r8n5daxyzgc"))
+ (modules '((guix build utils)))
+ (snippet
+ ;; Remove some bundled packages
+ #~(begin
+ (delete-file-recursively "external/git")
+ (delete-file-recursively "external/lua")
+ (delete-file-recursively "external/sqlite")))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:configure-flags #~'("-DBUILD_PRESET=everything"
+ "-DDISTR_TAG='Guix'")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "src/platform/posix/paths.c"
+ (("/usr/local")
+ (assoc-ref outputs "out")))))
+ ;; 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)))
+ #:tests? #f))
+ (inputs `(("bash-minimal" ,bash-minimal)
+ ("espeak" ,espeak)
+ ("ffmpeg" ,ffmpeg)
+ ("freetype" ,freetype)
+ ("gumbo-parser" ,gumbo-parser)
+ ("harfbuzz" ,harfbuzz)
+ ("jbig2dec" ,jbig2dec)
+ ("leptonica" ,leptonica)
+ ("libdrm" ,libdrm)
+ ("libjpeg-turbo" ,libjpeg-turbo)
+ ("libseccomp" ,libseccomp)
+ ("libusb" ,libusb)
+ ("libvnc" ,libvnc)
+ ("libxkbcommon" ,libxkbcommon)
+ ("luajit" ,luajit)
+ ("mupdf" ,mupdf)
+ ("openal" ,openal)
+ ("openjpeg" ,openjpeg)
+ ("sdl2" ,sdl2)
+ ("sqlite" ,sqlite)
+ ("tesseract-ocr" ,tesseract-ocr)
+ ("vlc" ,vlc)
+ ("wayland" ,wayland)
+ ("wayland-protocols" ,wayland-protocols)
+ ("xcb-util" ,xcb-util)
+ ("xcb-util-wm" ,xcb-util-wm)
+ ("zlib" ,zlib)
+ ;; 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.6.2")
+ (uri (git-reference (url
+ "https://github.com/letoram/openal")
+ (commit "0.6.2")))
+ (sha256
+ (base32
+ "0vg3fda47q2dk1n43ijcc64q39z044pa8h6scmfyi22g6r6bfw2z"))))))
+ (native-inputs (list pkg-config ruby)) ;For documentation and testing
+ (home-page "https://arcan-fe.com")
+ (synopsis "Display server, multimedia framework and game engine")
+ (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 with a Lua scripting interface.")
- ;; https://github.com/letoram/arcan/blob/master/COPYING
- (license (list license:asl2.0
- license:bsd-3
- license:cc-by3.0
- license:expat
- license:gpl2+
- license:lgpl2.0
- license:lgpl2.0+
- license:public-domain
- license:silofl1.1
- license:zlib))))
+ ;; https://github.com/letoram/arcan/blob/master/COPYING
+ (license (list license:asl2.0
+ license:bsd-3
+ license:cc-by3.0
+ license:expat
+ license:gpl2+
+ license:lgpl2.0
+ license:lgpl2.0+
+ license:public-domain
+ license:silofl1.1
+ license:zlib))))
(define-public arcan-sdl
(package
--
2.40.1
next prev parent reply other threads:[~2023-06-30 22:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-30 22:01 [bug#64387] [PATCH 0/6] Update and rework arcan Ahmad Draidi via Guix-patches via
2023-06-30 22:07 ` [bug#64387] [PATCH 1/6] gnu: arcan: Update to 0.6.2.1 Ahmad Draidi via Guix-patches via
2023-06-30 22:07 ` [bug#64387] [PATCH 2/6] gnu: arcan: Build all features Ahmad Draidi via Guix-patches via
2023-06-30 22:07 ` [bug#64387] [PATCH 3/6] gnu: arcan: Fix paths handling Ahmad Draidi via Guix-patches via
2023-06-30 22:07 ` [bug#64387] [PATCH 4/6] gnu: arcan: Use new style arguments Ahmad Draidi via Guix-patches via
2023-06-30 22:07 ` Ahmad Draidi via Guix-patches via [this message]
2023-06-30 22:07 ` [bug#64387] [PATCH 6/6] gnu: Remove arcan-wayland Ahmad Draidi via Guix-patches via
2023-08-10 18:16 ` [bug#64387] [PATCH v2 0/6] Update and rework arcan Ahmad Draidi via Guix-patches via
2023-08-10 18:16 ` [bug#64387] [PATCH v2 1/6] gnu: arcan: Update to 0.6.2.1 Ahmad Draidi via Guix-patches via
2023-08-10 18:16 ` [bug#64387] [PATCH v2 2/6] gnu: arcan: Build all features Ahmad Draidi via Guix-patches via
2023-08-10 18:16 ` [bug#64387] [PATCH v2 3/6] gnu: arcan: Fix paths handling Ahmad Draidi via Guix-patches via
2023-08-10 18:16 ` [bug#64387] [PATCH v2 4/6] gnu: arcan: Use new style arguments Ahmad Draidi via Guix-patches via
2023-08-10 18:16 ` [bug#64387] [PATCH v2 5/6] gnu: arcan: Restyle format Ahmad Draidi via Guix-patches via
2023-08-10 18:16 ` [bug#64387] [PATCH v2 6/6] gnu: arcan-wayland: Deprecate in favor of "arcan" Ahmad Draidi via Guix-patches via
2023-09-06 0:40 ` bug#64387: [PATCH 0/6] Update and rework arcan Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c61ccac10120874e089e9275d90720e996abb450.1688161433.git.a.r.draidi@redscript.org \
--to=guix-patches@gnu.org \
--cc=64387@debbugs.gnu.org \
--cc=a.r.draidi@redscript.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).