diff options
| author | Ermine <mustela@erminea.space> | 2024-08-28 15:20:47 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-11-29 04:54:52 -0600 |
| commit | e1dc4ae7b96312aea694f203597e93e75a737246 (patch) | |
| tree | 7eacb723ae920def2356408ce282a54a1cf140a5 /user/xorg-server/fix-musl-arm.patch | |
| parent | 5d84bb501463ba0528f4b0d5bd9c25877891ed83 (diff) | |
| download | packages-e1dc4ae7b96312aea694f203597e93e75a737246.tar.gz packages-e1dc4ae7b96312aea694f203597e93e75a737246.tar.bz2 packages-e1dc4ae7b96312aea694f203597e93e75a737246.tar.xz packages-e1dc4ae7b96312aea694f203597e93e75a737246.zip | |
user/xorg-server: upgrade to 21.1.13
Also use meson instead of autotools and do not build XWayland, since it
is now provided by a separate tarball. protocol.txt file is separated
into a subpackage so it can be used by XWayland without pulling in the
rest of Xorg.
Diffstat (limited to 'user/xorg-server/fix-musl-arm.patch')
| -rw-r--r-- | user/xorg-server/fix-musl-arm.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/user/xorg-server/fix-musl-arm.patch b/user/xorg-server/fix-musl-arm.patch index b5a64a4e7..7d6cc3762 100644 --- a/user/xorg-server/fix-musl-arm.patch +++ b/user/xorg-server/fix-musl-arm.patch @@ -1,11 +1,12 @@ ---- ./hw/xfree86/common/compiler.h.orig -+++ ./hw/xfree86/common/compiler.h -@@ -518,7 +518,7 @@ +diff -Nurp xorg-server-21.1.3.orig/hw/xfree86/common/compiler.h xorg-server-21.1.3/hw/xfree86/common/compiler.h +--- xorg-server-21.1.3.orig/hw/xfree86/common/compiler.h 2022-01-02 22:41:56.000000000 +0000 ++++ xorg-server-21.1.3/hw/xfree86/common/compiler.h 2024-08-28 09:24:45.059582654 +0000 +@@ -518,7 +518,7 @@ xf86WriteMmio32Le(__volatile__ void *bas barrier(); } --#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) -+#elif defined(__mips__) || (defined(__arm32__) && !defined(__GLIBC__)) - #if defined(__arm32__) || defined(__mips64) +-#elif defined(__arm32__) && !defined(__linux__) ++#elif defined(__arm32__) && !defined(__GLIBC__) #define PORT_SIZE long - #else + + extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ |