* [bug#65336] [PATCH 0/2] Update looking-glass-client to B6 and restyle package
@ 2023-08-16 9:15 Ahmad Draidi via Guix-patches via
2023-08-16 9:32 ` [bug#65336] [PATCH 1/2] gnu: looking-glass-client: Update to B6 Ahmad Draidi via Guix-patches via
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Ahmad Draidi via Guix-patches via @ 2023-08-16 9:15 UTC (permalink / raw)
To: 65336; +Cc: Ahmad Draidi
Hello Guix,
This series updates and restyles looking-glass-client, and also restores a
configuration parameter that was dropped in the previous update patch. Some
notes for posterity below.
The package builds with "-march=native" GCC parameter by default, which
makes it incompatible with CPUs older than the build machine and causes
crashes with "terminated by signal SIGILL (Illegal instruction)" and perhaps
others. We build it with the minimum supported CPU architecture to fix that.
This also helps with package reproducibility.
Thanks,
Ahmad Draidi (2):
gnu: looking-glass-client: Update to B6.
gnu: looking-glass-client: Update package style.
gnu/packages/virtualization.scm | 146 ++++++++++++++++----------------
1 file changed, 73 insertions(+), 73 deletions(-)
base-commit: 880ada0bdb9e694573ec42200d48658b27744b9b
--
2.41.0
^ permalink raw reply [flat|nested] 4+ messages in thread
* [bug#65336] [PATCH 1/2] gnu: looking-glass-client: Update to B6.
2023-08-16 9:15 [bug#65336] [PATCH 0/2] Update looking-glass-client to B6 and restyle package Ahmad Draidi via Guix-patches via
@ 2023-08-16 9:32 ` Ahmad Draidi via Guix-patches via
2023-08-16 9:32 ` [bug#65336] [PATCH 2/2] gnu: looking-glass-client: Update package style Ahmad Draidi via Guix-patches via
2023-08-29 13:05 ` bug#65336: [PATCH 0/2] Update looking-glass-client to B6 and restyle package Christopher Baines
2 siblings, 0 replies; 4+ messages in thread
From: Ahmad Draidi via Guix-patches via @ 2023-08-16 9:32 UTC (permalink / raw)
To: 65336; +Cc: Ahmad Draidi
* 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 <arunisaac@systemreboot.net>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2023 Juliana Sims <juli@incana.org>
+;;; Copyright © 2023 Ahmad Draidi <a.r.draidi@redscript.org>
;;;
;;; 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
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#65336] [PATCH 2/2] gnu: looking-glass-client: Update package style.
2023-08-16 9:15 [bug#65336] [PATCH 0/2] Update looking-glass-client to B6 and restyle package Ahmad Draidi via Guix-patches via
2023-08-16 9:32 ` [bug#65336] [PATCH 1/2] gnu: looking-glass-client: Update to B6 Ahmad Draidi via Guix-patches via
@ 2023-08-16 9:32 ` Ahmad Draidi via Guix-patches via
2023-08-29 13:05 ` bug#65336: [PATCH 0/2] Update looking-glass-client to B6 and restyle package Christopher Baines
2 siblings, 0 replies; 4+ messages in thread
From: Ahmad Draidi via Guix-patches via @ 2023-08-16 9:32 UTC (permalink / raw)
To: 65336; +Cc: Ahmad Draidi
* 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.")
--
2.41.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#65336: [PATCH 0/2] Update looking-glass-client to B6 and restyle package
2023-08-16 9:15 [bug#65336] [PATCH 0/2] Update looking-glass-client to B6 and restyle package Ahmad Draidi via Guix-patches via
2023-08-16 9:32 ` [bug#65336] [PATCH 1/2] gnu: looking-glass-client: Update to B6 Ahmad Draidi via Guix-patches via
2023-08-16 9:32 ` [bug#65336] [PATCH 2/2] gnu: looking-glass-client: Update package style Ahmad Draidi via Guix-patches via
@ 2023-08-29 13:05 ` Christopher Baines
2 siblings, 0 replies; 4+ messages in thread
From: Christopher Baines @ 2023-08-29 13:05 UTC (permalink / raw)
To: Ahmad Draidi; +Cc: 65336-done, guix-patches
[-- Attachment #1: Type: text/plain, Size: 981 bytes --]
Ahmad Draidi via Guix-patches via <guix-patches@gnu.org> writes:
> This series updates and restyles looking-glass-client, and also restores a
> configuration parameter that was dropped in the previous update patch. Some
> notes for posterity below.
>
> The package builds with "-march=native" GCC parameter by default, which
> makes it incompatible with CPUs older than the build machine and causes
> crashes with "terminated by signal SIGILL (Illegal instruction)" and perhaps
> others. We build it with the minimum supported CPU architecture to fix that.
> This also helps with package reproducibility.
>
> Thanks,
>
> Ahmad Draidi (2):
> gnu: looking-glass-client: Update to B6.
> gnu: looking-glass-client: Update package style.
>
> gnu/packages/virtualization.scm | 146 ++++++++++++++++----------------
> 1 file changed, 73 insertions(+), 73 deletions(-)
Thanks Ahmad, these changes look good to me. I've pushed to master as
02e32197a80e4fc323ffe0e519ad4e58f206fc5d.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-08-29 13:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-16 9:15 [bug#65336] [PATCH 0/2] Update looking-glass-client to B6 and restyle package Ahmad Draidi via Guix-patches via
2023-08-16 9:32 ` [bug#65336] [PATCH 1/2] gnu: looking-glass-client: Update to B6 Ahmad Draidi via Guix-patches via
2023-08-16 9:32 ` [bug#65336] [PATCH 2/2] gnu: looking-glass-client: Update package style Ahmad Draidi via Guix-patches via
2023-08-29 13:05 ` bug#65336: [PATCH 0/2] Update looking-glass-client to B6 and restyle package Christopher Baines
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).