From patchwork Sun Jul 2 09:19:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 51500 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 7576927BBE2; Sun, 2 Jul 2023 10:20:18 +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 9786727BBEA for ; Sun, 2 Jul 2023 10:20:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFtFW-0006Kz-7v; Sun, 02 Jul 2023 05:20: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 1qFtFS-0006KC-Jx for guix-patches@gnu.org; Sun, 02 Jul 2023 05:20: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 1qFtFS-0002Yg-B9 for guix-patches@gnu.org; Sun, 02 Jul 2023 05:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qFtFS-0002aH-4C for guix-patches@gnu.org; Sun, 02 Jul 2023 05:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64412] [PATCH 1/2] gnu: xarcan: Update to 0.6.1. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Jul 2023 09:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64412 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64412@debbugs.gnu.org Cc: Ahmad Draidi Received: via spool by 64412-submit@debbugs.gnu.org id=B64412.16882895709877 (code B ref 64412); Sun, 02 Jul 2023 09:20:02 +0000 Received: (at 64412) by debbugs.gnu.org; 2 Jul 2023 09:19:30 +0000 Received: from localhost ([127.0.0.1]:59230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFtEv-0002ZE-OK for submit@debbugs.gnu.org; Sun, 02 Jul 2023 05:19:30 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:38456) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFtEs-0002Yz-Sl for 64412@debbugs.gnu.org; Sun, 02 Jul 2023 05:19:27 -0400 Received: from localhost.localdomain (bba-92-98-23-19.alshamil.net.ae [92.98.23.19]) (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 60C422B4C; Sun, 2 Jul 2023 09:19:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1688289560; 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=SXPxOXwZ6AkNL2BkNYylaXacjXEkcSIK5uVe4ojNlqA=; b=eF87Rb/0iuEnzO7BKVZhMsKqArI1Wh7mnlBaFHZzPb3tMS0g1V4OlHN0v4RhQKgdadKoV4 so95bR1tZpbhWlkXmcIc1ke+fWPe3OgLEeRYhJXPRWKHlT+NvatndPhyZL5WXUpJ06WFkQ sty874NuHJcoEXZyPBNDysNkhJ+qAuOXPgpaglFIf2YrbKtvo8xs9SdIAVnoXmEZltMvN7 Kn2ghtiK5teNqwB8jcUrT5yApPfcBvo/8fHxaNvFhkE79bOF9UrZcUhhuAe5XS39iLI00q hRvCXbLn+4yQtOdGR+bW0I8sDqszGq1Ng63Qebyd9AHpnZftp8y6U4I5aGZ1pa919UgyvM Pz/50xVh/CAqkVS/8kzb0uMkQzxTXasbEu2JeuEXEBHRaSHW6FumQrc6uRf43C6jDovFMX uajyghNQf7A4YDIYNaaRbq9w/VT9OQVUzT7IscOW7W5i5c9xxqt12y4JVnncSMI+m8U+FK b8jvJNKACTmUk0lsZdH70AKmYncOaEQTi7SOe+99n8l0K8sWi4oECIKz9jkVv0jUotN9v6 cXmwQqm/zjgUcT59vTk1eOlahuFs+1lJrLbIIBaOyMnWc17g//MnNFHmuGIepAXQsFTpVJ DvirtEokXv3YXlzYI9EU22pMfzbTcLCGXajnCFXkL30lhO1OArz0k= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1688289560; 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=SXPxOXwZ6AkNL2BkNYylaXacjXEkcSIK5uVe4ojNlqA=; b=W4909tvEsiSb0U941lZH5UyS30Eg26RC/3UkLS3qamyi24WoxnZbiZnuq3cSo5o6ABC9iM zNu1jqfKqKec3NDA== Date: Sun, 2 Jul 2023 13:19:05 +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 (xarcan): Update to 0.6.1. [use-modules]: Remove no longer used '(guix build-system gnu)' and add '(guix build-system meson)'. Add '(gnu packages fonts)', '(gnu packages onc-rpc)' for new dependencies and '(guix gexp)' for arguments. [source]: Use version instead of commit, and update hash. [build-system]: Switch to 'meson-build-system' since this is what's used upstream now. [arguments]: Use new configuration flags for the new build system. Switch to new arguments style. [inputs]: Add font-dejavu, libtirpc, libxshmfence, xcb-util, xcb-util-wm. Replace libressl with openssl. Sort inputs by name. [license]: Add 3-Clause BSD license. --- gnu/packages/arcan.scm | 95 +++++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 38 deletions(-) diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index 7483777ff0..86e9dc4608 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. ;;; @@ -19,7 +20,8 @@ (define-module (gnu packages arcan) #:use-module (guix build-system cmake) - #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -29,6 +31,7 @@ (define-module (gnu packages arcan) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) #:use-module (gnu packages databases) + #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gl) @@ -39,6 +42,7 @@ (define-module (gnu packages arcan) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages ocr) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages ruby) @@ -185,61 +189,76 @@ (define-public arcan-sdl (synopsis "Combined display server, multimedia framework and game engine (SDL)"))) (define-public xarcan - (let ((commit "8e6ee029388326cfe5cddeffe482eb3702e9b7f3") - (revision "1" )) (package (name "xarcan") - (version (git-version "0.5.4" revision commit)) + (version "0.6.1") (source (origin (method git-fetch) (file-name (git-file-name name version)) (uri (git-reference (url "https://github.com/letoram/xarcan") - (commit commit))) + (commit version))) (sha256 - (base32 "0zng7cs6733mnf0p6g5wv02981f2sf567n56csax6cmzb8fpamym")))) - (build-system gnu-build-system) + (base32 "1z4sf101i2y6rg2vcxfwmp1nkzfa3rw1pp48ym1ds1ka513vy128")))) + (build-system meson-build-system) (arguments - `(#:configure-flags - `("--enable-kdrive" "--enable-xarcan" - "--disable-xorg" "--disable-xwayland" - "--disable-xnest" "--disable-xvfb" - "--enable-glamor" "--enable-glx" - "--disable-int10-module" "--enable-ipv6" - "--enable-record" "--without-systemd-daemon" - "--enable-xcsecurity" "--disable-static" - ,(string-append "--with-xkb-path=" - (assoc-ref %build-inputs "xkeyboard-config") - "/share/X11/xkb") - ,(string-append "--with-xkb-bin-directory=" - (assoc-ref %build-inputs "xkbcomp") - "/bin") - ,(string-append "--with-xkb-output=" - "/tmp")))) ; FIXME: Copied from xorg + (list #:configure-flags #~(list + "-Dglamor=true" "-Dint10=false" + "-Dipv6=true" + "-Dsystemd_logind=false" + + ;; The following arguments were taken from + ;; the Xwayland package. + + ;; The build system insist on providing a + ;; default font path; give that of dejavu, + ;; the same used for our fontconfig package. + (string-append "-Ddefault_font_path=" + (assoc-ref %build-inputs + "font-dejavu") + "/share/fonts") + (string-append "-Dxkb_dir=" + (assoc-ref %build-inputs + "xkeyboard-config") + "/share/X11/xkb") + (string-append "-Dxkb_bin_dir=" + (assoc-ref %build-inputs + "xkbcomp") + "/bin") + (format #f + "-Dbuilder_string=\"Build ID: ~a ~a\"" + #$name + #$version)))) (native-inputs (list pkg-config autoconf automake libtool util-macros)) (inputs - `(("arcan" ,arcan) - ("font-util" ,font-util) - ("libdrm" ,libdrm) - ("libepoxy" ,libepoxy) - ("libkbfile" ,libxkbfile) - ("libressl" ,libressl) - ("libx11" ,libx11) - ("libxfont2" ,libxfont2) - ("mesa" ,mesa) - ("pixman" ,pixman) - ("xkeyboard-config" ,xkeyboard-config) - ("xkbcomp" ,xkbcomp) - ("xorgproto" ,xorgproto) - ("xtrans" ,xtrans))) + (list arcan + font-dejavu + font-util + libdrm + libepoxy + libtirpc + libx11 + libxfont2 + libxkbfile + libxshmfence + mesa + openssl + pixman + xcb-util + xcb-util-wm + xkbcomp + xkeyboard-config + xorgproto + xtrans)) (home-page "https://arcan-fe.com") (synopsis "Patched Xserver that bridges connections to Arcan") (description "Patched Xserver with a KDrive backend that uses the arcan-shmif 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)))) + (license (list license:expat + license:bsd-3)))) (define-public arcan-wayland (package