xorg-server 1.11.1.901-1 màj port

6 files changed, 56 insertions, 34 deletions

diff --git a/extra/xorg-server/.footprint.i686 b/extra/xorg-server/.footprint.i686
index 2306bb4e8..d5f636f75 100644
--- a/extra/xorg-server/.footprint.i686
+++ b/extra/xorg-server/.footprint.i686
@@ -29,11 +29,10 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/IBM.h
 -rw-r--r--	root/root	usr/include/xorg/TI.h
 -rw-r--r--	root/root	usr/include/xorg/XIstubs.h
--rw-r--r--	root/root	usr/include/xorg/bstore.h
--rw-r--r--	root/root	usr/include/xorg/bstorestr.h
+-rw-r--r--	root/root	usr/include/xorg/Xprintf.h
 -rw-r--r--	root/root	usr/include/xorg/bt829.h
 -rw-r--r--	root/root	usr/include/xorg/callback.h
--rw-r--r--	root/root	usr/include/xorg/cfb8_16.h
+-rw-r--r--	root/root	usr/include/xorg/client.h
 -rw-r--r--	root/root	usr/include/xorg/closestr.h
 -rw-r--r--	root/root	usr/include/xorg/closure.h
 -rw-r--r--	root/root	usr/include/xorg/colormap.h
@@ -97,6 +96,8 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/miscstruct.h
 -rw-r--r--	root/root	usr/include/xorg/mispans.h
 -rw-r--r--	root/root	usr/include/xorg/mistruct.h
+-rw-r--r--	root/root	usr/include/xorg/misync.h
+-rw-r--r--	root/root	usr/include/xorg/misyncstr.h
 -rw-r--r--	root/root	usr/include/xorg/miwideline.h
 -rw-r--r--	root/root	usr/include/xorg/mizerarc.h
 -rw-r--r--	root/root	usr/include/xorg/msp3430.h
@@ -116,7 +117,6 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/region.h
 -rw-r--r--	root/root	usr/include/xorg/regionstr.h
 -rw-r--r--	root/root	usr/include/xorg/registry.h
--rw-r--r--	root/root	usr/include/xorg/renderedge.h
 -rw-r--r--	root/root	usr/include/xorg/resource.h
 -rw-r--r--	root/root	usr/include/xorg/rgb.h
 -rw-r--r--	root/root	usr/include/xorg/rrtransform.h
@@ -131,6 +131,7 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/site.h
 -rw-r--r--	root/root	usr/include/xorg/swaprep.h
 -rw-r--r--	root/root	usr/include/xorg/swapreq.h
+-rw-r--r--	root/root	usr/include/xorg/syncsdk.h
 -rw-r--r--	root/root	usr/include/xorg/tda8425.h
 -rw-r--r--	root/root	usr/include/xorg/tda9850.h
 -rw-r--r--	root/root	usr/include/xorg/tda9885.h
@@ -144,7 +145,6 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/window.h
 -rw-r--r--	root/root	usr/include/xorg/windowstr.h
 -rw-r--r--	root/root	usr/include/xorg/xaa.h
--rw-r--r--	root/root	usr/include/xorg/xaaWrapper.h
 -rw-r--r--	root/root	usr/include/xorg/xaalocal.h
 -rw-r--r--	root/root	usr/include/xorg/xaarop.h
 -rw-r--r--	root/root	usr/include/xorg/xace.h
@@ -225,8 +225,6 @@ drwxr-xr-x	root/root	usr/lib/X11/modules/extensions/
 -rwxr-xr-x	root/root	usr/lib/X11/modules/libwfb.so
 -rwxr-xr-x	root/root	usr/lib/X11/modules/libxaa.la
 -rwxr-xr-x	root/root	usr/lib/X11/modules/libxaa.so
--rwxr-xr-x	root/root	usr/lib/X11/modules/libxf8_16bpp.la
--rwxr-xr-x	root/root	usr/lib/X11/modules/libxf8_16bpp.so
 drwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/
 -rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/bt829_drv.la
 -rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/bt829_drv.so
@@ -266,7 +264,4 @@ drwxr-xr-x	root/root	usr/share/man/man4/
 -rw-r--r--	root/root	usr/share/man/man4/fbdevhw.4.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/xorg.conf.5.gz
-drwxr-xr-x	root/root	var/
-drwxr-xr-x	root/root	var/lib/
-drwxr-xr-x	root/root	var/lib/xkb/
--rw-r--r--	root/root	var/lib/xkb/README.compiled
+-rw-r--r--	root/root	usr/share/man/man5/xorg.conf.d.5.gz
diff --git a/extra/xorg-server/.footprint.x86_64 b/extra/xorg-server/.footprint.x86_64
index 2306bb4e8..d5f636f75 100644
--- a/extra/xorg-server/.footprint.x86_64
+++ b/extra/xorg-server/.footprint.x86_64
@@ -29,11 +29,10 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/IBM.h
 -rw-r--r--	root/root	usr/include/xorg/TI.h
 -rw-r--r--	root/root	usr/include/xorg/XIstubs.h
--rw-r--r--	root/root	usr/include/xorg/bstore.h
--rw-r--r--	root/root	usr/include/xorg/bstorestr.h
+-rw-r--r--	root/root	usr/include/xorg/Xprintf.h
 -rw-r--r--	root/root	usr/include/xorg/bt829.h
 -rw-r--r--	root/root	usr/include/xorg/callback.h
--rw-r--r--	root/root	usr/include/xorg/cfb8_16.h
+-rw-r--r--	root/root	usr/include/xorg/client.h
 -rw-r--r--	root/root	usr/include/xorg/closestr.h
 -rw-r--r--	root/root	usr/include/xorg/closure.h
 -rw-r--r--	root/root	usr/include/xorg/colormap.h
@@ -97,6 +96,8 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/miscstruct.h
 -rw-r--r--	root/root	usr/include/xorg/mispans.h
 -rw-r--r--	root/root	usr/include/xorg/mistruct.h
+-rw-r--r--	root/root	usr/include/xorg/misync.h
+-rw-r--r--	root/root	usr/include/xorg/misyncstr.h
 -rw-r--r--	root/root	usr/include/xorg/miwideline.h
 -rw-r--r--	root/root	usr/include/xorg/mizerarc.h
 -rw-r--r--	root/root	usr/include/xorg/msp3430.h
@@ -116,7 +117,6 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/region.h
 -rw-r--r--	root/root	usr/include/xorg/regionstr.h
 -rw-r--r--	root/root	usr/include/xorg/registry.h
--rw-r--r--	root/root	usr/include/xorg/renderedge.h
 -rw-r--r--	root/root	usr/include/xorg/resource.h
 -rw-r--r--	root/root	usr/include/xorg/rgb.h
 -rw-r--r--	root/root	usr/include/xorg/rrtransform.h
@@ -131,6 +131,7 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/site.h
 -rw-r--r--	root/root	usr/include/xorg/swaprep.h
 -rw-r--r--	root/root	usr/include/xorg/swapreq.h
+-rw-r--r--	root/root	usr/include/xorg/syncsdk.h
 -rw-r--r--	root/root	usr/include/xorg/tda8425.h
 -rw-r--r--	root/root	usr/include/xorg/tda9850.h
 -rw-r--r--	root/root	usr/include/xorg/tda9885.h
@@ -144,7 +145,6 @@ drwxr-xr-x	root/root	usr/include/xorg/
 -rw-r--r--	root/root	usr/include/xorg/window.h
 -rw-r--r--	root/root	usr/include/xorg/windowstr.h
 -rw-r--r--	root/root	usr/include/xorg/xaa.h
--rw-r--r--	root/root	usr/include/xorg/xaaWrapper.h
 -rw-r--r--	root/root	usr/include/xorg/xaalocal.h
 -rw-r--r--	root/root	usr/include/xorg/xaarop.h
 -rw-r--r--	root/root	usr/include/xorg/xace.h
@@ -225,8 +225,6 @@ drwxr-xr-x	root/root	usr/lib/X11/modules/extensions/
 -rwxr-xr-x	root/root	usr/lib/X11/modules/libwfb.so
 -rwxr-xr-x	root/root	usr/lib/X11/modules/libxaa.la
 -rwxr-xr-x	root/root	usr/lib/X11/modules/libxaa.so
--rwxr-xr-x	root/root	usr/lib/X11/modules/libxf8_16bpp.la
--rwxr-xr-x	root/root	usr/lib/X11/modules/libxf8_16bpp.so
 drwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/
 -rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/bt829_drv.la
 -rwxr-xr-x	root/root	usr/lib/X11/modules/multimedia/bt829_drv.so
@@ -266,7 +264,4 @@ drwxr-xr-x	root/root	usr/share/man/man4/
 -rw-r--r--	root/root	usr/share/man/man4/fbdevhw.4.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/xorg.conf.5.gz
-drwxr-xr-x	root/root	var/
-drwxr-xr-x	root/root	var/lib/
-drwxr-xr-x	root/root	var/lib/xkb/
--rw-r--r--	root/root	var/lib/xkb/README.compiled
+-rw-r--r--	root/root	usr/share/man/man5/xorg.conf.d.5.gz
diff --git a/extra/xorg-server/.md5sum.i686 b/extra/xorg-server/.md5sum.i686
index 0a136bfec..389a90a69 100644
--- a/extra/xorg-server/.md5sum.i686
+++ b/extra/xorg-server/.md5sum.i686
@@ -1,2 +1,3 @@
 81ebef7087bde56dc70477884189054b  15-quirks.conf
-662566559f4f27638658b50632ce98de  xorg-server-1.9.5.tar.bz2
+6c7e87d63ac4b535e19a80c89d0cf091  autoconfig-nvidia.patch
+457b99a6f6769bcb0ae1b04945466d8f  xorg-server-1.11.1.901.tar.bz2
diff --git a/extra/xorg-server/.md5sum.x86_64 b/extra/xorg-server/.md5sum.x86_64
index 0a136bfec..389a90a69 100644
--- a/extra/xorg-server/.md5sum.x86_64
+++ b/extra/xorg-server/.md5sum.x86_64
@@ -1,2 +1,3 @@
 81ebef7087bde56dc70477884189054b  15-quirks.conf
-662566559f4f27638658b50632ce98de  xorg-server-1.9.5.tar.bz2
+6c7e87d63ac4b535e19a80c89d0cf091  autoconfig-nvidia.patch
+457b99a6f6769bcb0ae1b04945466d8f  xorg-server-1.11.1.901.tar.bz2
diff --git a/extra/xorg-server/Pkgfile b/extra/xorg-server/Pkgfile
index fc34f133e..73303f0dd 100755
--- a/extra/xorg-server/Pkgfile
+++ b/extra/xorg-server/Pkgfile
@@ -6,24 +6,25 @@
 # Run on: mesa3d,xorg-bdftopcf,xorg-mkfontdir,xorg-mkfontscale,xorg-libxkbui,xorg-libxtst,xorg-libdmx,xorg-libxxf86misc,xorg-libxaw,xorg-libxvmc,xorg-libxi,xorg-libxres,xorg-libxcomposite,xorg-libxinerama,xorg-libxrandr,xorg-libxft,xorg-libxcursor,xorg-libxxf86dga,xorg-libpixman,xorg-libpciaccess,xorg-libxscrnsaver
 
 name=xorg-server
-version=1.9.5
-release=2
-source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.bz2\
+version=1.11.1.901
+release=1
+source=(http://xorg.freedesktop.org/releases/individual/xserver/$name-$version.tar.bz2
+	autoconfig-nvidia.patch
 	15-quirks.conf)
 
 build() {
 	cd $name-$version
-
+	patch -p1 < ../autoconfig-nvidia.patch
 	./configure $XORG_CONFIG \
-    --with-module-dir=$XORG_PREFIX/lib/X11/modules \
-    --with-xkb-output=/var/lib/xkb \
-    --enable-install-setuid \
-    --disable-config-hal --with-fontrootdir=/usr/share/fonts
+		--with-module-dir=$XORG_PREFIX/lib/X11/modules \
+		--with-xkb-output=/var/lib/xkb \
+		--with-fontrootdir=/usr/share/fonts \
+		--enable-install-setuid \
+		--disable-config-hal
 	sed -i 's|xorgconfddir = $(datadir)|xorgconfddir = /etc|' config/Makefile
 	make
 	make DESTDIR=$PKG install
-	rmdir $PKG/var/log
-	rm -r $PKG/usr/share/doc
 	mv $PKG/$XORG_PREFIX/lib/X11/modules/extensions/libglx.{so,xorg}
 	install -m644 ../15-quirks.conf $PKG/etc/X11/xorg.conf.d/15-quirks.conf
+	rm -rf $PKG/var
 }
diff --git a/extra/xorg-server/autoconfig-nvidia.patch b/extra/xorg-server/autoconfig-nvidia.patch
new file mode 100644
index 000000000..baa2eb601
--- /dev/null
+++ b/extra/xorg-server/autoconfig-nvidia.patch
@@ -0,0 +1,29 @@
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/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;