xorg-server: update to xorg-server-1.11.2

Signed-off-by: Stephan Raue <[email protected]>
Nachtzuster · Nov 20, 2011 · 2034b1d · 2034b1d
1 parent c1505f3
commit 2034b1d
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 187 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -8,6 +8,7 @@ Package updates:
   - update Python to Python-2.7.2
   - update gcc to gcc-4.6.2
   - update openssl to openssl-1.0.0e
+  - update xorg-server to xorg-server-1.11
 
 Added functions:
   - PXE netboot support

diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xorg-server"
-PKG_VERSION="1.10.4"
+PKG_VERSION="1.11.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.4-13_nouveau.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.4-13_nouveau.patch
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.4-14_nvidia_fglrx_autodetect.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.10.4-14_nvidia_fglrx_autodetect.patch
diff --git a/...es/xorg-server-1.10.4-05_pkg_config.patch → ...es/xorg-server-1.11.2-05_pkg_config.patch b/...es/xorg-server-1.10.4-05_pkg_config.patch → ...es/xorg-server-1.11.2-05_pkg_config.patch
diff --git a/...he_xkbcomp_output_for_fast_start_up.patch → ...he_xkbcomp_output_for_fast_start_up.patch b/...he_xkbcomp_output_for_fast_start_up.patch → ...he_xkbcomp_output_for_fast_start_up.patch
diff --git a/...py_heuristic_first_for_initial_mode.patch → ...py_heuristic_first_for_initial_mode.patch b/...py_heuristic_first_for_initial_mode.patch → ...py_heuristic_first_for_initial_mode.patch
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.11.2-13-detect_nouveau.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.11.2-13-detect_nouveau.patch
@@ -0,0 +1,12 @@
+diff -Naur xorg-server-1.11.0-old/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.0-new/hw/xfree86/common/xf86pciBus.c
+--- xorg-server-1.11.0-old/hw/xfree86/common/xf86pciBus.c	2011-08-27 09:46:27.000000000 -0700
++++ xorg-server-1.11.0-new/hw/xfree86/common/xf86pciBus.c	2011-08-27 09:47:09.000000000 -0700
+@@ -1123,7 +1123,7 @@
+ 	    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:   driverList[0] = "nouveau";	break;
+ 	case 0x1106:		    driverList[0] = "openchrome"; break;
+         case 0x1b36:		    driverList[0] = "qxl"; break;
+ 	case 0x1163:		    driverList[0] = "rendition"; break;
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.11.2-14-detect_radeon.patch b/packages/x11/xserver/xorg-server/patches/xorg-server-1.11.2-14-detect_radeon.patch
@@ -0,0 +1,12 @@
+diff -Naur xorg-server-1.11.0-old/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.0-new/hw/xfree86/common/xf86pciBus.c
+--- xorg-server-1.11.0-old/hw/xfree86/common/xf86pciBus.c	2011-08-27 09:47:09.000000000 -0700
++++ xorg-server-1.11.0-new/hw/xfree86/common/xf86pciBus.c	2011-08-27 09:47:33.000000000 -0700
+@@ -1107,7 +1107,7 @@
+ 	case 0x1142:		    driverList[0] = "apm"; break;
+ 	case 0xedd8:		    driverList[0] = "ark"; break;
+ 	case 0x1a03:		    driverList[0] = "ast"; break;
+-	case 0x1002:		    driverList[0] = "ati"; break;
++	case 0x1002:		    driverList[0] = "radeon"; break;
+ 	case 0x102c:		    driverList[0] = "chips"; break;
+ 	case 0x1013:		    driverList[0] = "cirrus"; break;
+ 	case 0x3d3d:		    driverList[0] = "glint"; break;
diff --git a/...-1.10.4-20_extra_modelines_fromxorg.patch → ...-1.11.2-20_extra_modelines_fromxorg.patch b/...-1.10.4-20_extra_modelines_fromxorg.patch → ...-1.11.2-20_extra_modelines_fromxorg.patch
diff --git a/...g-server-1.10.4-21_x11_nonroot-vesa.patch → ...g-server-1.11.2-21_x11_nonroot-vesa.patch b/...g-server-1.10.4-21_x11_nonroot-vesa.patch → ...g-server-1.11.2-21_x11_nonroot-vesa.patch
diff --git a/...server-1.10.4-22_do_not_zap_xserver.patch → ...server-1.11.2-22_do_not_zap_xserver.patch b/...server-1.10.4-22_do_not_zap_xserver.patch → ...server-1.11.2-22_do_not_zap_xserver.patch
diff --git a/...rver-1.10.4-25_less_acpi_brokenness.patch → ...rver-1.11.2-25_less_acpi_brokenness.patch b/...rver-1.10.4-25_less_acpi_brokenness.patch → ...rver-1.11.2-25_less_acpi_brokenness.patch
diff --git a/packages/x11/xserver/xorg-server/scripts/xorg_start b/packages/x11/xserver/xorg-server/scripts/xorg_start
@@ -72,6 +72,8 @@ if [ "$RUNLEVEL" = openelec ]; then
   chown root:root /tmp/.ICE-unix
 
   if [ "${xorg_driver}" = "nvidia" ]; then
+    export __GL_SHADER_DISK_CACHE=1
+    export __GL_SHADER_DISK_CACHE_PATH="/tmp/GLCache"
     ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
     ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
     XORG_ARGS="$XORG_ARGS -ignoreABI"