ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 22:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xarcan: Update to 0.6.1.

Browse source 
* 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.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Ahmad Draidi 2023-07-02 13:19:05 +04:00 committed by Maxim Cournoyer
parent f38be97383
commit f592042a45
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 47 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
gnu/packages/arcan.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 L p R n d n <guix@lprndn.info> ;;; Copyright © 2019 L p R n d n <guix@lprndn.info>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2023 Ahmad Draidi <a.r.draidi@redscript.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -19,7 +20,8 @@
(define-module (gnu packages arcan) (define-module (gnu packages arcan)
#:use-module (guix build-system cmake) #: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 git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
@ -29,6 +31,7 @@ (define-module (gnu packages arcan)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
@ -39,6 +42,7 @@ (define-module (gnu packages arcan)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages ocr) #:use-module (gnu packages ocr)
#:use-module (gnu packages onc-rpc)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages ruby) #:use-module (gnu packages ruby)
@ -185,61 +189,66 @@ (define-public arcan-sdl
(synopsis "Combined display server, multimedia framework and game engine (SDL)"))) (synopsis "Combined display server, multimedia framework and game engine (SDL)")))
(define-public xarcan (define-public xarcan
(let ((commit "8e6ee029388326cfe5cddeffe482eb3702e9b7f3")
(revision "1" ))
(package (package
(name "xarcan") (name "xarcan")
(version (git-version "0.5.4" revision commit)) (version "0.6.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(uri (git-reference (uri (git-reference
(url "https://github.com/letoram/xarcan") (url "https://github.com/letoram/xarcan")
(commit commit))) (commit version)))
(sha256 (sha256
(base32 "0zng7cs6733mnf0p6g5wv02981f2sf567n56csax6cmzb8fpamym")))) (base32 "1z4sf101i2y6rg2vcxfwmp1nkzfa3rw1pp48ym1ds1ka513vy128"))))
(build-system gnu-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags (list
`("--enable-kdrive" "--enable-xarcan" #:configure-flags
"--disable-xorg" "--disable-xwayland" #~(list
"--disable-xnest" "--disable-xvfb" "-Dglamor=true" "-Dint10=false"
"--enable-glamor" "--enable-glx" "-Dipv6=true"
"--disable-int10-module" "--enable-ipv6" "-Dsystemd_logind=false"
"--enable-record" "--without-systemd-daemon"
"--enable-xcsecurity" "--disable-static" ;; The following arguments were taken from the Xwayland package.
,(string-append "--with-xkb-path="
(assoc-ref %build-inputs "xkeyboard-config") ;; The build system insist on providing a default font path; give
"/share/X11/xkb") ;; that of dejavu, the same used for our fontconfig package.
,(string-append "--with-xkb-bin-directory=" (string-append "-Ddefault_font_path="
(assoc-ref %build-inputs "xkbcomp") #$(this-package-input "font-dejavu") "/share/fonts")
"/bin") (string-append "-Dxkb_dir=" #$(this-package-input "xkeyboard-config")
,(string-append "--with-xkb-output=" "/share/X11/xkb")
"/tmp")))) ; FIXME: Copied from xorg (string-append "-Dxkb_bin_dir=" #$(this-package-input "xkbcomp") "/bin")
(format #f "-Dbuilder_string=\"Build ID: ~a ~a\"" #$name #$version))))
(native-inputs (native-inputs
(list pkg-config autoconf automake libtool util-macros)) (list pkg-config autoconf automake libtool util-macros))
(inputs (inputs
`(("arcan" ,arcan) (list arcan
("font-util" ,font-util) font-dejavu
("libdrm" ,libdrm) font-util
("libepoxy" ,libepoxy) libdrm
("libkbfile" ,libxkbfile) libepoxy
("libressl" ,libressl) libtirpc
("libx11" ,libx11) libx11
("libxfont2" ,libxfont2) libxfont2
("mesa" ,mesa) libxkbfile
("pixman" ,pixman) libxshmfence
("xkeyboard-config" ,xkeyboard-config) mesa
("xkbcomp" ,xkbcomp) openssl
("xorgproto" ,xorgproto) pixman
("xtrans" ,xtrans))) xcb-util
xcb-util-wm
xkbcomp
xkeyboard-config
xorgproto
xtrans))
(home-page "https://arcan-fe.com") (home-page "https://arcan-fe.com")
(synopsis "Patched Xserver that bridges connections to Arcan") (synopsis "Patched Xserver that bridges connections to Arcan")
(description "Patched Xserver with a KDrive backend that uses the arcan-shmif (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 to map Xlib/Xcb/X clients to a running arcan instance. It allows running an X session
as a window under Arcan.") as a window under Arcan.")
(license license:expat)))) (license (list license:expat
license:bsd-3))))
(define-public arcan-wayland (define-public arcan-wayland
(package (package