rpms/libdrm/devel import.log, NONE, 1.1 .cvsignore, 1.13, 1.14 libdrm-2.4.0-no-bc.patch, 1.1, 1.2 libdrm.spec, 1.46, 1.47 sources, 1.13, 1.14

Adam Jackson (ajax) fedora-extras-commits at redhat.com
Mon Aug 11 19:32:21 UTC 2008


Author: ajax

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

Modified Files:
	.cvsignore libdrm-2.4.0-no-bc.patch libdrm.spec sources 
Added Files:
	import.log 
Log Message:
Today's git snap.



--- NEW FILE import.log ---
libdrm-2_4_0-0_18_fc10:HEAD:libdrm-2.4.0-0.18.fc10.src.rpm:1218482980


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	1 Aug 2008 06:53:20 -0000	1.13
+++ .cvsignore	11 Aug 2008 19:31:51 -0000	1.14
@@ -1 +1 @@
-libdrm-20080801.tar.bz2
+libdrm-20080811.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdrm-2.4.0-no-bc.patch	12 Jun 2008 04:01:31 -0000	1.1
+++ libdrm-2.4.0-no-bc.patch	11 Aug 2008 19:31:51 -0000	1.2
@@ -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 @@
  	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 @@
 -			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);
 -			}
 -		    }
 -		}


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- libdrm.spec	10 Aug 2008 08:47:25 -0000	1.46
+++ libdrm.spec	11 Aug 2008 19:31:51 -0000	1.47
@@ -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 @@
 %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 at redhat.com> 2.4.0-0.18
+- Today's git snap.
+
 * Sun Aug 10 2008 Dave Airlie <airlied at redhat.com> 2.4.0-0.17
 - attempt to fix race with udev by just waiting for udev
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	1 Aug 2008 06:53:20 -0000	1.13
+++ sources	11 Aug 2008 19:31:51 -0000	1.14
@@ -1 +1 @@
-61b25117e4e3d68395b0c9529244c909  libdrm-20080801.tar.bz2
+43ebfba0a885e8d8ae1286ba0149d3fa  libdrm-20080811.tar.bz2




More information about the fedora-extras-commits mailing list