rpms/libdrm/devel .cvsignore, 1.14, 1.15 libdrm-2.4.0-no-bc.patch, 1.2, 1.3 libdrm.spec, 1.47, 1.48 make-git-snapshot.sh, 1.2, 1.3 sources, 1.14, 1.15

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4702

Modified Files:
	.cvsignore libdrm-2.4.0-no-bc.patch libdrm.spec 
	make-git-snapshot.sh sources 
Log Message:
* Thu Aug 14 2008 Dave Airlie <airlied at 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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	11 Aug 2008 19:31:51 -0000	1.14
+++ .cvsignore	14 Aug 2008 05:51:06 -0000	1.15
@@ -1 +1 @@
-libdrm-20080811.tar.bz2
+libdrm-20080814.tar.bz2

libdrm-2.4.0-no-bc.patch:

Index: libdrm-2.4.0-no-bc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm-2.4.0-no-bc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libdrm-2.4.0-no-bc.patch	11 Aug 2008 19:31:51 -0000	1.2
+++ libdrm-2.4.0-no-bc.patch	14 Aug 2008 05:51:06 -0000	1.3
@@ -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 @@
  	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 @@
 -			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);
 -			}
 -		    }
 -		}


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- libdrm.spec	11 Aug 2008 19:31:51 -0000	1.47
+++ libdrm.spec	14 Aug 2008 05:51:06 -0000	1.48
@@ -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 @@
 %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 at 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 at redhat.com> 2.4.0-0.18
 - Today's git snap.
 


Index: make-git-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/make-git-snapshot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- make-git-snapshot.sh	4 Mar 2008 01:42:54 -0000	1.2
+++ make-git-snapshot.sh	14 Aug 2008 05:51:06 -0000	1.3
@@ -16,6 +16,10 @@
 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	11 Aug 2008 19:31:51 -0000	1.14
+++ sources	14 Aug 2008 05:51:06 -0000	1.15
@@ -1 +1 @@
-43ebfba0a885e8d8ae1286ba0149d3fa  libdrm-20080811.tar.bz2
+2af5325c8ae923a7cbaea3671bc7b969  libdrm-20080814.tar.bz2