From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 51900@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: bug#51900: [PATCH 08/11] gnu: xorg-server-xwayland: Update to 21.1.3 and adjust package.
Date: Thu, 18 Nov 2021 09:16:13 -0500 [thread overview]
Message-ID: <20211118141616.4252-8-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20211118141616.4252-1-maxim.cournoyer@gmail.com>
Xwayland is no longer part of the main X server distribution and now requires
Meson to build. This change also turn on EGL support, which was previously
disabled.
* gnu/packages/xorg.scm (xorg-server-xwayland): Do not inherit from
xorg-server. Update to 21.1.3.
[native-inputs]: New field.
[build-system]: Likewise.
[inputs]: Fully specify inputs, which are a subset of those of xorg-server.
[configure-flags]: Adjust for Meson.
[phases]{patch-/bin/sh}: New phase.
[description, home-page, license]: New fields.
---
gnu/packages/xorg.scm | 74 +++++++++++++++++++++++++++++++++++--------
1 file changed, 61 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index cb391f8549..6fa5f2fae7 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -69,6 +69,7 @@ (define-module (gnu packages xorg)
#:use-module (gnu packages compression)
#:use-module (gnu packages emacs)
#: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)
@@ -87,6 +88,7 @@ (define-module (gnu packages xorg)
#:use-module (gnu packages llvm)
#:use-module (gnu packages m4)
#:use-module (gnu packages ncurses)
+ #:use-module (gnu packages onc-rpc)
#:use-module (gnu packages pciutils)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
@@ -5604,21 +5606,67 @@ (define-public egl-wayland
(license license:expat)))
(define-public xorg-server-xwayland
- (package/inherit xorg-server
+ (package
(name "xorg-server-xwayland")
- (inputs
- `(("wayland" ,wayland)
- ("wayland-protocols" ,wayland-protocols)
- ,@(package-inputs xorg-server)))
+ (version "21.1.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://xorg.freedesktop.org/archive/individual"
+ "/xserver/xwayland-" version ".tar.xz"))
+ (sha256
+ (base32
+ "18pqvg76grbsyxa3mm3j06i1l8cwb28nbn2gcnqpsk7x75zpbhpb"))))
+ (inputs (list font-dejavu
+ dbus
+ egl-wayland
+ eudev
+ libfontenc
+ libdrm
+ libepoxy
+ libgcrypt
+ libtirpc
+ libxfont2
+ libxkbfile
+ pixman
+ wayland
+ wayland-protocols
+ xkbcomp
+ xkeyboard-config
+ xorgproto
+ xtrans))
+ (native-inputs (list pkg-config))
+ (build-system meson-build-system)
(arguments
- (substitute-keyword-arguments (package-arguments xorg-server)
- ((#:configure-flags flags)
- `(cons* "--enable-xwayland" "--disable-xorg"
- "--disable-docs" "--disable-devel-docs"
- "--disable-xvfb" "--disable-xnest"
- "--disable-xquartz" "--disable-xwin"
- ,flags))))
- (synopsis "Xorg server with wayland backend")))
+ `(#:configure-flags
+ (list "-Dxwayland_eglstream=true"
+ (string-append "-Dxkb_dir="
+ (assoc-ref %build-inputs "xkeyboard-config")
+ "/share/X11/xkb")
+ (string-append "-Dxkb_bin_dir="
+ (assoc-ref %build-inputs "xkbcomp") "/bin")
+ ;; 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")
+ "-Dxkb_output_dir=/tmp"
+ (format #f "-Dbuilder_string=\"Build ID: ~a ~a\"" ,name ,version)
+ "-Dxcsecurity=true"
+ "-Ddri3=true"
+ "-Dglamor=true"
+ ;; For the log file, etc.
+ "--localstatedir=/var")
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'patch-/bin/sh
+ (lambda _
+ (substitute* (find-files "." "\\.c$")
+ (("/bin/sh") (which "sh"))))))))
+ (synopsis "Xorg server with Wayland backend")
+ (description "Xwayland is an X server for running X clients under
+Wayland.")
+ (home-page "https://www.x.org/wiki/")
+ (license license:x11)))
;; packages of height 4 in the propagated-inputs tree
--
2.33.1
next prev parent reply other threads:[~2021-11-18 14:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-16 21:47 bug#51900: [core-updates-frozen] xorg-server-xwayland broken Guillaume Le Vaillant
2021-11-17 14:36 ` Guillaume Le Vaillant
2021-11-18 13:40 ` Maxim Cournoyer
2021-11-18 15:25 ` Guillaume Le Vaillant
2021-11-18 16:51 ` Maxim Cournoyer
2021-11-20 14:10 ` Guillaume Le Vaillant
2021-11-18 14:16 ` bug#51900: [PATCH 01/11] gnu: libinput: Update to 1.19.2 Maxim Cournoyer
2021-11-18 14:16 ` bug#51900: [PATCH 02/11] gnu: libxkbfile: Propagate libx11 and kbproto Maxim Cournoyer
2021-11-18 14:16 ` bug#51900: [PATCH 03/11] gnu: mesa: Update to 21.2.5 Maxim Cournoyer
2021-11-18 14:16 ` bug#51900: [PATCH 04/11] gnu: xorg-server: Update to 21.1.1 and reinstate parallel tests Maxim Cournoyer
2021-11-18 14:16 ` bug#51900: [PATCH 05/11] gnu: xorg-server: Enable X security extensions (xcsecurity) Maxim Cournoyer
2021-11-18 14:16 ` bug#51900: [PATCH 06/11] gnu: Move eglexternalplatform and egl-wayland to (gnu packages xorg) Maxim Cournoyer
2021-11-18 14:16 ` bug#51900: [PATCH 07/11] gnu: egl-wayland: Update to 1.1.9 Maxim Cournoyer
2021-11-18 14:16 ` Maxim Cournoyer [this message]
2021-11-18 14:16 ` bug#51900: [PATCH 09/11] gnu: python-dbusmock: Update to 0.24.1 Maxim Cournoyer
2021-11-18 14:16 ` bug#51900: [PATCH 10/11] gnu: python-dbusmock: Patch reference to dbus-daemon Maxim Cournoyer
2021-11-18 14:16 ` bug#51900: [PATCH 11/11] gnu: mutter: Update to 41.0 and fix test (WIP) Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211118141616.4252-8-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=51900@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).