From 0f7039d7f0ff150ec283b1b7de0b680be7447da3 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Mon, 11 Aug 2008 19:31:51 +0000
Subject: [PATCH] Today's git snap.

---
 .cvsignore               |  2 +-
 import.log               |  1 +
 libdrm-2.4.0-no-bc.patch | 14 +++++++-------
 libdrm.spec              |  9 +++++----
 sources                  |  2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 import.log

diff --git a/.cvsignore b/.cvsignore
index 6234857..0156553 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libdrm-20080801.tar.bz2
+libdrm-20080811.tar.bz2
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..4647892
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+libdrm-2_4_0-0_18_fc10:HEAD:libdrm-2.4.0-0.18.fc10.src.rpm:1218482980
diff --git a/libdrm-2.4.0-no-bc.patch b/libdrm-2.4.0-no-bc.patch
index 9fa43bd..709c5f3 100644
--- a/libdrm-2.4.0-no-bc.patch
+++ b/libdrm-2.4.0-no-bc.patch
@@ -1,10 +1,10 @@
-diff -up libdrm-20080303/libdrm/xf86drm.c.jx libdrm-20080303/libdrm/xf86drm.c
---- libdrm-20080303/libdrm/xf86drm.c.jx	2008-04-29 10:07:13.000000000 -0400
-+++ libdrm-20080303/libdrm/xf86drm.c	2008-04-29 10:07:25.000000000 -0400
-@@ -383,11 +383,6 @@ int drmAvailable(void)
+diff -up libdrm-20080811/libdrm/xf86drm.c.jx libdrm-20080811/libdrm/xf86drm.c
+--- libdrm-20080811/libdrm/xf86drm.c.jx	2008-08-11 13:48:47.000000000 -0400
++++ libdrm-20080811/libdrm/xf86drm.c	2008-08-11 15:12:02.000000000 -0400
+@@ -393,11 +393,6 @@ int drmAvailable(void)
      int           fd;
  
-     if ((fd = drmOpenMinor(0, 1, DRM_NODE_RENDER)) < 0) {
+     if ((fd = drmOpenMinor(0, 1)) < 0) {
 -#ifdef __linux__
 -	/* Try proc for backward Linux compatibility */
 -	if (!access("/proc/dri/0", R_OK))
@@ -13,7 +13,7 @@ diff -up libdrm-20080303/libdrm/xf86drm.c.jx libdrm-20080303/libdrm/xf86drm.c
  	return 0;
      }
      
-@@ -506,38 +501,6 @@ static int drmOpenByName(const char *nam
+@@ -516,38 +511,6 @@ static int drmOpenByName(const char *nam
  	}
      }
  
@@ -40,7 +40,7 @@ diff -up libdrm-20080303/libdrm/xf86drm.c.jx libdrm-20080303/libdrm/xf86drm.c
 -			if (*pt) { /* Found busid */
 -			    return drmOpenByBusid(++pt);
 -			} else { /* No busid */
--			    return drmOpenDevice(strtol(devstring, NULL, 0),i, DRM_NODE_RENDER);
+-			    return drmOpenDevice(strtol(devstring, NULL, 0),i);
 -			}
 -		    }
 -		}
diff --git a/libdrm.spec b/libdrm.spec
index c55b269..ea63116 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -1,9 +1,9 @@
-%define gitdate 20080801
+%define gitdate 20080811
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.0
-Release: 0.17%{?dist}
+Release: 0.18%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -84,14 +84,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 # FIXME should be in drm/ too
 %{_includedir}/xf86drm.h
-%{_includedir}/xf86drmMode.h
-%{_includedir}/xf86mm.h
 %{_includedir}/dri_bufmgr.h
 %{_includedir}/intel_bufmgr.h
 %{_libdir}/libdrm.so
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Mon Aug 11 2008 Adam Jackson <ajax@redhat.com> 2.4.0-0.18
+- Today's git snap.
+
 * Sun Aug 10 2008 Dave Airlie <airlied@redhat.com> 2.4.0-0.17
 - attempt to fix race with udev by just waiting for udev
 
diff --git a/sources b/sources
index 5973ad6..a73c7a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61b25117e4e3d68395b0c9529244c909  libdrm-20080801.tar.bz2
+43ebfba0a885e8d8ae1286ba0149d3fa  libdrm-20080811.tar.bz2