summaryrefslogtreecommitdiff
path: root/user/xorg-server
diff options
context:
space:
mode:
Diffstat (limited to 'user/xorg-server')
-rw-r--r--user/xorg-server/20-modules.conf18
-rw-r--r--user/xorg-server/APKBUILD138
-rw-r--r--user/xorg-server/autoconfig-sis.patch2
-rw-r--r--user/xorg-server/fix-musl-arm.patch24
4 files changed, 96 insertions, 86 deletions
diff --git a/user/xorg-server/20-modules.conf b/user/xorg-server/20-modules.conf
deleted file mode 100644
index 4ddcdd461..000000000
--- a/user/xorg-server/20-modules.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-Section "Module"
- Load "exa"
-# Load "wfb"
-
- Load "dri"
- Load "dri2"
- Load "glx"
-
- Load "int10"
- Load "vbe"
- Load "fb"
- Load "shadowfb"
- Load "shadow"
- Load "vgahw"
- Load "evdev"
- Load "fbdevhw"
- Load "glamoregl"
-EndSection
diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD
index 2debe9c90..2c64a7c54 100644
--- a/user/xorg-server/APKBUILD
+++ b/user/xorg-server/APKBUILD
@@ -1,34 +1,72 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=xorg-server
-pkgver=1.20.5
+pkgver=21.1.16
pkgrel=0
pkgdesc="X.Org X11 server"
url="https://www.X.Org/"
arch="all"
-license="MIT"
options="suid"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc xvfb $pkgname-xephyr
- $pkgname-xnest"
+license="MIT"
+depends="font-cursor-misc font-misc-misc xkeyboard-config xkbcomp xinit
+ xorg-server-protocol
+ "
+depends_dev="libepoxy-dev libglvnd-dev libpciaccess-dev libxfont2-dev"
+makedepends="$depends_dev meson eudev-dev libdrm-dev
+ libepoxy-dev pixman-dev libx11-dev libxdamage-dev libxinerama-dev
+ libxkbfile-dev libxkbui-dev libxv-dev libxxf86dga-dev libxxf86misc-dev
+ libxcvt-dev mesa-dev xkbcomp-dev xcb-util-dev xcb-util-image-dev
+ xcb-util-keysyms-dev xcb-util-renderutil-dev xcb-util-wm-dev xorgproto-dev
+ xtrans openssl-dev perl zlib-dev
+ "
# the modesetting driver is now shipped with xorg server
replaces="xf86-video-modesetting"
-depends="font-cursor-misc font-misc-misc xkeyboard-config xkbcomp xinit"
-depends_dev="libepoxy-dev libxfont2-dev mesa-dev"
-makedepends="$depends_dev autoconf automake libtool util-macros
- eudev-dev libpciaccess-dev libdrm-dev libepoxy-dev pixman-dev
- libx11-dev libxdamage-dev libxinerama-dev libxkbfile-dev libxkbui-dev
- libxv-dev libxxf86dga-dev libxxf86misc-dev xcb-util-dev
- xcb-util-image-dev xcb-util-keysyms-dev xcb-util-renderutil-dev
- xcb-util-wm-dev xorgproto-dev
- xtrans
- openssl-dev perl zlib-dev
- "
-source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc xvfb $pkgname-xephyr
+ $pkgname-xnest $pkgname-protocol"
+source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.xz
autoconfig-sis.patch
fix-musl-arm.patch
"
# secfixes:
+# 21.1.12-r0:
+# - CVE-2024-31080
+# - CVE-2024-31081
+# - CVE-2024-31082
+# - CVE-2024-31083
+# - CVE-2023-6816
+# - CVE-2024-0229
+# - CVE-2024-21885
+# - CVE-2024-21886
+# - CVE-2024-0408
+# - CVE-2024-0409
+# - CVE-2023-6377
+# - CVE-2023-6478
+# - CVE-2023-5367
+# - CVE-2023-5380
+# - CVE-2023-5574
+# - CVE-2023-0494
+# - CVE-2022-4283
+# - CVE-2022-46340
+# - CVE-2022-46341
+# - CVE-2022-46342
+# - CVE-2022-46343
+# - CVE-2022-46344
+# - CVE-2022-2319
+# - CVE-2022-2320
+# - CVE-2021-4008
+# - CVE-2021-4009
+# - CVE-2021-4010
+# - CVE-2021-4011
+# - CVE-2021-3472
+# - CVE-2020-14360
+# - CVE-2020-25712
+# 1.20.9-r0:
+# - CVE-2020-14345
+# - CVE-2020-14346
+# - CVE-2020-14347
+# - CVE-2020-14361
+# - CVE-2020-14362
# 1.20.3-r0:
# - CVE-2018-14665
# 1.19.5-r0:
@@ -59,45 +97,41 @@ build() {
export CFLAGS="$CFLAGS -D_GNU_SOURCE"
[ "$CLIBC" = musl ] && export CFLAGS="$CFLAGS -D__gid_t=gid_t -D__uid_t=uid_t"
export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
+ _fontroot="/usr/share/fonts"
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
+ meson setup \
--prefix=/usr \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
- --with-xkb-path=/usr/share/X11/xkb \
- --with-xkb-output=/var/lib/xkb \
- --without-systemd-daemon \
- --enable-composite \
- --enable-config-udev \
- --enable-dri \
- --enable-dri2 \
- --enable-glamor \
- --enable-ipv6 \
- --enable-kdrive \
- --enable-xace \
- --enable-xcsecurity \
- --enable-xephyr \
- --enable-xnest \
- --enable-xorg \
- --enable-xres \
- --enable-xv \
- --disable-xwayland \
- --disable-config-hal \
- --disable-dmx \
- --disable-systemd-logind \
- --with-os-vendor="${DISTRO_NAME:-Adélie Linux}"
+ -Dxkb_dir=/usr/share/X11/xkb \
+ -Dxkb_output_dir=/var/lib/xkb \
+ -Dsystemd_logind=false \
+ -Ddri1=true \
+ -Ddri2=true \
+ -Ddri3=true \
+ -Dglamor=true \
+ -Dipv6=true \
+ -Dxace=true \
+ -Dxcsecurity=true \
+ -Dxephyr=true \
+ -Dxnest=true \
+ -Dxorg=true \
+ -Dxres=true \
+ -Dhal=false \
+ -Dsecure-rpc=false \
+ -Dpciaccess=true \
+ -Ddefault_font_path=$_fontroot/misc,$_fontroot/100dpi:unscaled,$_fontroot/75dpi:unscaled,$_fontroot/TTF,$_fontroot/Type1 \
+ build
- make
+ meson compile -C build
}
check() {
- make check
+ meson test --no-rebuild --print-errorlogs -C build
}
package() {
- make -j1 DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" meson install --no-rebuild -C build
chmod u+s "$pkgdir"/usr/bin/Xorg
# Don't conflict with xf86-input-evdev
@@ -128,12 +162,14 @@ xnest() {
mv "$pkgdir"/usr/bin/Xnest "$subpkgdir"/usr/bin/
}
-xwayland() {
- pkgdesc="X.Org server for Wayland"
- mkdir -p "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/
+protocol() {
+ pkgdesc="Xorg server protocol file"
+ depends=""
+
+ mkdir -p "$subpkgdir"/usr/lib/xorg
+ mv "$pkgdir"/usr/lib/xorg/protocol.txt "$subpkgdir"/usr/lib/xorg/
}
-sha512sums="625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 xorg-server-1.20.5.tar.bz2
-30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch
-b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch"
+sha512sums="38fd4232a293a497d13f8b57e85e84cf6a531453a7d8d5de1a77d67ceaf8714d5770951a8a21f1b3f519e83be1fc0926dce269846e75a8b11aa1062dd507f67d xorg-server-21.1.16.tar.xz
+d77151bc51766e1230a121c008ac1d0695275bf889b1db4b3330c1f8ee720b0e046cc935fa14aaef40b02fdea508e84e53959b560131ace14ace14943c8eb734 autoconfig-sis.patch
+c68d6299928032806ade94b4848f147757d6571a2f8830922a20c9e1053fe42700e5c9e196ad58ce5e5536cf034260f973edd6e2792c9bacf4e2d70660949a4a fix-musl-arm.patch"
diff --git a/user/xorg-server/autoconfig-sis.patch b/user/xorg-server/autoconfig-sis.patch
index e97d82114..2c1824752 100644
--- a/user/xorg-server/autoconfig-sis.patch
+++ b/user/xorg-server/autoconfig-sis.patch
@@ -1,6 +1,6 @@
--- ./hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000
+++ ./hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000
-@@ -1200,9 +1200,15 @@
+@@ -1231,9 +1231,15 @@
break;
}
break;
diff --git a/user/xorg-server/fix-musl-arm.patch b/user/xorg-server/fix-musl-arm.patch
index e661ae175..7d6cc3762 100644
--- a/user/xorg-server/fix-musl-arm.patch
+++ b/user/xorg-server/fix-musl-arm.patch
@@ -1,20 +1,12 @@
---- ./hw/xfree86/common/compiler.h.orig
-+++ ./hw/xfree86/common/compiler.h
-@@ -721,7 +721,7 @@
- :"r"(val), "r"(addr), "i"(ASI_PL));
+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
-@@ -996,7 +996,7 @@
- return xf86ReadMmio32Le((void *) ioBase, port);
- }
-
--#elif defined(__arm__) && defined(__linux__)
-+#elif defined(__arm__) && defined(__GLIBC__)
- /* for Linux on ARM, we use the LIBC inx/outx routines */
- /* note that the appropriate setup via "ioperm" needs to be done */
+ extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-07-11 18:40:44 +0000