From patchwork Fri Jun 30 22:07:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 51474 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 DB07A27BBE9; Fri, 30 Jun 2023 23:08:20 +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 65C0F27BBE2 for ; Fri, 30 Jun 2023 23:08:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFMHb-0002e4-Ut; Fri, 30 Jun 2023 18:08:03 -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 1qFMHa-0002bp-4R for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFMHZ-0002Af-Rr for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qFMHZ-00032m-JJ for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64387] [PATCH 1/6] gnu: arcan: Update to 0.6.2.1. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Jun 2023 22:08:01 +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 Received: via spool by 64387-submit@debbugs.gnu.org id=B64387.168816285211607 (code B ref 64387); Fri, 30 Jun 2023 22:08:01 +0000 Received: (at 64387) by debbugs.gnu.org; 30 Jun 2023 22:07:32 +0000 Received: from localhost ([127.0.0.1]:55920 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMH5-000318-Mv for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:32 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:48726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMH3-00030v-6J for 64387@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:30 -0400 Received: from localhost.localdomain (bba-92-97-100-179.alshamil.net.ae [92.97.100.179]) (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 084E42B4E; Fri, 30 Jun 2023 22:07:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688162842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fr/bUas3YatdRRV+tnfJXBr7masxmCI62tYnUNraIkc=; b=QrMcF7/S3DyB7CE49Ku/Hpeh8UflNCTYzPcA8KGeIyy/WTEuLXIPemmrZdlQGuelWeBWCT uenUGMzzQyYV+OXzw57360AZq6oQ8A9t6hZBLNkIIDcivC0Czei7LPJHrxrOS8MQP71de9 6ArCl9yeIdlhI9tLccZOm0cdDyrt5mZlY0jDPNP0msGRkvvH0lcmxhthKCnGrG4aN9L45j 4SXxggwGLcaJT3bBStSEYxPaMGwUoKMhFnUhFnyBicow9/IEfDgHG/x8vxSzStntJhOEik e2IWAdogelaqPHiv7QCBn+uZTzGEFgKzBs55+EXQ+rtvXydsQNLnD2Us66robgxS1k0G4t jMCrV5TU0CLYFD74uA2NPZwGmgppwYSPglhjNCAU6pi9Gp8uWwvJ3NLuDucRFnKCuZLdFI v/rSZm3OZ5an7HMWu/vhDhfK+/J1ha82tXjoF5iQEnH0ofk/ciANDJfIriw6q/NRH7bBrA PJO+CG1IGiDVow4LFK5PPuT1UEbHCuYYjQVJ0WTAbZW4G/9nV9bYj9R/3zn1H73SXHRwB4 9XqgzZJLZI9MkgjgkGbDxCxnGWd8hrhVMRjjsmsHrwPOiwwB7nTA55wnLKNn78o1W9ZjIb qKlF43CKLxnvxeeEEEgHPjBeDkeF/OXcJrkrjEnr2UD80oNP9Plss= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688162843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fr/bUas3YatdRRV+tnfJXBr7masxmCI62tYnUNraIkc=; b=/6v5fCeR0Z32chQRkkiIos4RHvKpZDp++AuSZWiVQlzk3DmamQFE4Z+UkKG3VStnU0xjlH lkkir8PO4a4UZ9Dw== Date: Sat, 1 Jul 2023 02:07:06 +0400 Message-Id: X-Mailer: git-send-email 2.40.1 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): Update to 0.6.2.1. [use-modules]: Remove no longer used package imports and add ones for new dependencies. Add '(guix gexp)' for snippet. [source]: Use version instead of commit, and add snippet to remove some bundled packages. [arguments]: Remove 'fix-cmake-paths' phase since it's no longer needed. [inputs]: Remove apr, glib, glu, lzip, pcre. Add bash-minimal, espeak, gumbo-parser, jbig2dec, libjpeg-turbo, libseccomp, libvnc, mupdf, openjpeg, sdl2, wayland, wayland-protocols, xcb-util, xcb-util-wm, zlib. Replace ffmpeg-4 with ffmpeg. Change luajit label to fix lint. Update vendored openal to 0.6.2. Sort inputs by name. [description]: Change description to closely match upstream for accuracy. [license]: Add new and missing licenses. --- gnu/packages/arcan.scm | 77 +++++++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 7483777ff0..f4eecb3364 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 L p R n d n ;;; Copyright © 2021 Guillaume Le Vaillant +;;; Copyright © 2023 Ahmad Draidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,50 +21,58 @@ (define-module (gnu packages arcan) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #: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 autotools) + #:use-module (gnu packages bash) #: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) + #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) + #:use-module (gnu packages speech) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages video) + #:use-module (gnu packages vnc) + #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) (define-public arcan - (let ((commit "b4dd1fbd1938492ff4b269189d3c8524be7450a9") - (revision "1")) (package (name "arcan") - (version (git-version "0.5.5.2" revision commit)) + (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 commit))) + (commit version))) (sha256 - (base32 "1pd0avlzc2rig1hd37zbhc7r2s6fjzdhshfg9l9cfzibl7caclyw")))) + (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 `(#:configure-flags '("-DCMAKE_C_FLAGS=-fcommon" @@ -73,15 +82,6 @@ (define-public arcan "-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") - (search-input-directory inputs "include/libdrm"))) - (substitute* "src/platform/cmake/modules/FindAPR.cmake" - (("/usr/local/apr/include/apr-1") - (search-input-directory inputs "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 @@ -122,34 +122,44 @@ (define-public arcan (separator #f) (files '("share/arcan/scripts"))))) (inputs - `(("apr" ,apr) - ("ffmpeg" ,ffmpeg-4) + `(("bash-minimal" ,bash-minimal) + ("espeak" ,espeak) + ("ffmpeg" ,ffmpeg) ("freetype" ,freetype) - ("glib" ,glib) - ("glu" ,glu) + ("gumbo-parser" ,gumbo-parser) ("harfbuzz" ,harfbuzz) + ("jbig2dec" ,jbig2dec) + ("leptonica" ,leptonica) ("libdrm" ,libdrm) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libseccomp" ,libseccomp) ("libusb" ,libusb) + ("libvnc" ,libvnc) ("libxkbcommon" ,libxkbcommon) - ("lua" ,luajit) - ("lzip" ,lzip) + ("luajit" ,luajit) + ("mupdf" ,mupdf) ("openal" ,openal) - ("pcre" ,pcre) + ("openjpeg" ,openjpeg) + ("sdl2" ,sdl2) ("sqlite" ,sqlite) ("tesseract-ocr" ,tesseract-ocr) - ("leptonica" ,leptonica) ("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.5.4") + (file-name "arcan-openal-0.6.2") (uri (git-reference (url "https://github.com/letoram/openal") - (commit "1c7302c580964fee9ee9e1d89ff56d24f934bdef"))) + (commit "0.6.2"))) (sha256 (base32 - "0dcxcnqjkyyqdr2yk84mprvkncy5g172kfs6vc4zrkklsbkr8yi2")))))) + "0vg3fda47q2dk1n43ijcc64q39z044pa8h6scmfyi22g6r6bfw2z")))))) (native-inputs (list pkg-config ruby)) ; For documentation and testing (home-page "https://arcan-fe.com") @@ -157,13 +167,18 @@ (define-public arcan (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.") +engine with a Lua scripting interface.") ;; https://github.com/letoram/arcan/blob/master/COPYING - (license (list license:gpl2+ + (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:bsd-3))))) + license:silofl1.1 + license:zlib)))) (define-public arcan-sdl (package From patchwork Fri Jun 30 22:07:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 51477 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 8D65427BBE9; Fri, 30 Jun 2023 23:08:41 +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 E132D27BBE2 for ; Fri, 30 Jun 2023 23:08:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFMHc-0002eY-6J; Fri, 30 Jun 2023 18:08:04 -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 1qFMHa-0002by-Fu for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFMHa-0002BR-6R for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qFMHa-00032u-20 for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64387] [PATCH 2/6] gnu: arcan: Build all features. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Jun 2023 22:08:01 +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 Received: via spool by 64387-submit@debbugs.gnu.org id=B64387.168816286211631 (code B ref 64387); Fri, 30 Jun 2023 22:08:01 +0000 Received: (at 64387) by debbugs.gnu.org; 30 Jun 2023 22:07:42 +0000 Received: from localhost ([127.0.0.1]:55924 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHG-00031X-9h for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:42 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:41362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHD-00031I-SF for 64387@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:40 -0400 Received: from localhost.localdomain (bba-92-97-100-179.alshamil.net.ae [92.97.100.179]) (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 CEB012B4E; Fri, 30 Jun 2023 22:07:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688162854; 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=NPMpAPz/19/ahLgLEjugXs7yDl0zEl6BMT88cJiBJS8=; b=o3dKL+Uc9F6CjctwWn2tOgMW/F+H7B74OdgCopsJrbD3W1ln/CluGoUVRSQ1I8ily8xN0o ccQzdVKA0Cq8p8BidMrvrwGz8Fe1GFWwwq4kYJopmPxUUM1l760rKB21nlfH7xBIUx8djS XshDwVH1UavVBVjUYtpK6FY9AmAUnTG1QDqZzyTnVhz9vulJCyOVlwdpeZKnMjhpRRBxHx vXyLDhmAPhDERMQCAPV7q0FQgy7hThtMDh8WZgzgWPrzoTIM8/vkfOXzT8vHRwCiUzKTIy O1S7GvblDgdCfoYstxHo5ZpYei0RuQ8/lR1hb0Nl49P2aHLh6Dd1uRgr5xLXthonV6oS4D gdPo0nGatjMagwj6+JV6VBSByfqxQslC3BpTxu3fo96obtu12/9xt9xnICFTlVWV14zW79 8e/HMsKkSeFDOLMQMukRwsBdDYbsE5W+3ZvF7sYSsDYFHjCeMvN+bq5KnLnGJDMfYq6V4c BLxXD5T/yZHrtVISLk/nIYfdfwkfJe9DbFxZTEKuyogVWMsX8hWperUEUFIZS7p1FKZ0iq 9qrsq+PvMUykao84zgFKH7ti8KawbcUOp21NOKAPYzUEiI9oPstA7O1z7tzHcmrv6F9Q6Q cobBJ+tlplO47x+zg3G2ytooWWGwqM53Qkobve1ioRpsm6Z3HFrSI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688162854; 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=NPMpAPz/19/ahLgLEjugXs7yDl0zEl6BMT88cJiBJS8=; b=vxCZGDvTjmELPJxiZMhtjSd3PNy/6cRKQ7Zs6uizKInKKkgdte1kmBzsELK0G+Ihk1qomy Z4zP8spD2Xpb60Ag== Date: Sat, 1 Jul 2023 02:07:07 +0400 Message-Id: <8574825bcdb9d85ea62771a7671b8dc2d4c57c18.1688161433.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.40.1 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): Build all features. [arguments]: Use #:configure-flags "-DBUILD_PRESET=everything" to build all features, and "-DDISTR_TAG='Guix'" to tag the builds. [synopsis]: Remove '(egl-dri)' since it indicates a specific feature. --- gnu/packages/arcan.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index f4eecb3364..cfd72f6e55 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -75,11 +75,8 @@ (define-public arcan (delete-file-recursively "external/sqlite"))))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DCMAKE_C_FLAGS=-fcommon" - "-DVIDEO_PLATFORM=egl-dri" "-DBUILTIN_LUA=off" - "-DSTATIC_OPENAL=off""-DENABLE_LWA=on" - "-DSTATIC_SQLITE3=off" "-DSTATIC_FREETYPE=off" - "-DSHMIF_TUI_ACCEL=on") + `(#:configure-flags '("-DBUILD_PRESET=everything" + "-DDISTR_TAG='Guix'") #:phases (modify-phases %standard-phases ;; Normally, it tries to fetch patched openal with git @@ -163,7 +160,7 @@ (define-public arcan (native-inputs (list pkg-config ruby)) ; For documentation and testing (home-page "https://arcan-fe.com") - (synopsis "Display server, multimedia framework and game engine (egl-dri)") + (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 From patchwork Fri Jun 30 22:07:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 51476 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 D867327BBE9; Fri, 30 Jun 2023 23:08:32 +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 5ACB527BBE2 for ; Fri, 30 Jun 2023 23:08:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFMHe-0002fa-GD; Fri, 30 Jun 2023 18:08:06 -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 1qFMHa-0002dP-To for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFMHa-0002CI-L3 for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qFMHa-000332-Hf for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64387] [PATCH 3/6] gnu: arcan: Fix paths handling. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Jun 2023 22:08:02 +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 Received: via spool by 64387-submit@debbugs.gnu.org id=B64387.168816286811650 (code B ref 64387); Fri, 30 Jun 2023 22:08:02 +0000 Received: (at 64387) by debbugs.gnu.org; 30 Jun 2023 22:07:48 +0000 Received: from localhost ([127.0.0.1]:55928 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHL-00031q-NX for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:48 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:41370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHI-00031O-Id for 64387@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:44 -0400 Received: from localhost.localdomain (bba-92-97-100-179.alshamil.net.ae [92.97.100.179]) (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 3ACD23854; Fri, 30 Jun 2023 22:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688162858; 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=hj6ebMp4hK66n+NySaoSYY8gJdTb1nxhHjaTXl8IMM8=; b=OXM9OWXUBuCzaNKmT2tVIa2zUBCXqzFzw/nAXoLC7vqRQKtJsYwVHS8bNlPT7nSKNzfhv8 2f2V4fUXbZevuRzlcZUGl6/WNlSVGavVSTcWvHJTN5tFWu0l3T25YspGvKm/K+qsqQlGxF Gac2R8WCrL6jWno0EsQsolQmbtcFOwM1fgfRwvSO72VUxdDnUA20FBy0MRDCg9es7TSc3C mJVlqHsWNbrAnVM3vbscBmzb/1jud3uldWFHU+pluNBG6hsXaBP8GAqgzx96i/US2fFB4v qBTDbiPkw/eoAbR5Ryrq1v+5Ytox2LTqBAQpABEAOjvCsxERyMU3Oe1epdyI1O3Jdjh6jn usqO159XFM3pBVsA4SgCxsX15nE8gp/ELyryIuQFAVg16hkSHNDSN35zCoEq9CQD7amaXD FqGbehrk1ZdIqyWMQ/pDTD+OlNtHf9aB213gVqAa4snT2+BIxUr/Hxe8GTYIO0DMeD8nla KtMYkupxMpsjOpJqEidQTXIfmCILxdB/aWgzT96egay4KU76NJ09zFlpJj74Fs5X65Ryql Koh+cu7MnEIYJv4ZNl6Ivljf/JHMzjvLt2Jwpl7yl/PQa3dshKi9y+plxL6xUWPsyjEoso laRdLDaIY8XdVoXdtF7hPBBRFi6xKnX7JdbDh8XV/zABKNp8a+A7I= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688162858; 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=hj6ebMp4hK66n+NySaoSYY8gJdTb1nxhHjaTXl8IMM8=; b=4SaDPxRGfkVVXw0OiLNknsJtMPeq0bQpmb3jVVvhUrewEk3QxzoqslLKI9lKYu5ETDOXw9 fFIIidYl14zMwDCw== Date: Sat, 1 Jul 2023 02:07:08 +0400 Message-Id: <88537d4db68bd306c1f3efae8b6ed52290ca66e2.1688161433.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.40.1 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 This patch removes the wrapper and the propagated environment variables (through 'native-search-paths') and instead patches the paths inside the source code. This fixes path handling, which seems to be broken now. It also allows us to use 'setuid', which is required for some features, and lets the app use its internal path handling criteria, which some dependent apps expect. * gnu/packages/arcan.scm (arcan): Fix paths handling. [arguments]: Add 'patch-paths' phase. Remove 'wrap-program' phase. [native-search-paths]: Remove. --- gnu/packages/arcan.scm | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index cfd72f6e55..159c6d2190 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -79,6 +79,11 @@ (define-public arcan "-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 @@ -94,30 +99,8 @@ (define-public arcan (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 `(("bash-minimal" ,bash-minimal) ("espeak" ,espeak) From patchwork Fri Jun 30 22:07:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 51475 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 DF7D627BBE9; Fri, 30 Jun 2023 23:08:22 +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 EF08127BBE2 for ; Fri, 30 Jun 2023 23:08:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFMHe-0002fW-Bc; Fri, 30 Jun 2023 18:08:06 -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 1qFMHb-0002dl-EK for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFMHb-0002Ce-6A for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qFMHb-00033F-2d for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64387] [PATCH 4/6] gnu: arcan: Use new style arguments. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Jun 2023 22:08:03 +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 Received: via spool by 64387-submit@debbugs.gnu.org id=B64387.168816287111666 (code B ref 64387); Fri, 30 Jun 2023 22:08:03 +0000 Received: (at 64387) by debbugs.gnu.org; 30 Jun 2023 22:07:51 +0000 Received: from localhost ([127.0.0.1]:55932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHP-000326-6B for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:51 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:41382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHM-00031f-NE for 64387@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:49 -0400 Received: from localhost.localdomain (bba-92-97-100-179.alshamil.net.ae [92.97.100.179]) (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 B8EF52B4E; Fri, 30 Jun 2023 22:07:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688162863; 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=N3niClNUvMuSM01PsFQkafNT0CmkVd9SblwpRJBXLzI=; b=XB/z1gLoBFfjziFW5O4UWbpTHIN70GkqY6YkekQLSrxcXmjY5gRYEqli6886nmPmiJJUuG CTABji4M8y3q75XoVjNZKnuns50dKvN/UeU1E/Sg3Y0MIRKjA+t3mwUiz1QpT/tMf22yca gAou0/hqPde4DgMuMUSYxEfKKUGsgc2HvrqOA4byWutRPnGjws5kJ07o4zjUT3EB9jftUX duvJgMzQ18vyWymyEuSJgPf2SoPlBnh58q3t5uDeho46dPXkOR/7bF8l+md0OnHY5KB0Av ELjTNxCozUp3NoyQKJbfbfVd87SVSU2bbYAPanTWeVELyI4bCf54N6x4zd3gSeXHzyWfzJ OIHw/JkghZ8Ehay8W+eLE0aKV/zG+SRIOPrVeILK50K85h5rBfFheYQW1Ml/kgIEM0D9gm 4VZVKs5j0N4jbx/m6NvW2ZeFzMg/WPk12DJjdFKl+dy33OkfVTXtyMdvkenjLvlhhws5GD BmjarmDRz+Uq6AJ/S3z1fT8dEWmJB369U70N1mw0Ww4Ks/JsoTJm91ydg5df41BRpkGTm2 I99YQxtzThtjQDi79XTnfmEwuqpCrxGvU4V+CaqnYnOvISojAUbA+aaihwlGxewajit72f 9CpRMwhR+3znkz/CDeG2qvo8fa4+2T7VQbPKvnyKBsWgDp2GQZ2JE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688162863; 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=N3niClNUvMuSM01PsFQkafNT0CmkVd9SblwpRJBXLzI=; b=HLU8NULvpqmDg7uIPWnfx4fKgs9lMvDNHIFnyAi2UiFHnmWR6p/4O3PLukCNZNd4tiaDht Y/xW40Ysqt2MbqBQ== Date: Sat, 1 Jul 2023 02:07:09 +0400 Message-Id: X-Mailer: git-send-email 2.40.1 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)[arguments]: Use new style arguments. --- gnu/packages/arcan.scm | 50 ++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 159c6d2190..9c6092bb9e 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -75,32 +75,30 @@ (define-public arcan (delete-file-recursively "external/sqlite"))))) (build-system cmake-build-system) (arguments - `(#: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)) + (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) From patchwork Fri Jun 30 22:07:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 51479 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 AAEBF27BBE2; Fri, 30 Jun 2023 23:08:48 +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=ham 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 DAAED27BBEA for ; Fri, 30 Jun 2023 23:08:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFMHc-0002ek-UG; Fri, 30 Jun 2023 18:08:04 -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 1qFMHb-0002e0-QG for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFMHb-0002Cj-HO for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qFMHb-00033N-E4 for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64387] [PATCH 5/6] gnu: arcan: Restyle format. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Jun 2023 22:08:03 +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 Received: via spool by 64387-submit@debbugs.gnu.org id=B64387.168816287811686 (code B ref 64387); Fri, 30 Jun 2023 22:08:03 +0000 Received: (at 64387) by debbugs.gnu.org; 30 Jun 2023 22:07:58 +0000 Received: from localhost ([127.0.0.1]:55936 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHV-00032Q-JL for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:58 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:46380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHS-000324-WE for 64387@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:55 -0400 Received: from localhost.localdomain (bba-92-97-100-179.alshamil.net.ae [92.97.100.179]) (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 0242B3854; Fri, 30 Jun 2023 22:07:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688162869; 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=jTkehNy+q/2h3pBLOPXDMK5jgTgykm5zZmXZsRY/zeU=; b=NI1ZVXbeX8g8O0cM5f0jKlfnv+n8OH8bOPoHUTMtmUoshIRCs9gFbgGTBKwt37w/eWCphx EQx+tZQOzjG8yxNyedSAtTrvyXknRyswIK/gsMq70MdM2m/8Sc3JDUhxd68dlTn1U0CBlR iaulHmJhexOYu6c/Bwy92866z7yUc/ugl/HXO8CxpmxW3n1TSjmjUvgbznBl/yBhJu6Ih/ pFcfzaJzIRaFixCBkNtckMlJ7/NhVgX3SVl0VS8WzGMSLhf35FWbjKU+PXI0zP+dU+YgQz HOf0zisDygmxYMUmiOvfNAW2mS5dwxEUZeLIFIwRRtvZTbwTIRww4KpJTnDcgBHLhnvv0y 5fh2wbtk6+Mo0EtEvFpRgTyVs/lJ6Gdud/BeFF5iretnmGFC5cPdhbQ8Cf7nplVsJ1pA1n aRV5G2Ni3FjM6lL4OLflL1chCxZ0tcj3Yy9v/xSwYRxeTfGZTZmBMSISEHuf6/YHg/KLQZ Sz2PUArQS3o0gtA4u/737scceXE58WkZ6W+zbO4wXLDUp5JIvzo52P7sQlI2KZuFDZqdP2 mmACgb3QQX8kjJXVAU6pT3lSmS+Su41fZHNvZrrTBEC21+FHukwy6WcgEpUiozWjV18+lv lFKSg2g2afpSTtJ9lELgSSdsCeiNjod6CwFdXNNZUwed5nPWtAYMM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688162869; 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=jTkehNy+q/2h3pBLOPXDMK5jgTgykm5zZmXZsRY/zeU=; b=RwRsxRZJnxWYFaSay6oOxakssLKfdCg302yORFYeB1Z6G0ft36hnRrjE8yMT1WgkBm2UQC TIk/pNLh6u3AzOAw== Date: Sat, 1 Jul 2023 02:07:10 +0400 Message-Id: X-Mailer: git-send-email 2.40.1 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 From patchwork Fri Jun 30 22:07:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 51478 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 31BDF27BBEC; Fri, 30 Jun 2023 23:08:47 +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=ham 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 7E0BA27BBE2 for ; Fri, 30 Jun 2023 23:08:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFMHd-0002es-7d; Fri, 30 Jun 2023 18:08:05 -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 1qFMHc-0002eZ-60 for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFMHb-0002Cp-Tp for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qFMHb-00033U-Q4 for guix-patches@gnu.org; Fri, 30 Jun 2023 18:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64387] [PATCH 6/6] gnu: Remove arcan-wayland. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Jun 2023 22:08:03 +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 Received: via spool by 64387-submit@debbugs.gnu.org id=B64387.168816288211730 (code B ref 64387); Fri, 30 Jun 2023 22:08:03 +0000 Received: (at 64387) by debbugs.gnu.org; 30 Jun 2023 22:08:02 +0000 Received: from localhost ([127.0.0.1]:55942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHa-000330-7h for submit@debbugs.gnu.org; Fri, 30 Jun 2023 18:08:02 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:46396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFMHW-00032F-MC for 64387@debbugs.gnu.org; Fri, 30 Jun 2023 18:07:59 -0400 Received: from localhost.localdomain (bba-92-97-100-179.alshamil.net.ae [92.97.100.179]) (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 A82D3388C; Fri, 30 Jun 2023 22:07:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688162873; 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=C4VoYYpDT/HdRWO8pvLDX3ENK3gJyF2cxDvtq+XHpeA=; b=uTfNabluffSKg2jFRmLJZxAC6/+LCLTOCSfnMXY+4wHDnpWH+YTV0SOL+vXCbKKNRa6LDE QCfpCBgdLvhdSOetSB8yS7zc29PuHG4eTvA0tTgpt6JFwCznn69rAVacLnP9J96vNA8E0W TihnzvCkSAEP0scp/XJQw1Ld851x9T1QHHKLaAHDvzGPHYG2ELpkrjLR/BvmzhJOSKhhQ+ 6M4iBt1PeibhvOVoObFVKBsgz+SykQqzfgIv/QfxlQwlP6OqF6ve3obwfHZZ5n5uELl/0X HOZN9+EMtawj2cplUAyNnffrC4oX+7e+o9q21xIieAhIu3j9S4PgqAqpsxfp5xX3GsG5te WaaTsJhhOrH52J4JNWf78kPmQTBiWFw9EsQrmtMp8D61BqgzyFde8OoUglXNSpA4GUo1nx Xz5VEicmhbSOjeTqYuTph08aJDkGzW0BeRrXu+cPNLs+6lYDRlRKXxpngsKkGi8NOGSg81 13K8CV2N96gZQcdkXaWtoPckh0+c4SfMwMBHUWAWxCwA5OVKmecnX/OHZNejSCNkBxEJBl ldq/H0dqv0Lnx9vvbCmWDmypEIaEj+VSdStUS5RAxeKOaGz0wo0SRVrLupowp4AtwgoVbC Wrp7WKe+MgKkMSx2uGBZ8aXwB6sAGHxrKlAM0uyKtsVZkj04bG70s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688162873; 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=C4VoYYpDT/HdRWO8pvLDX3ENK3gJyF2cxDvtq+XHpeA=; b=y61YL50aDKQj3miNzSd1tN52vH84uFSnsbgGCSPfv2DhlQviVErKvA2Nfs2HmUXmpjT5zO Z+l53JrVV5gi7yBw== Date: Sat, 1 Jul 2023 02:07:11 +0400 Message-Id: <25d18f87d518a85e6f62050e2f58f322b3827265.1688161433.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.40.1 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 This package has been merged into arcan in upstream. * gnu/packages/arcan.scm (arcan-wayland): Remove variable. --- gnu/packages/arcan.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 05d2f58fc2..53a1f75411 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -235,35 +235,3 @@ (define-public xarcan 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 - (list pkg-config)) - (inputs - (list arcan - libseccomp - libxkbcommon - mesa - wayland - 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)))