From 950705f68706bf01aa9b925741da918b29f10a07 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 31 Oct 2016 09:08:50 +0100 Subject: [PATCH] xorg-server: remove nvidias configuration from xorg the nvidia package itself ships this file. The legacy nvidia304 packages does not, so we move this file to nvidia304 in the next commit. addresses #5081. --- srcpkgs/xorg-server/files/30-nvidia-drm-outputclass.conf | 6 ------ srcpkgs/xorg-server/template | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 srcpkgs/xorg-server/files/30-nvidia-drm-outputclass.conf diff --git a/srcpkgs/xorg-server/files/30-nvidia-drm-outputclass.conf b/srcpkgs/xorg-server/files/30-nvidia-drm-outputclass.conf deleted file mode 100644 index 40c1e08b5f4..00000000000 --- a/srcpkgs/xorg-server/files/30-nvidia-drm-outputclass.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "OutputClass" - Identifier "nvidia" - MatchDriver "nvidia-drm" - Driver "nvidia" -EndSection - diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index bea2f51071f..4b7c9d1589f 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -1,7 +1,7 @@ # Template build file for 'xorg-server'. pkgname=xorg-server version=1.18.4 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-ipv6 --enable-record --enable-xorg --enable-xnest --enable-xephyr --enable-composite --enable-xvfb @@ -71,7 +71,6 @@ post_install() { *-musl) vinstall ${FILESDIR}/20-modules.conf 644 usr/share/X11/xorg.conf.d;; esac - vinstall ${FILESDIR}/30-nvidia-drm-outputclass.conf 644 usr/share/X11/xorg.conf.d vinstall ${FILESDIR}/Xwrapper.config 644 etc/X11 vlicense COPYING