From 095949bdc8fad821812fef5a75e652aa23712088 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 14 Dec 2013 23:17:15 +0100
Subject: xorg server: maintenance update 1.14.4 -> .5

Also drop dri-path patch which wasn't needed for several months,
and now it no longer applied. I tested that drivers are still found.
---
 pkgs/servers/x11/xorg/default.nix               |  6 +++---
 pkgs/servers/x11/xorg/overrides.nix             |  5 +----
 pkgs/servers/x11/xorg/tarballs-7.7.list         |  2 +-
 pkgs/servers/x11/xorg/xorgserver-dri-path.patch | 19 -------------------
 4 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/servers/x11/xorg/xorgserver-dri-path.patch

(limited to 'pkgs/servers')

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3b347504a723..72b0c4279100 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1900,11 +1900,11 @@ let
   })) // {inherit ;};
 
   xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
-    name = "xorg-server-1.14.4";
+    name = "xorg-server-1.14.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.14.4.tar.bz2;
-      sha256 = "1hsxyqgrw3hrgdl0sw8n4hbhjlindna0z8w4k1anwpw4zfmcz330";
+      url = mirror://xorg/individual/xserver/xorg-server-1.14.5.tar.bz2;
+      sha256 = "1lb1fkscy7nwnabfj0d2shvxga16i047g11if18plj0n2jzhc3wd";
     };
     buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
   })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index d70bb54c7047..08dc5a92b7d0 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -192,10 +192,7 @@ in
       "--with-default-font-path= "  # there were only paths containing "${prefix}",
                                     # and there are no fonts in this package anyway
     ];
-    patches =
-      [ ./xorgserver-dri-path.patch
-        ./xorgserver-xkbcomp-path.patch
-      ];
+    patches = [ ./xorgserver-xkbcomp-path.patch ];
     buildInputs = attrs.buildInputs ++ [ xtrans ];
     propagatedBuildInputs =
       [ args.zlib args.udev args.mesa args.dbus.libs
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index d76afd9fbe2c..7b56dd541fab 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -164,7 +164,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xlsclients-1.1.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xmodmap-1.0.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.14.4.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.14.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xprop-1.2.1.tar.bz2
diff --git a/pkgs/servers/x11/xorg/xorgserver-dri-path.patch b/pkgs/servers/x11/xorg/xorgserver-dri-path.patch
deleted file mode 100644
index 3a5f061eb9a1..000000000000
--- a/pkgs/servers/x11/xorg/xorgserver-dri-path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur xorg-server-1.12.2-orig/glx/glxdricommon.c xorg-server-1.12.2/glx/glxdricommon.c
---- xorg-server-1.12.2-orig/glx/glxdricommon.c	2012-05-17 13:09:02.000000000 -0400
-+++ xorg-server-1.12.2/glx/glxdricommon.c	2012-07-14 14:57:37.972791909 -0400
-@@ -219,10 +219,14 @@
-     int i;
-     void *driver;
-     char filename[PATH_MAX];
-+    char *real_dri_driver_path;
-     const __DRIextension **extensions;
- 
-+    real_dri_driver_path = getenv("XORG_DRI_DRIVER_PATH");
-+    if (!real_dri_driver_path) real_dri_driver_path = dri_driver_path;
-+
-     snprintf(filename, sizeof filename, "%s/%s_dri.so",
--             dri_driver_path, driverName);
-+             real_dri_driver_path, driverName);
- 
-     driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
-     if (driver == NULL) {
-- 
cgit 1.4.1