airlied pushed to libdrm (f20). "libdrm 2.4.60"

[notifications at fedoraproject.org]

>From 4ed3c43ddf02b3ee73f8bd0c07213c0249a7d743 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Mon, 23 Mar 2015 09:09:52 +1000
Subject: libdrm 2.4.60


diff --git a/.gitignore b/.gitignore
index 014655b..edfec8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ libdrm-20100612.tar.bz2
 /libdrm-2.4.56.tar.bz2
 /libdrm-2.4.58.tar.bz2
 /libdrm-2.4.59.tar.bz2
+/libdrm-2.4.60.tar.bz2
diff --git a/libdrm-2.4.0-no-bc.patch b/libdrm-2.4.0-no-bc.patch
index ad14e21..e3624a6 100644
--- a/libdrm-2.4.0-no-bc.patch
+++ b/libdrm-2.4.0-no-bc.patch
@@ -1,10 +1,10 @@
-diff -up libdrm-20080814/xf86drm.c.no-bc libdrm-20080814/xf86drm.c
---- libdrm-20080814/xf86drm.c.no-bc	2008-08-14 15:43:09.000000000 +1000
-+++ libdrm-20080814/xf86drm.c	2008-08-14 15:45:09.000000000 +1000
-@@ -396,11 +396,6 @@ int drmAvailable(void)
+diff -up libdrm-2.4.60/xf86drm.c.no-bc libdrm-2.4.60/xf86drm.c
+--- libdrm-2.4.60/xf86drm.c.no-bc	2015-03-23 09:04:17.272458959 +1000
++++ libdrm-2.4.60/xf86drm.c	2015-03-23 09:07:36.856720490 +1000
+@@ -482,11 +482,6 @@ int drmAvailable(void)
      int           fd;
  
-     if ((fd = drmOpenMinor(0, 1, DRM_NODE_RENDER)) < 0) {
+     if ((fd = drmOpenMinor(0, 1, DRM_NODE_PRIMARY)) < 0) {
 -#ifdef __linux__
 -	/* Try proc for backward Linux compatibility */
 -	if (!access("/proc/dri/0", R_OK))
@@ -13,7 +13,7 @@ diff -up libdrm-20080814/xf86drm.c.no-bc libdrm-20080814/xf86drm.c
  	return 0;
      }
      
-@@ -519,38 +514,6 @@ static int drmOpenByName(const char *nam
+@@ -659,38 +654,6 @@ static int drmOpenByName(const char *nam
  	}
      }
  
@@ -38,9 +38,9 @@ diff -up libdrm-20080814/xf86drm.c.no-bc libdrm-20080814/xf86drm.c
 -			for (devstring = ++pt; *pt && *pt != ' '; ++pt)
 -			    ;
 -			if (*pt) { /* Found busid */
--			    return drmOpenByBusid(++pt);
+-			    return drmOpenByBusid(++pt, type);
 -			} else { /* No busid */
--			    return drmOpenDevice(strtol(devstring, NULL, 0),i, DRM_NODE_RENDER);
+-			    return drmOpenDevice(strtol(devstring, NULL, 0),i, type);
 -			}
 -		    }
 -		}
diff --git a/libdrm.spec b/libdrm.spec
index 743bcdb..ff19f79 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -2,8 +2,8 @@
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.4.59
-Release: 4%{?dist}
+Version: 2.4.60
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -225,6 +225,9 @@ done
 %{_mandir}/man7/drm*.7*
 
 %changelog
+* Mon Mar 23 2015 Dave Airlie <airlied at redhat.com> 2.4.60-1
+- libdrm 2.4.60
+
 * Fri Jan 23 2015 Rob Clark <rclark at redhat.com> 2.4.59-4
 - No we don't actually want to install the exynos tests
 
diff --git a/sources b/sources
index f929462..6da46a0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-24213913333d72b36c16463ed92e522a  libdrm-2.4.58.tar.bz2
-d32a1d37c2546ee11fc5924abeedb23e  libdrm-2.4.59.tar.bz2
+13e35a7a1cf38b4c9c0fa0f8c9be6b93  libdrm-2.4.60.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libdrm.git/commit/?h=f20&id=4ed3c43ddf02b3ee73f8bd0c07213c0249a7d743