From cea73d97417fb7caa2e8c8b70f1ee4d64ea7278a Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Thu, 14 Aug 2008 05:51:06 +0000
Subject: [PATCH] - add back modesetting support - this is a snapshot from
 modesetting-gem - any bugs are in the other packages that fail to build

---
 .cvsignore               |  2 +-
 libdrm-2.4.0-no-bc.patch | 14 +++++++-------
 libdrm.spec              |  9 +++++++--
 make-git-snapshot.sh     |  4 ++++
 sources                  |  2 +-
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 0156553..804a33e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libdrm-20080811.tar.bz2
+libdrm-20080814.tar.bz2
diff --git a/libdrm-2.4.0-no-bc.patch b/libdrm-2.4.0-no-bc.patch
index 709c5f3..c09acc5 100644
--- a/libdrm-2.4.0-no-bc.patch
+++ b/libdrm-2.4.0-no-bc.patch
@@ -1,10 +1,10 @@
-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)
+diff -up libdrm-20080814/libdrm/xf86drm.c.no-bc libdrm-20080814/libdrm/xf86drm.c
+--- libdrm-20080814/libdrm/xf86drm.c.no-bc	2008-08-14 15:43:09.000000000 +1000
++++ libdrm-20080814/libdrm/xf86drm.c	2008-08-14 15:45:09.000000000 +1000
+@@ -396,11 +396,6 @@ int drmAvailable(void)
      int           fd;
  
-     if ((fd = drmOpenMinor(0, 1)) < 0) {
+     if ((fd = drmOpenMinor(0, 1, DRM_NODE_RENDER)) < 0) {
 -#ifdef __linux__
 -	/* Try proc for backward Linux compatibility */
 -	if (!access("/proc/dri/0", R_OK))
@@ -13,7 +13,7 @@ diff -up libdrm-20080811/libdrm/xf86drm.c.jx libdrm-20080811/libdrm/xf86drm.c
  	return 0;
      }
      
-@@ -516,38 +511,6 @@ static int drmOpenByName(const char *nam
+@@ -519,38 +514,6 @@ static int drmOpenByName(const char *nam
  	}
      }
  
@@ -40,7 +40,7 @@ diff -up libdrm-20080811/libdrm/xf86drm.c.jx libdrm-20080811/libdrm/xf86drm.c
 -			if (*pt) { /* Found busid */
 -			    return drmOpenByBusid(++pt);
 -			} else { /* No busid */
--			    return drmOpenDevice(strtol(devstring, NULL, 0),i);
+-			    return drmOpenDevice(strtol(devstring, NULL, 0),i, DRM_NODE_RENDER);
 -			}
 -		    }
 -		}
diff --git a/libdrm.spec b/libdrm.spec
index ea63116..9449623 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -1,9 +1,9 @@
-%define gitdate 20080811
+%define gitdate 20080814
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.0
-Release: 0.18%{?dist}
+Release: 0.19%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -84,12 +84,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 # FIXME should be in drm/ too
 %{_includedir}/xf86drm.h
+%{_includedir}/xf86drmMode.h
 %{_includedir}/dri_bufmgr.h
 %{_includedir}/intel_bufmgr.h
 %{_libdir}/libdrm.so
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Thu Aug 14 2008 Dave Airlie <airlied@redhat.com> 2.4.0-0.19
+- add back modesetting support - this is a snapshot from modesetting-gem
+- any bugs are in the other packages that fail to build
+
 * Mon Aug 11 2008 Adam Jackson <ajax@redhat.com> 2.4.0-0.18
 - Today's git snap.
 
diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh
index 888855e..0e07099 100755
--- a/make-git-snapshot.sh
+++ b/make-git-snapshot.sh
@@ -16,6 +16,10 @@ rm -rf $DIRNAME
 git clone ${REF:+--reference $REF} \
 	git://git.freedesktop.org/git/mesa/drm $DIRNAME
 
+cd $DIRNAME
+git checkout -f origin/modesetting-gem
+cd -
+
 GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
 	| bzip2 > $DIRNAME.tar.bz2
 
diff --git a/sources b/sources
index a73c7a1..04a9174 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43ebfba0a885e8d8ae1286ba0149d3fa  libdrm-20080811.tar.bz2
+2af5325c8ae923a7cbaea3671bc7b969  libdrm-20080814.tar.bz2