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