rpms/libdrm/F-9 libdrm-2.4.0-no-bc.patch,1.1,1.2
Adam Jackson (ajax)
fedora-extras-commits at redhat.com
Tue Apr 29 14:15:18 UTC 2008
Author: ajax
Update of /cvs/pkgs/rpms/libdrm/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11501
Modified Files:
libdrm-2.4.0-no-bc.patch
Log Message:
argh patch fuzz
libdrm-2.4.0-no-bc.patch:
Index: libdrm-2.4.0-no-bc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-9/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 29 Apr 2008 13:51:12 -0000 1.1
+++ libdrm-2.4.0-no-bc.patch 29 Apr 2008 14:14:42 -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-03-03 01:49:49.000000000 -0500
-+++ libdrm-20080303/libdrm/xf86drm.c 2008-04-29 09:40:33.000000000 -0400
-@@ -380,11 +380,6 @@ int drmAvailable(void)
+--- 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)
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;
}
-@@ -503,38 +498,6 @@ static int drmOpenByName(const char *nam
+@@ -506,38 +501,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);
- }
- }
- }
More information about the scm-commits
mailing list