diff options
Diffstat (limited to 'community/xorg-server/APKBUILD')
-rw-r--r-- | community/xorg-server/APKBUILD | 151 |
1 files changed, 97 insertions, 54 deletions
diff --git a/community/xorg-server/APKBUILD b/community/xorg-server/APKBUILD index d6fbfcb552b..30a74c2924b 100644 --- a/community/xorg-server/APKBUILD +++ b/community/xorg-server/APKBUILD @@ -1,63 +1,106 @@ # Contributor: Ćukasz Jendrysik <scadu@yandex.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server -pkgver=1.20.9 +pkgver=21.1.11 pkgrel=1 pkgdesc="X.Org X servers" url="https://www.x.org/wiki" arch="all" license="MIT" options="suid" -subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc xvfb $pkgname-xephyr - $pkgname-xnest $pkgname-xwayland" -# the modesetting driver is now shipped with xorg server -replaces="xf86-video-modesetting" +subpackages=" + $pkgname-dbg + $pkgname-dev + $pkgname-doc + xvfb + $pkgname-xephyr + $pkgname-xnest + $pkgname-common::noarch + " depends=" - font-misc-misc font-cursor-misc - xkeyboard-config + font-misc-misc + mesa-egl xkbcomp - xinit + xkeyboard-config + xorg-server-common " depends_dev=" libepoxy-dev + libpciaccess-dev libxfont2-dev mesa-dev - libpciaccess-dev " makedepends=" $depends_dev - meson - xorgproto - xtrans - libxshmfence-dev - pixman-dev - xkbcomp-dev - libxkbfile-dev - nettle-dev - wayland-dev - wayland-protocols + eudev-dev libdrm-dev - libxext-dev libx11-dev libxau-dev - eudev-dev libxcb-dev + libxcvt-dev + libxdmcp-dev + libxext-dev + libxkbfile-dev + libxshmfence-dev + meson + nettle-dev + pixman-dev + wayland-dev + wayland-protocols xcb-util-dev xcb-util-image-dev xcb-util-keysyms-dev xcb-util-renderutil-dev xcb-util-wm-dev - libxdmcp-dev - " -source="https://www.x.org/releases/individual/xserver/xorg-server-$pkgver.tar.bz2 - xwayland-glx.patch - link-libshadow.patch - e50c85f4ebf559a3bac4817b41074c43d4691779.patch - 0001-compiler.h-ensure-IOPortBase-is-declared-extern-on-m.patch + xkbcomp-dev + xorgproto + xtrans " +source="https://www.x.org/releases/individual/xserver/xorg-server-$pkgver.tar.xz + ms-rotate.patch" + +# the modesetting driver is now shipped with xorg server +provides="xf86-video-modesetting=$pkgver-r$pkgrel" +replaces="xf86-video-modesetting" # secfixes: +# 21.1.11-r0: +# - CVE-2023-6816 +# - CVE-2024-0229 +# - CVE-2024-21885 +# - CVE-2024-21886 +# - CVE-2024-0408 +# - CVE-2024-0409 +# 21.1.10-r0: +# - CVE-2023-6377 +# - CVE-2023-6478 +# 21.1.9-r0: +# - CVE-2023-5367 +# - CVE-2023-5380 +# - CVE-2023-5574 +# 21.1.7-r0: +# - CVE-2023-0494 +# 21.1.5-r0: +# - CVE-2022-4283 +# - CVE-2022-46340 +# - CVE-2022-46341 +# - CVE-2022-46342 +# - CVE-2022-46343 +# - CVE-2022-46344 +# 21.1.4-r0: +# - CVE-2022-2319 +# - CVE-2022-2320 +# 21.1.2-r0: +# - CVE-2021-4008 +# - CVE-2021-4009 +# - CVE-2021-4010 +# - CVE-2021-4011 +# 1.20.10-r5: +# - CVE-2021-3472 +# 1.20.10-r0: +# - CVE-2020-14360 +# - CVE-2020-25712 # 1.20.9-r0: # - CVE-2020-14362 # - CVE-2020-14361 @@ -92,19 +135,20 @@ build() { # xorg modules does not work with the -z now and it seems like we # cannot pass over the linker flag to .so files. so we tweak the # gcc specs. - export CFLAGS="$CFLAGS -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t" + export CFLAGS="${CFLAGS/-fno-plt}" + export CXXFLAGS="${CXXFLAGS/-fno-plt}" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" _fontroot="/usr/share/fonts" + # 32-bit fails otherwise + export CFLAGS="$CFLAGS -Wno-error=array-bounds" + abuild-meson \ - --sysconfdir=/etc/X11 \ + -Db_lto=true \ -Dxorg=true \ -Dxephyr=true \ - -Dxwayland=true \ -Dglamor=true \ - -Dxwayland_eglstream=false \ -Dxnest=true \ - -Ddmx=false \ -Dxvfb=true \ -Dxwin=false \ -Ddefault_font_path=$_fontroot/misc,$_fontroot/100dpi:unscaled,$_fontroot/75dpi:unscaled,$_fontroot/TTF,$_fontroot/Type1 \ @@ -116,7 +160,6 @@ build() { -Dipv6=true \ -Dxkb_dir=/usr/share/X11/xkb \ -Dxkb_output_dir=/var/lib/xkb \ - -Dos_vendor="${DISTRO_NAME:-Alpine Linux}" \ -Dlisten_tcp=false \ -Dlisten_unix=true \ -Dlisten_local=true \ @@ -130,50 +173,50 @@ build() { -Ddri2=true \ -Ddri3=true \ . output - meson compile ${JOBS:+-j ${JOBS}} -C output + meson compile -C output } check() { - meson test --no-rebuild -v -C output + meson test --no-rebuild --print-errorlogs -C output } package() { DESTDIR="$pkgdir" meson install --no-rebuild -C output - chmod u+s "$pkgdir"/usr/bin/Xorg - ln -s /usr/bin/Xorg "$pkgdir"/usr/bin/X + chmod u+s "$pkgdir"/usr/libexec/Xorg.wrap # Don't conflict with xf86-input-evdev rm -f "$pkgdir"/usr/share/X11/xorg.conf.d/10-evdev.conf - install -m755 -d "$pkgdir"/var/lib/xkb + install -Dm0644 xkb/README.compiled -t "$pkgdir"/var/lib/xkb } xvfb() { pkgdesc="Virtual Framebuffer 'fake' X server" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/Xvfb "$subpkgdir"/usr/bin/ + + amove usr/bin/Xvfb } xephyr() { pkgdesc="kdrive based X Server which targets a window on a host X Server as its framebuffer" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/ + + amove usr/bin/Xephyr } xnest() { pkgdesc="A nested Xorg server" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/Xnest "$subpkgdir"/usr/bin/ + + amove usr/bin/Xnest } -xwayland() { - pkgdesc="run X clients under wayland" - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/Xwayland "$subpkgdir"/usr/bin/ +common() { + depends="" + pkgdesc="Xorg server common files" + + amove usr/lib/xorg/protocol.txt } -sha512sums="d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6 xorg-server-1.20.9.tar.bz2 -004c9a7d920af8825a311d32433bf64190d45583d57bb20b3c5ef39d8011ced7bf17b73296e56078ca791e6cd923594dacfe3fbf7af7c98934627e34559c85d8 xwayland-glx.patch -d0f723e6033a77faec118adc64e9d4749270724cbb2b86ca5ff796e1fbaef2d01ebcbb2904d48132b58f3ecf0781b2583744b671b17b7d51a1748f4b461932b0 link-libshadow.patch -e1a4c630e2bbf9ab47c81d48f2de98e302a0e3d5c2896d07804dc36eef1cd0a4e076bd2ed1be70c0d3b024501e5f540abf1b11548ede74c1af3c82183553a728 e50c85f4ebf559a3bac4817b41074c43d4691779.patch -a91f861588233c363a7939194d1582114ea216117e5f046b971d6571cb79445ceaaf0a1c6f66781da5b139d9ab8bd260d5dc3ff8c3279410865807561bf4fcee 0001-compiler.h-ensure-IOPortBase-is-declared-extern-on-m.patch" + +sha512sums=" +ad5edacbe8c7e2ebe6b4a690af94c7ea5ebc781d00b0e58ae2d273c78ceee2fa00b86d10479ad69da1b3233490619bae5a33db64c967c24bbfc5d5d39ddce1cb xorg-server-21.1.11.tar.xz +9ed9c731a7275a3821476eedd55f453027fdf9bcdfd8f259259a5d053c73e8b9298f048cbb009a4fb05230fb2a9ab7cc38a44d708973f09daa8570fae376236e ms-rotate.patch +" |