xorg-server: update to 1.20.1.
This commit is contained in:
maxice8
parent
673654d359
commit
8e1134f967
|
|
@ -0,0 +1,30 @@
|
|||
From ccddf2e0ac4ad122302aa761d29b1b917ef35e6b Mon Sep 17 00:00:00 2001
|
||||
From: maxice8 <thinkabit.ukim@gmail.com>
|
||||
Date: Tue, 7 Aug 2018 15:28:00 -0300
|
||||
Subject: [PATCH] add missing xwayland-config.h.meson.in from tarball
|
||||
|
||||
---
|
||||
include/xwayland-config.h.meson.in | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
create mode 100644 include/xwayland-config.h.meson.in
|
||||
|
||||
diff --git a/include/xwayland-config.h.meson.in b/include/xwayland-config.h.meson.in
|
||||
new file mode 100644
|
||||
index 0000000..0943ff5
|
||||
--- /dev/null
|
||||
+++ include/xwayland-config.h.meson.in
|
||||
@@ -0,0 +1,11 @@
|
||||
+/* xwayland-config.h.meson.in: not at all generated */
|
||||
+
|
||||
+#pragma once
|
||||
+
|
||||
+#include <dix-config.h>
|
||||
+
|
||||
+/* Build glamor support for Xwayland */
|
||||
+#mesondefine XWL_HAS_GLAMOR
|
||||
+
|
||||
+/* Build eglstream support for Xwayland */
|
||||
+#mesondefine XWL_HAS_EGLSTREAM
|
||||
--
|
||||
2.18.0
|
||||
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
From 9ed4ae9cf207360000742c09007a32ad144b52db Mon Sep 17 00:00:00 2001
|
||||
From: fafryd <dz1125.bug.tracker@gmail.com>
|
||||
Date: Fri, 25 May 2018 20:17:35 +0200
|
||||
Subject: [PATCH] fix libshadow
|
||||
|
||||
---
|
||||
hw/xfree86/dixmods/meson.build | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
|
||||
index 835d23215..6bd8029b6 100644
|
||||
--- hw/xfree86/dixmods/meson.build
|
||||
+++ hw/xfree86/dixmods/meson.build
|
||||
@@ -38,6 +38,7 @@ shared_module(
|
||||
|
||||
install: true,
|
||||
install_dir: module_dir,
|
||||
+ install_rpath: '$ORIGIN/./',
|
||||
)
|
||||
|
||||
if build_glx
|
||||
--
|
||||
2.17.0
|
||||
|
|
@ -1,31 +1,28 @@
|
|||
# Template file for 'xorg-server'
|
||||
pkgname=xorg-server
|
||||
version=1.20.0
|
||||
version=1.20.1
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="--enable-ipv6 --enable-record --enable-xorg
|
||||
--enable-xnest --enable-xephyr --enable-composite --enable-xvfb
|
||||
--disable-static --disable-config-hal --enable-config-udev
|
||||
--enable-config-udev-kms --with-xkb-path=/usr/share/X11/xkb
|
||||
--with-xkb-output=/var/lib/xkb --with-fontrootdir=/usr/share/fonts/X11
|
||||
--with-sha1=libcrypto --enable-dmx --enable-kdrive --disable-linux-acpi
|
||||
--disable-linux-apm --enable-suid-wrapper --with-shared-memory-dir=/dev/shm
|
||||
--without-systemd-daemon --enable-xcsecurity"
|
||||
hostmakedepends="flex perl pkg-config wayland-devel"
|
||||
build_style=meson
|
||||
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
|
||||
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
|
||||
-Dxkb_output_dir=/var/lib/xkb -Ddefault_font_path=/usr/share/fonts/X11
|
||||
-Ddmx=true -Dlinux_acpi=true -Dlinux_apm=false -Dsuid_wrapper=true
|
||||
-Dsystemd_logind=false -Dxcsecurity=true -Dos_vendor=Void"
|
||||
hostmakedepends="pkg-config wayland-devel xkbcomp flex gzip"
|
||||
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
|
||||
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
|
||||
libdmx-devel libdri2-devel-git libepoxy-devel libressl-devel libxkbfile-devel
|
||||
libxkbui-devel pixman-devel wayland-devel wayland-protocols
|
||||
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
|
||||
xcb-util-wm-devel"
|
||||
xcb-util-wm-devel nettle-devel"
|
||||
# See hw/xfree86/common/xf86Module.h. Only care for the major version.
|
||||
depends="xkeyboard-config"
|
||||
short_desc="The X11 server from X.org"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://xorg.freedesktop.org"
|
||||
license="MIT, BSD-3-Clause"
|
||||
homepage="https://xorg.freedesktop.org"
|
||||
distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
|
||||
checksum=9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6
|
||||
checksum=59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918
|
||||
lib32disabled=yes
|
||||
provides="xserver-abi-extension-10_1 xserver-abi-input-24_1 xserver-abi-video-24_1 xf86-video-modesetting-1_1"
|
||||
replaces="xf86-video-modesetting>=0"
|
||||
|
|
@ -35,18 +32,24 @@ conf_files="/etc/X11/Xwrapper.config"
|
|||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686*|x86_64*|aarch64*)
|
||||
# Enable glamor/dri/opengl/xwayland by default on x86.
|
||||
configure_args+=" --enable-glamor --enable-dri2 --enable-dri3 --enable-glx --enable-xwayland"
|
||||
configure_args+=" -Dglamor=true -Ddri2=true -Ddri3=true -Dglx=true -Dxwayland=true"
|
||||
makedepends+=" MesaLib-devel"
|
||||
replaces+=" glamor-egl>=0"
|
||||
subpackages+=" xorg-server-xwayland"
|
||||
;;
|
||||
*)
|
||||
# Enable dri2 on !x86 via libdri.
|
||||
configure_args+=" --disable-glx --disable-dri --enable-dri2 --enable-dri3 --disable-xwayland"
|
||||
configure_args+=" -Dglx=true -Ddri1=false -Ddri2=true -Ddri3=true -Dxwayland=false"
|
||||
makedepends+=" MesaLib-devel libdri2-devel-git"
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
*-musl)
|
||||
# required when secure_rpc is enabled and not using glibc for rpc/rpc.h
|
||||
makedepends+=" libtirpc-devel" ;;
|
||||
esac
|
||||
|
||||
|
||||
# Symbols must be resolved lazily for modules to work.
|
||||
# See https://bugs.freedesktop.org/show_bug.cgi?id=41208#c5
|
||||
|
|
@ -76,6 +79,8 @@ post_install() {
|
|||
# implementation.
|
||||
mv ${DESTDIR}/usr/lib/xorg/modules/extensions/{libglx.so,libglx-xorg.so}
|
||||
fi
|
||||
|
||||
find "${DESTDIR}"/usr/share/man -type f -iname '*[1-5].gz' -exec gunzip '{}' \;
|
||||
}
|
||||
|
||||
xorg-server-xdmx_package() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue