jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xorg-server: update to 1.11.0, bump abi_depends.

Browse source
This commit is contained in:
Juan RP 2011-08-27 05:50:11 +02:00
parent 9214c9dec1
commit b1c01bb313
3 changed files with 6 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/xorg-server/depends
View file

@ -1,2 +1,2 @@
abi_depends=">=1.10.0"
abi_depends=">=1.11.0"
api_depends="${abi_depends}"

104
srcpkgs/xorg-server/patches/autoconfig-nvidia.patch
View file

@ -1,104 +0,0 @@
From a685b5cf34532cef96fc9b05f735088ac0c0c7ad Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x@fedoraproject.org>
Date: Tue, 16 Feb 2010 11:38:17 +1000
Subject: [PATCH 08/17] autoconfig: select nouveau by default for NVIDIA GPUs
Also, don't treat DRI setup failure as an error for nouveau.
Modified by Archlinux:
Append nvidia driver to the list of prefered drivers
---
glx/glxdri.c | 7 +++++--
glx/glxdri2.c | 7 +++++--
hw/xfree86/common/xf86AutoConfig.c | 19 ++++++++++++++++++-
3 files changed, 28 insertions(+), 5 deletions(-)
--- glx/glxdri.c
+++ glx/glxdri.c
@@ -978,6 +978,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
const __DRIconfig **driConfigs;
const __DRIextension **extensions;
int i;
+ int from = X_ERROR;
if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") ||
!DRIQueryDirectRenderingCapable(pScreen, &isCapable) ||
@@ -1057,7 +1058,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (screen->driver == NULL) {
- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
+ if (!strcmp(driverName, "nouveau"))
+ from = X_INFO;
+ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n",
filename, dlerror());
goto handle_error;
}
@@ -1193,7 +1196,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
free(screen);
- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
+ LogMessage(from, "AIGLX: reverting to software rendering\n");
return NULL;
}
--- glx/glxdri2.c
+++ glx/glxdri2.c
@@ -708,6 +708,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
const __DRIextension **extensions;
const __DRIconfig **driConfigs;
int i;
+ int from = X_ERROR;
screen = calloc(1, sizeof *screen);
if (screen == NULL)
@@ -734,7 +735,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (screen->driver == NULL) {
- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
+ if (!strcmp(driverName, "nouveau"))
+ from = X_INFO;
+ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n",
filename, dlerror());
goto handle_error;
}
@@ -826,7 +829,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
free(screen);
- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
+ LogMessage(from, "AIGLX: reverting to software rendering\n");
return NULL;
}
--- hw/xfree86/common/xf86pciBus.c
+++ hw/xfree86/common/xf86pciBus.c
@@ -1123,7 +1123,25 @@ videoPtrToDriverList(struct pci_device *
break;
case 0x102b: driverList[0] = "mga"; break;
case 0x10c8: driverList[0] = "neomagic"; break;
- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
+ case 0x10de: case 0x12d2:
+ switch (dev->device_id) {
+ /* NV1 */
+ case 0x0008:
+ case 0x0009:
+ driverList[0] = "vesa";
+ break;
+ /* NV3 */
+ case 0x0018:
+ case 0x0019:
+ driverList[0] = "nv";
+ break;
+ default:
+ driverList[0] = "nouveau";
+ driverList[1] = "nv";
+ driverList[2] = "nvidia";
+ break;
+ }
+ break;
case 0x1106: driverList[0] = "openchrome"; break;
case 0x1b36: driverList[0] = "qxl"; break;
case 0x1163: driverList[0] = "rendition"; break;

9
srcpkgs/xorg-server/template
View file

@ -1,6 +1,6 @@
# Template build file for 'xorg-server'.
pkgname=xorg-server
version=1.10.4
version=1.11.0
distfiles="${XORG_SITE}/xserver/$pkgname-$version.tar.bz2"
build_style=gnu_configure
configure_args="--enable-ipv6
@ -13,7 +13,7 @@ short_desc="Modular X11 server from modular X.org"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xorg.freedesktop.org"
license="MIT/X11, BSD"
checksum=fafc16b97b9a61b62dfaa74e8d336baa0cea752ce9ed8103c4d212baa8031ca5
checksum=9feb62c2972644fadaf94eda02c1d0009ec7089abd47086e5d9dcb4625338453
long_desc="
The X11 server from the modularized source tree of X.org."
@ -37,7 +37,8 @@ Add_dependency run MesaLib
Add_dependency build pkg-config
Add_dependency build perl ">=0"
Add_dependency build flex
Add_dependency build xproto ">=7.0.18"
Add_dependency build glproto ">=1.4.14"
Add_dependency build xproto ">=7.0.22"
Add_dependency build dri2proto ">=2.1"
Add_dependency build xf86driproto
Add_dependency build randrproto
@ -80,5 +81,5 @@ post_install()
vinstall ${FILESDIR}/x11-input.rules 644 \
etc/udev/rules.d 75-x11-input.rules
vinstall ${FILESDIR}/11-quirks.conf 644 etc/X11/xorg.conf.d
rm -rf ${DESTDIR}/var/log
vinstall COPYING 644 usr/share/licenses/${pkgname}
}