diff --git a/libdrm-modeset-fix.patch b/libdrm-modeset-fix.patch new file mode 100644 index 0000000..2a353e1 --- /dev/null +++ b/libdrm-modeset-fix.patch @@ -0,0 +1,27 @@ +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; + }; + + /** diff --git a/libdrm.spec b/libdrm.spec index bad6c94..3a9b0b5 100644 --- a/libdrm.spec +++ b/libdrm.spec @@ -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 @@ Patch2: libdrm-2.4.0-no-freaking-mknod.patch 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 @@ Direct Rendering Manager development package %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 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libdrm.pc %changelog +* Wed Jun 18 2008 Dave Airlie 2.4.0-0.13 +- add modeset ctl interface fix + * Wed May 28 2008 Dave Airlie 2.4.0-0.12 - add r500 support patch