rpms/libdrm/devel libdrm-modeset-fix.patch, NONE, 1.1 libdrm.spec, 1.40, 1.41

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	libdrm.spec 
Added Files:
	libdrm-modeset-fix.patch 
Log Message:
* Wed Jun 18 2008 Dave Airlie <airlied at redhat.com> 2.4.0-0.13
- add modeset ctl interface fix


libdrm-modeset-fix.patch:

--- NEW FILE libdrm-modeset-fix.patch ---
diff -up libdrm-20080303/shared-core/drm.h.da libdrm-20080303/shared-core/drm.h
--- libdrm-20080303/shared-core/drm.h.da	2008-06-18 09:18:44.000000000 +1000
+++ libdrm-20080303/shared-core/drm.h	2008-06-18 09:19:24.000000000 +1000
@@ -555,10 +555,8 @@ union drm_wait_vblank {
 	struct drm_wait_vblank_reply reply;
 };
 
-enum drm_modeset_ctl_cmd {
-	_DRM_PRE_MODESET = 1,
-	_DRM_POST_MODESET = 2,
-};
+#define _DRM_PRE_MODESET 1
+#define _DRM_POST_MODESET 2
 
 /**
  * DRM_IOCTL_MODESET_CTL ioctl argument type
@@ -566,8 +564,8 @@ enum drm_modeset_ctl_cmd {
  * \sa drmModesetCtl().
  */
 struct drm_modeset_ctl {
-	unsigned long arg;
-	enum drm_modeset_ctl_cmd cmd;
+	uint32_t crtc;
+	uint32_t cmd;
 };
 
 /**


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- libdrm.spec	12 Jun 2008 04:01:31 -0000	1.40
+++ libdrm.spec	27 Jun 2008 18:17:28 -0000	1.41
@@ -3,7 +3,7 @@
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
 Version: 2.4.0
-Release: 0.12%{?dist}
+Release: 0.13%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
@@ -24,6 +24,7 @@
 Patch3: libdrm-make-dri-perms-okay.patch
 Patch4: libdrm-2.4.0-no-bc.patch
 Patch5: libdrm-radeon-r500.patch
+Patch6: libdrm-modeset-fix.patch
 
 %description
 Direct Rendering Manager runtime library
@@ -43,6 +44,7 @@
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
 %patch5 -p1 -b .r500
+%patch6 -p1 -b .modectl
 
 %build
 autoreconf -v --install || exit 1
@@ -100,6 +102,9 @@
 %{_libdir}/pkgconfig/libdrm.pc
 
 %changelog
+* Wed Jun 18 2008 Dave Airlie <airlied at redhat.com> 2.4.0-0.13
+- add modeset ctl interface fix
+
 * Wed May 28 2008 Dave Airlie <airlied at redhat.com> 2.4.0-0.12
 - add r500 support patch