From patchwork Thu Aug 10 18:16:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 52724 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 E915F27BBEA; Thu, 10 Aug 2023 19:26:33 +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 3734827BBE9 for ; Thu, 10 Aug 2023 19:26:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUAMO-0001aT-Jf; Thu, 10 Aug 2023 14:26:14 -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-0001ZK-Jt 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 1qUAMK-0005NX-Uy; 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 1qUAME-0004KS-Nm; Thu, 10 Aug 2023 14:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64387] [PATCH v2 1/6] gnu: arcan: Update to 0.6.2.1. 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: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 , 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.169169195016558 (code B ref 64387); Thu, 10 Aug 2023 18:26:02 +0000 Received: (at 64387) by debbugs.gnu.org; 10 Aug 2023 18:25:50 +0000 Received: from localhost ([127.0.0.1]:44016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM1-0004Iz-BG for submit@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:50 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:49248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUALz-0004IW-1t for 64387@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:48 -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 87F9721D3; Thu, 10 Aug 2023 18:25:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1691691941; 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=KP/H+TzW+9VXuSPDshhdwA9y/jTUrXSM7gCEI5GIlBA=; b=ezvLzDpIA8YkOM5EBO6pTz59znYW/YWLMxWwbNfrVhA2r1IZsdi0ARXts5J72XfDvF+P6S p/XK/+avLaU2T53WwgTjIyR93ZfO7JC5QOGJmBj2WAAPWs451wqbEnQa80JhRFfEQkofyv mt5GIy61mb2GToNa+gOr2zR7ROomr9yRQn9t42d/vaaOoGPy3p+8MFhngEkrJWvrOMPBAw 4nNs/kh4DCxuKp6ySYEVPwJ88sGn7Q/wwfu+s424Z6qhjoMTpmBIffuzo2GdDPK/Rx1r8c X+8N1KD7Y43i/eo2b2GjZwlX9V+oYSnSmgFtaZdHV3itboULpe/2R+Og1nGkskHieC85Mb gfpMlAbHNa8MHFiNbYEVjgZgoPmOcxSg3wvlUYPxp6JsyLeJojgTRYqVPdHrDOGFZpbZAj kYG4bH7O4s80BytXl+1a/ONsNWSnLVMdOxbrYvfNrn6q/pqhep6+Ry9QBFyBk3llRlwFh/ fz8YM5OKMptg8lAUX25mIyORfGuQfOle2lQ53xsoG1ZBcBfHcQt1EiCRbp+AnOiCVb3Y1X 305gIpwO+h9YrADVC0jH0gmrM2yRF/VKsQw7q8rYYlIMGyS017Um5aPGi5Pam0duAXaVeq HdDtg7uhDzFnR/hdnunvaZvjJQ5ZE0+phs/EYZocu7rDooeyWXJS8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1691691941; 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=KP/H+TzW+9VXuSPDshhdwA9y/jTUrXSM7gCEI5GIlBA=; b=/t2C8gSOXuLiNAERsSGRBAEZoo99y7fQfAtbgSEGOphOtk52MhHdUHaQj/DmUeCNxvhlAe lu/+D42BHkvgzUCg== Date: Thu, 10 Aug 2023 22:16:33 +0400 Message-ID: <61b6ea7a9d903a772585da35c18d30014055d634.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): 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 Thu Aug 10 18:16:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 52728 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 C2F4E27BBEA; Thu, 10 Aug 2023 19:26:54 +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 2FA7427BBE2 for ; Thu, 10 Aug 2023 19:26:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUAMR-0001gy-1n; Thu, 10 Aug 2023 14:26:15 -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-0001ZE-5D 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-0005NV-17; 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 1qUAMF-0004Ka-5H; Thu, 10 Aug 2023 14:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64387] [PATCH v2 2/6] gnu: arcan: Build all features. 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: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 , 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.169169195316578 (code B ref 64387); Thu, 10 Aug 2023 18:26:03 +0000 Received: (at 64387) by debbugs.gnu.org; 10 Aug 2023 18:25:53 +0000 Received: from localhost ([127.0.0.1]:44020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM5-0004JH-5h for submit@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:53 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:49260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM2-0004Im-7a for 64387@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:50 -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 44B1A1B07; Thu, 10 Aug 2023 18:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1691691944; 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=b50PSEey0vO1kgwRjDtpGuql8gx58Kxh7FdODf1kq5k=; b=I7L6B06/Lgt2bCwsbpZF4zgbxbeJx6VH5hhSQHYBaIH0dMeesySX16ujcFIUu94Okv6cgO HgJQZ5YlMKi92mhDcQEtQdDnwWaP20h3iXZjXdjynboAXmFT7WxGqGEoqsr6IiTZA5gJUK cFgf/6sWgxc9hPB51nmTbYdOdrKiUcodQYn/xjzv2OnFSiSsExBVIJOkBPnGh6VBOrPMh0 1YkPmQemoyXFXnznDC28gNuyBDVaZ0fbScZfbgtbi+cqoR78Igg3bgTjgvHzYGMAHDV66X 4R9N7wCC5d0UUIJIx01eh3Yr8l/PXUIL/pIg0bCvKkM5Kpd1/j9OS49PMhWwsdk3eV12D/ ytizTC1V0T+o9ugL3np4JVLKA946KD4Ov3fX6czjxZSxWSAU+cd6JZKBZfsc4tObfFh97B MPdFUIF1ulAkcwpj8KrSFXejIWQEOVI3ynilpJhea2i2YEkwOAY6M3Ra/JKg8FjejkO32Z HaJsqNDLVcGecJPRnMjhPCbsYS5YofEtpwpPWxaBXlW46uZvle6j7OcZkuZPYsJ2i/hp8+ juRz5zAxfD/bkcYVGReJ+yq6c5KkBCDEYdA0iQ2WAgwQrEBjNFePInbXxzXn2Fy5h2y55d NFLhL8IkYkC6/Xlgd4gnDmA2Q//O9G67tjZuS4op+dW6PKePgptZk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1691691944; 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=b50PSEey0vO1kgwRjDtpGuql8gx58Kxh7FdODf1kq5k=; b=kZiuh3wIA0mc6QG182yWeCGaGfF61XPG/A91T71kmSNBytbH90cFiU4WrvnrRM1vWVEiZQ VSlC801jOCO+J4CA== Date: Thu, 10 Aug 2023 22:16:34 +0400 Message-ID: <13349fbed96787c12e76cfa5804fe24641546937.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): 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 Thu Aug 10 18:16:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 52727 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 6FCDD27BBEA; Thu, 10 Aug 2023 19:26:51 +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 9102F27BBE2 for ; Thu, 10 Aug 2023 19:26:50 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUAMT-0001lK-RX; Thu, 10 Aug 2023 14:26:18 -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 1qUAMR-0001iV-Bi for guix-patches@gnu.org; Thu, 10 Aug 2023 14:26:15 -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 1qUAMQ-0005Or-Dx; Thu, 10 Aug 2023 14:26:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUAMF-0004Kp-LJ; Thu, 10 Aug 2023 14:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64387] [PATCH v2 3/6] gnu: arcan: Fix paths handling. 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: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 , 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.169169195616593 (code B ref 64387); Thu, 10 Aug 2023 18:26:03 +0000 Received: (at 64387) by debbugs.gnu.org; 10 Aug 2023 18:25:56 +0000 Received: from localhost ([127.0.0.1]:44024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM7-0004JY-IM for submit@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:55 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:57850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM5-0004Ir-On for 64387@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:54 -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 BAAB421D7; Thu, 10 Aug 2023 18:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1691691948; 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=LQIItoTDslyJ9eN/MRKpELZLsnU6y8EJh3zTgY5D6Gc=; b=NKgCseQiqfHvGzlzNcCahA2+IYyUmuQYLDubHu2JGYEZZWIm6wlHX5LfQEFDz65LH5TXLH KxDTc5MjL9scmpHT1Di1318/lBMIBZl0pGeIlSBcBc+JMIdSqJmM78ngn9+VL/go9fmm0H h+zk6+m8NYRZDB8Z9ToS+eors6X4uSVHBmDZsBv9UFlM4YWSH3nmh05azzjhwPqrNXd6cZ lDXnh0kM0n+yA+P9g2fegBEAZUFFYZXfu4KWeeAsRIICRmOoeVNxjPlGZIFzXDDOH4o4ik o69k60qEooD/dC41XuRh9XbZEKSPWmv8WTZeu95tIa2qIOuqbW5jHE+uelGiZWNOXaWyW+ 4fta8JKLSQcohb3+i2ihdFxbNgdF2tgAaqmHlAezz9A0ag0vnYPeSy/wye5qcUO7PMfnRQ w+eG1HFFrN87u5NGtlyLhpE35sxhi0fjq7Jf6edy3I751A/IumRPDVTsger3urWM8GnRH3 nEONEgo6XBqO03fFSiBrMQFcU5Y31gP6EOWkjqSZ41auGY6qlDVMWJX6MIx8MH/5PGbMXi PQIsVOh2aklydjKtXiYHDTdTx2uwL4I6IbUnmCAlyZCq9l78zDOKhgc+rdiZBkXAUHMh2R fjogJ91GxKD9HseKsGuKCJoI8ETaKjb5csxMIn17ZW069Ruow6phA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1691691948; 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=LQIItoTDslyJ9eN/MRKpELZLsnU6y8EJh3zTgY5D6Gc=; b=twqTYqzGbiea7szcl/Mw0KdkV57m+jmkmh/hhBMRFimMt4my7+YDP6utgcDyGL24fKZ5/U VNzhxDZb6tIiGHAg== Date: Thu, 10 Aug 2023 22:16:35 +0400 Message-ID: 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 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 Thu Aug 10 18:16:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 52725 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 EEF3027BBE9; Thu, 10 Aug 2023 19:26:36 +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 AE01927BBEA for ; Thu, 10 Aug 2023 19:26:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUAMO-0001aS-H4; Thu, 10 Aug 2023 14:26:12 -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 1qUAMN-0001a1-3x for guix-patches@gnu.org; Thu, 10 Aug 2023 14:26:11 -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 1qUAMM-0005OH-P6; Thu, 10 Aug 2023 14:26:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUAMG-0004L1-24; Thu, 10 Aug 2023 14:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64387] [PATCH v2 4/6] gnu: arcan: Use new style arguments. 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.169169195816617 (code B ref 64387); Thu, 10 Aug 2023 18:26:04 +0000 Received: (at 64387) by debbugs.gnu.org; 10 Aug 2023 18:25:58 +0000 Received: from localhost ([127.0.0.1]:44030 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM9-0004Jw-TU for submit@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:58 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:57852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM8-0004JD-FK for 64387@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:56 -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 7B41D21D3; Thu, 10 Aug 2023 18:25:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1691691951; 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=L0pl86ucC5tXYqkbHh3W/YkYU1nXMGvCJIoqgR1m3nE=; b=Cb/Htjo8hGOHw7zqPZiNEoRqfBCvOSYnQ+RvBAl8dSgvm9nipb5dmLA6VmuVIMp3aJVmNd OBA321sRio9WHrsIJ69cbowLa2+P8vLHxcuFL1zDZ9QSBGfWoPeOr+9lR0+nSglyxISUdQ X3algk5RI6n9YAyWFwGCqSR/RZ25G9gdArj4bDjrk+G4xRQ6C1dKyZq5bAmSHIPWofCxHx pg5+59CLIptfZAr4/QadaXXDC7P6x/4EEtlMJeQF3DvdaCLhR/DKPcwtHXu5hDScDUw7yN J8xJEPD/i+jurjn0SrBFZ1J7isy13/ytIQYkXEZGDKgegmBsjk7tMen8PhGyeSyJ/L/nAV uMzA105ZZL7cDyVSod6VXqTCgf9CsWND3aWzg1as9Ag6M77tSIr2JSCnDVd+IRZB/D2Jec 2UHBs6rEGq8GubJ/1+wznrlYkHpWK+IK5hc/op+bWEvFuQSbT3p1nPBD39q5gRTiSpTtsB mEup7d62SuT1DIfIebmadLNytbvHyXvOLfuLFRf4a/6yvKIy9WF6erGWVk6PXhxSIK8RCE 2twPi1Fz9Fia7vwdDDwjaqjFFn0egFvl5NXYMkoliiL1OI5u3lcnsvCO9Gmk+AfeaTMBQ4 A6Kf0SDOIbsxwWszk8L537jGVhi5iwWIWSsAGcyONve8sPO0br5D8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1691691951; 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=L0pl86ucC5tXYqkbHh3W/YkYU1nXMGvCJIoqgR1m3nE=; b=Feu/dt3XHiaGKiYhe5WXSbmtlc8wQLsN3jvNWWxbPpE8BM1HDY/HWBGmrkrlIcMrUj5faA iChVYkKPu8XaHLAQ== Date: Thu, 10 Aug 2023 22:16:36 +0400 Message-ID: <667739ec06929fa054cae6c439d3567fd3e9a9da.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)[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 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 From patchwork Thu Aug 10 18:16:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 52726 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 001EF27BBE9; Thu, 10 Aug 2023 19:26:39 +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 14ABD27BBE2 for ; Thu, 10 Aug 2023 19:26:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUAMW-0001nK-SM; Thu, 10 Aug 2023 14:26:20 -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 1qUAMS-0001kl-U2 for guix-patches@gnu.org; Thu, 10 Aug 2023 14:26:16 -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 1qUAMR-0005P3-CJ; Thu, 10 Aug 2023 14:26:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUAMG-0004L7-En; Thu, 10 Aug 2023 14:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64387] [PATCH v2 6/6] gnu: arcan-wayland: Deprecate in favor of "arcan". 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.169169196316658 (code B ref 64387); Thu, 10 Aug 2023 18:26:04 +0000 Received: (at 64387) by debbugs.gnu.org; 10 Aug 2023 18:26:03 +0000 Received: from localhost ([127.0.0.1]:44032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAMA-0004Jy-8g for submit@debbugs.gnu.org; Thu, 10 Aug 2023 14:26:03 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:57852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUAM9-0004JD-4X for 64387@debbugs.gnu.org; Thu, 10 Aug 2023 14:25:57 -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 533B221D7; Thu, 10 Aug 2023 18:25:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1691691956; 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=GtmFJFvZawr7wwcpL72bPY/nRbbS6+GQer4afRXc4bk=; b=ldDddpN8qJaiSgrPpN1rCkn0o0eWCtVcg+hV6XisqBkyGD701zIztF6ie/kzR9gS4TJ65C Ylmnn3q4vBqrxk9VnfjWgv8QtmVPdF5bLG1qiT80w+WnCQ2FcuhOdj/WYOMaIFAdErZBKG FfCB9xLw6uhn/rLTtibNJrLqBsgV8EZTFZG0OeaL04JzyWMpw1gm0GsTRgTo3S9ZycLKfL fVvbqdYJ5FkA4x21IOKDw5svVwhcsCa2GTEvY9IvxHaRhgGu4P2rGvkvgcVXzq+xkOsx/j l2XJd8Gkm2JCt51Cuv4EE04TanVjEmyys0+FYm/569q4oCrhoByGb7VKHD0ol4AYFFOM6Y xG6Hi0HzbVibwTuStHwO2bRdMcGIpmYNa2IPw2K2UzKKxf3gxghO14duzOb3yq4zD9K0La i8TO7IhQOwQFg1ogOg/1zhDs35MBTjYsTGbtfWsS1tSagrthbVwUvvdJgC1oowxSrKeGwl EhCeX015A1AbkLk/gYD+81eKaoLW9JzaIln69d4+0Gubd8hTHWlQukVOhuSfPTmUlctoMH cMgs6IIn18SWqZ+/8/jn1tTYhFNX8qEHLcaTqtBBVNEopqMdYsy1EnlqsbGQKimJl6ssaP 1/LOwpZrKW+WFS4PP9T5e8veVz+HMOoVwa2eamQ2iZ/JnrHcfj0v0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1691691956; 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=GtmFJFvZawr7wwcpL72bPY/nRbbS6+GQer4afRXc4bk=; b=IpOwYZ/lc2AycvkUgF/O7oZwod/mlC6E3arkqkjrEUKuoSALfJIZkZ007xZpBxrgKSqBsP TV6VZ6Bvym+0bTAQ== Date: Thu, 10 Aug 2023 22:16:38 +0400 Message-ID: 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-wayland): Rewrite as a deprecated alias for "arcan". --- gnu/packages/arcan.scm | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 05d2f58fc2..c2a1071e96 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -236,34 +236,6 @@ (define-public xarcan as a window under Arcan.") (license license:expat)))) +;; Package was merged into arcan in upstream (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))) + (deprecated-package "arcan-wayland" arcan))