From patchwork Thu Aug 10 18:16:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 52729 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0943927BBE9; Thu, 10 Aug 2023 19:27:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3DDB227BBE2 for ; Thu, 10 Aug 2023 19:26:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUAMN-0001aD-R8; Thu, 10 Aug 2023 14:26:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUAMM-0001ZJ-Jd for guix-patches@gnu.org; Thu, 10 Aug 2023 14:26:10 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qUAML-0005Ng-D7; Thu, 10 Aug 2023 14:26:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUAMH-0004LE-0G; Thu, 10 Aug 2023 14:26:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64387] [PATCH v2 5/6] gnu: arcan: Restyle format. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: paren@disroot.org, guix@cbaines.net, ludo@gnu.org, othacehe@gnu.org, rg@raghavgururajan.name, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Thu, 10 Aug 2023 18:26:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64387 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64387@debbugs.gnu.org Cc: Ahmad Draidi , paren@disroot.org, guix@cbaines.net, ludo@gnu.org, othacehe@gnu.org, rg@raghavgururajan.name, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, jgart@dismail.de X-Debbugs-Original-Xcc: paren@disroot.org, guix@cbaines.net, ludo@gnu.org, othacehe@gnu.org, rg@raghavgururajan.name, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, jgart@dismail.de Received: via spool by 64387-submit@debbugs.gnu.org id=B64387.169169196416676 (code B ref 64387); Thu, 10 Aug 2023 18:26:04 +0000 Received: (at 64387) by debbugs.gnu.org; 10 Aug 2023 18:26:04 +0000 Received: from localhost ([127.0.0.1]:44037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAMF-0004Ki-77 for submit@debbugs.gnu.org; Thu, 10 Aug 2023 14:26:03 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:57862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAMB-0004JS-9i for 64387@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:59 -0400 Received: from localhost.localdomain (bba-2-51-85-87.alshamil.net.ae [2.51.85.87]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 486A121D9; Thu, 10 Aug 2023 18:25:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1691691953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=emAQJtiUH9idOwji4smPz9uF8veMLdP5GBeZdr9DQgY=; b=xF+Q7pM+WkfN1nfsVtj1WiTRI8J6mBeHi4qjkBvKZQ0HN402yQUtueGkZtxAYIU5a5DAWx t3cs1f1VGkhzIkVMQhLZLFJdkm5TDcBjV4wlOAuGj4thPDTAQjmgnb53UC1T5RWkdfKyyn fwoy8UissYSvecxCyyCF3FiLzft0HrPPQZRtaba9X6Lxov5Pzg9xvT/cZ6llweNucypIzw 2B9z6yHqrhcI5boYqeSiky/iZicj922Kt9foWS+YlZJTJO5IDzXMr0Ylk5UV96a+eJAOqL k8rUsLhgSK8APkGvuoyhGUh4F65xNLH4eNUyd9/oAAGo3qjF5ZJZsytqGMpKyxFqpgLXKh tPezD/5SSQISlblLNqzuaSjJwd4hedypjL+27RDEFaWNZfoxb3h6I47mdVVXHaQBt74POD I4eIUGY1mK1TCvSU/CS0iB7rGCB5klJSP/jxOO15OQnvsq0PXxmMHf6hqdrmUQ/kMrMCIk Tc9m1L1uAwOsA9AR+v6k/6oRQDrwjhHWetCvGx7PDZzdr6TPgMzmR6rKknt3ZPvwbPPc5H OTlNGmZ4ZDSKPOmiN/ONk02fJaCYWLjSQ+RLb4Db8badaxzPceXEHopIfN8bGTrTaPA1tt QledcCoYkHSE8FWUAIXJ9f1xXVaCtKAUAmscYdNfE9EKP79Zau7as= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1691691953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=emAQJtiUH9idOwji4smPz9uF8veMLdP5GBeZdr9DQgY=; b=qC8ZJ8edwvcKsjmgyJq9oBUi4fvooVdkatZe8UK24smNKN5iwJJI8F/Bg2V1OQqAJdN+ck C6OrRsk3fSHh3TDA== Date: Thu, 10 Aug 2023 22:16:37 +0400 Message-ID: <9fdea3fa7c68a55e26ac21d73941c8bc8f07c687.1691691398.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Ahmad Draidi X-ACL-Warn: , Ahmad Draidi via Guix-patches X-Patchwork-Original-From: Ahmad Draidi via Guix-patches via From: Ahmad Draidi Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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