From patchwork Wed Aug 16 09:32:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 52883 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 6000027BBEA; Wed, 16 Aug 2023 10:34:17 +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 5CB5727BBE2 for ; Wed, 16 Aug 2023 10:34:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWCui-0003Kz-1i; Wed, 16 Aug 2023 05:34: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 1qWCug-0003Ip-Ji for guix-patches@gnu.org; Wed, 16 Aug 2023 05:34:02 -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 1qWCug-0001SR-AT for guix-patches@gnu.org; Wed, 16 Aug 2023 05:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWCug-0006Tx-67 for guix-patches@gnu.org; Wed, 16 Aug 2023 05:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65336] [PATCH 1/2] gnu: looking-glass-client: Update to B6. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 09:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65336 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65336@debbugs.gnu.org Cc: Ahmad Draidi Received: via spool by 65336-submit@debbugs.gnu.org id=B65336.169217843924897 (code B ref 65336); Wed, 16 Aug 2023 09:34:02 +0000 Received: (at 65336) by debbugs.gnu.org; 16 Aug 2023 09:33:59 +0000 Received: from localhost ([127.0.0.1]:38870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCuc-0006TS-Or for submit@debbugs.gnu.org; Wed, 16 Aug 2023 05:33:59 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:57216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCua-0006T6-Ox for 65336@debbugs.gnu.org; Wed, 16 Aug 2023 05:33:57 -0400 Received: from localhost.localdomain (bba-86-99-88-106.alshamil.net.ae [86.99.88.106]) (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 4620021E6; Wed, 16 Aug 2023 09:33:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1692178429; 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=oKyCABOXl3gH5ZtS72WpjZYYE+ziqTxQQUawCFvzqpQ=; b=blh8+T/lWJO/qD32qCnIKY286lhWsPPaUZOkkLIfr6cihAMkD83URZz0hvd3LeveZDm9p5 kDTc1bOz6nlNJJWoNlocf1Hy3RB9TB+HiBwzO/D/zW4SbFlhyIglhYbDptCRwj0hx0zO+f VpmO454WnMfq0VOC8s7McV3s9cmYf6NqnO0lSMWDMFW/0ZIlhhFOB6aSCiNduX5AeZHX+n JqT3jHQFp7eMDnZgUsXVksVjsRBu0AClxvCNu1j9E42rDDa16CTdfAsfin7Ca2fkqwUieH WhbuaZ+2m3jUx15WueNOtvwYicJgKpDIw9aeYO1+J1w7mk2LfW3Is47pTG5ZcKCJgxBAAP +gr08lZGLbfH+fm9QDFO8YJo8eRtELm8im/7uDC4i6tJ6MFvZZl63y5sR301Z4MmJFcPrH 5nc0y6XMZq8lRjwzaAxhdoVrdoXqHi3uaSAPMW7hmKzaw/C1tnkB283UgqZtG07m19HZjN mkD8/9UKeyxvzloLccEdRP+jR4dfJveScedk4NcNoYMTbdySIoiXcYeHNEANFdPWF8WPNW WSHmIoQ1pdtdVcOaiHl13SuKyInq4L2uTLROQamwJ8vTfVPhbXHCr5H0HjxK8+uKDi+jbe scbv/Ky9MYxh2iEnGvRDYskOz4/53mkKEkPkctlyAOKQOMUSuNOtA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1692178429; 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=oKyCABOXl3gH5ZtS72WpjZYYE+ziqTxQQUawCFvzqpQ=; b=M3c+rUrw1kFNDdYhodX2+LzYhvx/NfQ21AftsE67x4TpKh3nLoGSEY2mfuNV8/Kn6HJH4V VcKMWARV8AHXiTDw== Date: Wed, 16 Aug 2023 13:32:22 +0400 Message-ID: <87ff44ae30c9a029646b5cc7693c0c6a84335939.1692176991.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/virtualization.scm (looking-glass-client): Update to B6. [source]: Use upstream tarball and switch to url-fetch. [inputs]: Add font-dejavu, libsamplerate, pipewire, pulseaudio. Remove openssl, sdl2, sdl2-ttf. [native-inputs]: Remove libconfig. [arguments]: Add "-DOPTIMIZE_FOR_NATIVE=OFF" to #:configure-flags for reproducibility and CPU compatibility. [use-modules]: Add (gnu packages fonts). --- gnu/packages/virtualization.scm | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 9556fbc61e..e446adfa98 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2022 Arun Isaac ;;; Copyright © 2022 Zhu Zihao ;;; Copyright © 2023 Juliana Sims +;;; Copyright © 2023 Ahmad Draidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,6 +76,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages figlet) #:use-module (gnu packages firmware) #:use-module (gnu packages flex) + #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) @@ -1915,27 +1917,27 @@ (define-public qmpbackup (define-public looking-glass-client (package (name "looking-glass-client") - (version "B5") + (version "B6") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gnif/LookingGlass") - (commit version) - (recursive? #t))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://looking-glass.io/artifact/" + version "/source")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "09mn544x5hg1z31l92ksk7fi7yj9r8xdk0dcl9fk56ivcr452ylm")))) + "15d7wwbzfw28yqbz451b6n33ixy50vv8acyzi8gig1mq5a8gzdib")))) (build-system cmake-build-system) (inputs (list bash-minimal + font-dejavu fontconfig freetype glu gmp libglvnd libiberty + libsamplerate libx11 libxcursor libxfixes @@ -1946,16 +1948,18 @@ (define-public looking-glass-client libxrandr libxscrnsaver mesa - openssl - sdl2 - sdl2-ttf + pipewire + pulseaudio spice-protocol wayland wayland-protocols `(,zlib "static"))) - (native-inputs (list libconfig nettle pkg-config)) + (native-inputs (list nettle pkg-config)) (arguments `(#:tests? #f ;; No tests are available. + ;; Package uses "-march=native" by default. We disable that to build with the + ;; lowest supported architecture for reproducibility and CPU compatibility. + #:configure-flags '("-DOPTIMIZE_FOR_NATIVE=OFF") #:make-flags '("CC=gcc") #:phases (modify-phases %standard-phases (add-before 'configure 'chdir-to-client From patchwork Wed Aug 16 09:32:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 52884 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 DA42027BBE9; Wed, 16 Aug 2023 10:34:26 +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 1C9D227BBE2 for ; Wed, 16 Aug 2023 10:34:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWCum-0003Ox-Tk; Wed, 16 Aug 2023 05:34:09 -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 1qWCuh-0003Jq-1H for guix-patches@gnu.org; Wed, 16 Aug 2023 05:34:03 -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 1qWCug-0001SW-O6 for guix-patches@gnu.org; Wed, 16 Aug 2023 05:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWCug-0006U4-KL for guix-patches@gnu.org; Wed, 16 Aug 2023 05:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65336] [PATCH 2/2] gnu: looking-glass-client: Update package style. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 16 Aug 2023 09:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65336 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65336@debbugs.gnu.org Cc: Ahmad Draidi Received: via spool by 65336-submit@debbugs.gnu.org id=B65336.169217844224917 (code B ref 65336); Wed, 16 Aug 2023 09:34:02 +0000 Received: (at 65336) by debbugs.gnu.org; 16 Aug 2023 09:34:02 +0000 Received: from localhost ([127.0.0.1]:38872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCuf-0006Tj-CP for submit@debbugs.gnu.org; Wed, 16 Aug 2023 05:34:01 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:49842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWCuc-0006TA-Ih for 65336@debbugs.gnu.org; Wed, 16 Aug 2023 05:33:59 -0400 Received: from localhost.localdomain (bba-86-99-88-106.alshamil.net.ae [86.99.88.106]) (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 0DFC158C4; Wed, 16 Aug 2023 09:33:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1692178432; 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=iXTTZLsRuhsRp5h8WcNHGB3pNNMVPPfd9/y2fSk+sAE=; b=FkyzxqmsEC344PQB1DzfU8uYaMW1oFVMWC6nwSo7pOvs1+AsqssDFJfQ0/epPn9ntDvmhl xcXyS78j/5Drsb56RPSBeNsTC6daMANSPKibK1jPWZomqjcq60DSprhW4RFsAdqI11aPJM q2UN2zP0K7cWo5m7ZvHWAhvDOlXYjIQltAO8Ec0BAKwEWQ2xb5V3d3M+z2WQcorh1Ybcr7 AHaNqsJHtHRct5OcQcDtcS6hhVDVb+Pn88V5en62NUwA3rTB+xdVyp/U2Lqoj6ATKXILZa td9W3bsBRsykdRAKDEkJ9N5w3ofGPBpHiGQBHuXcCb1BY+n4NTx77ecCUdzxhd/WUEi3te YZwDe4SruN8bUMdQCLCK2od5moCbkY3B0WFMngSqe5jf+74244o9Rj0y219IHWS736ymxD WtkOW0fwqaPBLOKUy5QR7a0q6PlFkpGk2FTJPH/DYe2J+5Ntpord1lcxiOSkQzq2fNhUei GvvYP+hIdY87dG4sO9MP8iqNGUyaUoe72t/gyOTi8ZinL/W/8PZArQ/VCQLCiUa0CsCaSU Z8M9EmstzozSplPrqEHxQ4VYVfVuPYcTyPWYLvIHiMX3Abb8MTOKjO7sRpaa95KnI81A1F DMVqZA1yBP1/2FdQfoTNKpu5ALBOprnnEk4wXhOvlBds0di+WsjdM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1692178432; 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=iXTTZLsRuhsRp5h8WcNHGB3pNNMVPPfd9/y2fSk+sAE=; b=SqafVbKk1Ey6Y3KhmuVCjohNxBljce8l/HhgtGwzLphnpUOhir17LaiTWaK2snikcbEK1X vI+muXf0PDPGyfAg== Date: Wed, 16 Aug 2023 13:32:23 +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/virtualization.scm (looking-glass-client): Restyle format. [arguments]: Use G-expressions. Drop trailing #t from phases. --- gnu/packages/virtualization.scm | 142 ++++++++++++++++---------------- 1 file changed, 69 insertions(+), 73 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e446adfa98..2f2454e544 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1918,84 +1918,80 @@ (define-public looking-glass-client (package (name "looking-glass-client") (version "B6") - (source - (origin - (method url-fetch) - (uri (string-append "https://looking-glass.io/artifact/" - version "/source")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "15d7wwbzfw28yqbz451b6n33ixy50vv8acyzi8gig1mq5a8gzdib")))) + (source (origin + (method url-fetch) + (uri (string-append "https://looking-glass.io/artifact/" version + "/source")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "15d7wwbzfw28yqbz451b6n33ixy50vv8acyzi8gig1mq5a8gzdib")))) (build-system cmake-build-system) - (inputs - (list bash-minimal - font-dejavu - fontconfig - freetype - glu - gmp - libglvnd - libiberty - libsamplerate - libx11 - libxcursor - libxfixes - libxi - libxinerama - libxkbcommon - libxpresent - libxrandr - libxscrnsaver - mesa - pipewire - pulseaudio - spice-protocol - wayland - wayland-protocols - `(,zlib "static"))) + (inputs (list bash-minimal + font-dejavu + fontconfig + freetype + glu + gmp + libglvnd + libiberty + libsamplerate + libx11 + libxcursor + libxfixes + libxi + libxinerama + libxkbcommon + libxpresent + libxrandr + libxscrnsaver + mesa + pipewire + pulseaudio + spice-protocol + wayland + wayland-protocols + `(,zlib "static"))) (native-inputs (list nettle pkg-config)) (arguments - `(#:tests? #f ;; No tests are available. - ;; Package uses "-march=native" by default. We disable that to build with the - ;; lowest supported architecture for reproducibility and CPU compatibility. - #:configure-flags '("-DOPTIMIZE_FOR_NATIVE=OFF") - #:make-flags '("CC=gcc") - #:phases (modify-phases %standard-phases - (add-before 'configure 'chdir-to-client - (lambda* (#:key outputs #:allow-other-keys) - (chdir "client") - #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (install-file "looking-glass-client" - (string-append (assoc-ref outputs "out") - "/bin")) - #t)) - (add-after 'install 'wrapper - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program - (string-append (assoc-ref outputs "out") - "/bin/looking-glass-client") - `("LD_LIBRARY_PATH" ":" prefix - ,(map (lambda (name) - (let ((input (assoc-ref inputs name))) - (string-append input "/lib"))) - '("gmp" - "libxi" - "nettle" - "mesa" - "wayland" - "fontconfig-minimal" - "freetype" - "libx11" - "libxfixes" - "libxscrnsaver" - "libxinerama")))) - #t))))) + (list #:tests? #f ;No tests are available. + ;; Package uses "-march=native" by default. We disable that to build with the + ;; lowest supported architecture for reproducibility and CPU compatibility. + #:configure-flags #~'("-DOPTIMIZE_FOR_NATIVE=OFF") + #:make-flags #~'("CC=gcc") + #:phases #~(modify-phases %standard-phases + (add-before 'configure 'chdir-to-client + (lambda* (#:key outputs #:allow-other-keys) + (chdir "client"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "looking-glass-client" + (string-append (assoc-ref outputs + "out") + "/bin")))) + (add-after 'install 'wrapper + (lambda* (#:key inputs outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs + "out") + "/bin/looking-glass-client") + `("LD_LIBRARY_PATH" ":" prefix + ,(map (lambda (name) + (let ((input (assoc-ref inputs name))) + (string-append input "/lib"))) + '("gmp" "libxi" + "nettle" + "mesa" + "wayland" + "fontconfig-minimal" + "freetype" + "libx11" + "libxfixes" + "libxscrnsaver" + "libxinerama"))))))))) (home-page "https://looking-glass.io/") (synopsis "KVM Frame Relay (KVMFR) implementation") - (description "Looking Glass allows the use of a KVM (Kernel-based Virtual + (description + "Looking Glass allows the use of a KVM (Kernel-based Virtual Machine) configured for VGA PCI Pass-through without an attached physical monitor, keyboard or mouse. It displays the VM's rendered contents on your main monitor/GPU.")