@JstKddng
Sorry, it just makes no sense without knowing that fact. I returned it back.
Git Clone URL: | https://aur.archlinux.org/xorg-server-git.git (read-only, click to copy) |
---|---|
Package Base: | xorg-server-git |
Description: | Xorg X server (git version) |
Upstream URL: | https://xorg.freedesktop.org |
Keywords: | git x-server xorg xorg-server |
Licenses: | custom |
Conflicts: | xorg-server-xnest |
Provides: | xorg-server-xnest |
Submitter: | ilikenwf |
Maintainer: | JstKddng (yurikoles) |
Last Packager: | yurikoles |
Votes: | 49 |
Popularity: | 0.001574 |
First Submitted: | 2008-08-07 19:05 (UTC) |
Last Updated: | 2022-07-21 09:15 (UTC) |
@JstKddng
Sorry, it just makes no sense without knowing that fact. I returned it back.
@yurikoles
man you keep removing my _srcurl variable. That guy's there for my daily automatic builds ;)
check()
function was added, if unit tests fail, you may ignore them by appending --nocheck
to makepkg
.
@JstKddng
I refactored pkgver()
and removed unused variables.
error: failed to prepare transaction (could not satisfy dependencies)
:: installing xorg-server-git (21.0.99.1.r170.g1801fe0ac-1) breaks dependency 'xorg-server' required by gdm-plymouth
You removed provides = (... xorg-server ...). Why? This breaks being able to replace xorg stable package with this one.
Considering this package uses newer code than the stable release xorg-server
, I'd say in addition to my other suggestion for fixing the naming scheme, and honestly probably even more important than that, is fixing the X-ABI-VIDEODRV_VERSION
. xorg-server
is on 25.2. This package reports 24. That makes it impossible to install things like xf86-video-fbdev
because it requires a version greater than 24 and less than 26 (as of me typing this).
The versioning method needs to be changed. I've come up with a proper one, read on for the explanation and one-liner:
The current method gives the incorrect version (21.0.99). The xserver repo's meson.build always contains the correct version (currently 21.1.99.1).
Still use git describe
to append the current commit hash to the end of the pkgver, but not use it for the pkgver number. Because right now, you end up with xorg-server-git 21.0.99.1.r127.gda9d012a9-1
, but it's really 21.1.99. 21.1.1 was released a few weeks ago.
Since meson.build
always has the proper version, I actually have tweaked your command into a one-liner that will always get the correct version:
git describe --long --tags | sed "s/$(git describe --long --tags | cut -d- -f3)/$(grep -m 1 version meson.build | awk '{print $2}' | sed "s/'//g;s/,//g")/g" | sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
gives us:
21.1.99.1.r127.gda9d012a9
and the package named:
xorg-server-git-21.1.99.1.r127.gda9d012a9-1-x86_64.pkg.tar.zst
So literally all you have to do is replace the one line in the PKGBUILD, and xorg-server-git will always be the true accurate version. This will avoid situations like the current one where xorg-server is on 21.1.1 but xorg-server-git is on 20.0.99 despite being actually built on 21.1.99.
You could also take a slightly different versioning approach like other -git packages do (for example libva-vdpau-driver-vp9-git) and use git rev-parse and rev-list, and use this:
printf ".r%s.g%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" | sed "s/^/$(grep -m 1 version meson.build | awk '{print $2}' | cut -d"'" -f2)/g"
which gives:
xorg-server-git-21.1.99.1.r17753.gda9d012a9-1-x86_64.pkg.tar.zst
Either one will always make sure the version is correct while appending the commit hash, the way it should be.
ERROR: Unknown options: "os_vendor"
Hello! cvt support appears to have moved to a separate libxcvt library.
build() currently fails if the package is missing and package_xorg-server-git() fails if it's installed (it tries to copy the now missing cvt binary and manpage).
Could you please update the deps and _install?
Thank you for this package!
This needs xorgproto-git to compile
Quickly 'resolved' the previous issue by commenting out the last line in PKGBUILD
Although there might be a better solution.
Even with the fixed mesonbuild, I still get a build error.
rmdir: failed to remove 'fakeinstall/usr/bin/X': Not a directory
rmdir: failed to remove 'fakeinstall/usr/bin': Directory not empty
rmdir: failed to remove 'fakeinstall/usr': Directory not empty
rmdir: failed to remove 'fakeinstall': Directory not empty
==> ERROR: A failure occurred in package_xorg-server-devel-git().
Aborting...
error making: xorg-server-git
@xenu https://github.com/mesonbuild/meson/pull/8569/files -- it appears to be a bug in mesonbuild
I have been getting a build error the last couple of days probably due to upstream commits to Xorg.wrap on 2021-03-25:
Installing hw/xfree86/Xorg.wrap to ./xorg-server-git/src/fakeinstall/usr/lib
'./xorg-server-git/src/fakeinstall/usr/lib/Xorg.wrap': Unable to set owner 0 and group 0: Operation not permitted, ignoring...
Traceback (most recent call last):
File "/usr/lib/python3.9/site-packages/mesonbuild/mesonmain.py", line 132, in run
return options.run_func(options)
File "/usr/lib/python3.9/site-packages/mesonbuild/minstall.py", line 702, in run
installer.do_install(datafilename)
File "/usr/lib/python3.9/site-packages/mesonbuild/minstall.py", line 503, in do_install
self.install_targets(d, dm, destdir, fullprefix)
File "/usr/lib/python3.9/site-packages/mesonbuild/minstall.py", line 656, in install_targets
self.fix_rpath(outname, t.rpath_dirs_to_remove, install_rpath, final_path,
File "/usr/lib/python3.9/site-packages/mesonbuild/minstall.py", line 322, in fix_rpath
depfixer.fix_rpath(*args, **kwargs)
File "/usr/lib/python3.9/site-packages/mesonbuild/scripts/depfixer.py", line 468, in fix_rpath
fix_elf(fname, rpath_dirs_to_remove, new_rpath, verbose)
File "/usr/lib/python3.9/site-packages/mesonbuild/scripts/depfixer.py", line 369, in fix_elf
with Elf(fname, verbose) as e:
File "/usr/lib/python3.9/site-packages/mesonbuild/scripts/depfixer.py", line 123, in __init__
self.bf = open(bfile, 'r+b')
PermissionError: [Errno 13] Permission denied: './xorg-server-git/src/fakeinstall/usr/lib/Xorg.wrap'
Exception ignored in: <function Elf.__del__ at 0x7f2b88463d30>
Traceback (most recent call last):
File "/usr/lib/python3.9/site-packages/mesonbuild/scripts/depfixer.py", line 140, in __del__
if self.bf:
AttributeError: 'Elf' object has no attribute 'bf'
FAILED: meson-install
/usr/bin/meson install --no-rebuild
ninja: build stopped: subcommand failed.
==> ERROR: A failure occurred in build().
Aborting...
@Rucikir
fair enough, if xorg-xwayland exists no point maintaining it here.
Hi! the extra package extracted xwayland to a standalone package (so, from the split package xorg-server-xwayland to xorg-xwayland).
I plan to do that too for my HiDPI package since it only touches xwayland, and I’ll remove xorg-server-*-hidpi-git and switch to xorg-wayland-hidpi-git.
You may want to consider mimicking what was done in extra. If I’m first to write that package, I’ll send you the patches ;-)
https://www.archlinux.org/packages/extra/x86_64/xorg-xwayland/
https://bugs.archlinux.org/task/68916
Thanks for the patch @Rucikir
@dequesto I’ve send a patch to the maintainer. I forgot I could inline the patch here. It’s quite simple indeed. acac6d74
Hi. Heads up! Because of commit 28ed4b95, that adds file /usr/share/man/man1/Xwayland.1, installation of this package fails.
Commit is described here: https://gitlab.freedesktop.org/xorg/xserver/-/commit/28ed4b95e90fb225fc32cfdce16df603ab600fcd
I am not sure what I should add to the script, hence I have no patch. It should be a trivial thing to fix, though.
Thanks for this package! I appreciate it.
@Rucikir
thanks for the heads up, just updated the package
This patch is needed for the latest commits.
From ff29270a54174ed927da8190c90b92f98e5d561d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= <antonin.decimo@gmail.com>
Date: Thu, 9 Jul 2020 09:00:08 +0200
Subject: [PATCH] install xwayland.pc
---
PKGBUILD | 1 +
1 file changed, 1 insertion(+)
diff --git a/PKGBUILD b/PKGBUILD
index 0984424..9de7860 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -219,6 +219,7 @@ package_xorg-server-devel-git() {
_install fakeinstall/usr/include/xorg/*
_install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
+ _install fakeinstall/usr/lib/pkgconfig/xwayland.pc
_install fakeinstall/usr/share/aclocal/xorg-server.m4
# license
--
2.27.0
@JstKddng
Thanks, bro ;)
Hello @yurikoles , good to know your health is back on track. I don't mind adding you as a co-maintainer.
@JstKddng, I had reported a bug upstream: https://gitlab.freedesktop.org/xorg/xserver/issues/979
Hi @JstKddng,
Thanks for your great work! I had added you as co-maintainer to amd, intel and nouveau packages. I hope you will add me to this package too :)
@goddessfreya
I see it differently, I have my PKGBUILDS as close as upstream and only modify tiny bits to achieve what I want, I have less maintenance hassle that way, lets give that to the arch maintainers. :P
Hello, new maintainer here. I made the least possible modifications in order to have this compile again. And thanks to @goddessfreya for the patch. I think that patch will be removed soon as upstream will fix this issue at one point.
I've mentioned this before, but I keep a maintained PKGBUILD here: https://github.com/goddessfreya/gabs/blob/master/builtins/xorg-server-git-gentz/PKGBUILD
The packages aren't split, but I personally don't care. It struck me as a maintenance hassle that I didn't want to put up with given the number of *-gentz packages I maintain.
The build failures are due to the recent XWayalnd refactor. I git bisected it a couple days ago, and the first bad commit was 89e32d00f6e03fcdab267bfd9f0b0c5c2747d380
. You need to apply https://gitlab.freedesktop.org/xorg/xserver/merge_requests/367.patch to get it to build.
@yurikoles
I'm sorry to hear that, don't worry though, I'll continue your legacy. Will push an update once I finish some work.
I can’t maintain it now due to health difficulties.
libdmx has been removed from official repos and can't be found in AUR (it is supposedly unused or obsolete). As such, we can't build xorg-server-git anymore. Removing the dependency to libdmx lead to another error : ../xserver/hw/xwayland/xwayland-glamor-eglstream.c:500:37: error: implicit declaration of function « xwl_window_from_window » [-Werror=implicit-function-declaration]
btw: I need the --libdir=lib parameter for meson.
Without it, for example the modules get installed into fakeinstall/usr/lib/x86_64-linux-gnu/xorg/modules/ instead of fakeinstall/usr/lib/xorg/modules/
@hagabaka
Downgrade libglvnd to 1.1.1-1 and mesa to 19.1.7.
It is convenient to use the downgrade script: https://aur.archlinux.org/packages/downgrade.
@hagabaka it's upstream issue https://gitlab.freedesktop.org/xorg/xserver/issues/914
I'm getting the following error. Any idea how to fix it?
In file included from /usr/include/EGL/eglplatform.h:122, from /usr/include/epoxy/egl_generated.h:11, from /usr/include/epoxy/egl.h:46, from ../xserver/glamor/glamor_priv.h:43, from ../xserver/hw/kdrive/ephyr/ephyr_glamor_xv.c:31: /usr/include/X11/Xlib.h:222:2: error: conflicting types for ‘GC’ 222 | *GC; | ^~ In file included from ../xserver/hw/kdrive/ephyr/../src/kdrive.h:36, from ../xserver/hw/kdrive/ephyr/ephyr_glamor_xv.c:28: ../xserver/include/gcstruct.h:282:3: note: previous declaration of ‘GC’ was here 282 | } GC; | ^~ [317/814] Compiling C object 'Xext/02e353f@@libxserver_xext@sta/sync.c.o'. ninja: build stopped: subcommand failed.
@aufkrawall please report upstream
Ok, seems to be a regression in master. server-1.20-branch works.
Does GLX/EGL work for you in xwayland without llvmpipe CPU fallback? For whatever reason, it doesn't for me, while Vulkan works on the GPU.
PRs are welcome: https://github.com/yurikoles-aur/xorg-server-git
Build is currently broken, reported upstream https://gitlab.freedesktop.org/xorg/xserver/issues/742
@lordheavy: I've "fixed" this pkg by just modifying the current pkg in the core repos.
I get the following error when trying to use the pkgbuild of xorg-server-xwayland-git:
==> ERROR: pkgver in provides is not allowed to contain colons, forward slashes, hyphens or whitespace. ==> ERROR:Makepkg could not build xorg-server-git.
@lordheavy, I can't build it:
CC InitInput.o
CC InitOutput.o
CC miinitext.o
CCLD Xvfb
../../glx/.libs/libglx.a(glxdriswrast.o): In function `__glXDRIscreenProbe':
glxdriswrast.c:(.text+0x72f): undefined reference to `glXGetProcAddressARB'
collect2: error: ld returned 1 exit status
make[3]: *** [Makefile:694: Xvfb] Error 1
make[3]: Leaving directory '/run/mount/user/xorg-server-git/src/xserver/hw/vfb'
make[2]: *** [Makefile:754: all-recursive] Error 1
make[2]: Leaving directory '/run/mount/user/xorg-server-git/src/xserver/hw/vfb'
make[1]: *** [Makefile:615: all-recursive] Error 1
make[1]: Leaving directory '/run/mount/user/xorg-server-git/src/xserver/hw'
make: *** [Makefile:816: all-recursive] Error 1
==> ERROR: A failure occurred in build().
Aborting...
==> ERROR: Makepkg was unable to build xorg-server-git.
xorg-server-xwayland-git is the only package depending on libxfont, as all of the others are depending on libxfont2. Is this normal?
this package is in conflict with xf86-amdgpu-git, is there a possible fix?
xorg-server-xwayland-git depends on libxfont, but the package is not available; shouldn't it depend on libxfont2?
Pinned Comments
yurikoles commented on 2022-03-18 01:04 (UTC)
check()
function was added, if unit tests fail, you may ignore them by appending--nocheck
tomakepkg
.yurikoles commented on 2019-05-29 15:00 (UTC)
PRs are welcome: https://github.com/yurikoles-aur/xorg-server-git