[Glibc-bsd-commits] r1466 - in trunk/web/patches: . debian-only

[Robert Millan]

Author: rmh
Date: 2006-04-20 15:04:55 +0000 (Thu, 20 Apr 2006)
New Revision: 1466

Added:
   trunk/web/patches/debian-only/libdrm.diff
Removed:
   trunk/web/patches/libdrm.diff
Log:
mv libdrm.diff debian-only/ (merged in upstream CVS).

Copied: trunk/web/patches/debian-only/libdrm.diff (from rev 1465, trunk/web/patches/libdrm.diff)
===================================================================
--- trunk/web/patches/libdrm.diff	2006-04-20 14:01:56 UTC (rev 1465)
+++ trunk/web/patches/debian-only/libdrm.diff	2006-04-20 15:04:55 UTC (rev 1466)
@@ -0,0 +1,18 @@
+
+Author: aurel32
+Status: in debian BTS
+
+diff -ur libdrm-2.0.1.old/shared-core/drm.h libdrm-2.0.1/shared-core/drm.h
+--- libdrm-2.0.1.old/shared-core/drm.h	2006-01-02 06:55:31.000000000 +0100
++++ libdrm-2.0.1/shared-core/drm.h	2006-04-19 12:06:18.000000000 +0200
+@@ -79,8 +79,8 @@
+ #define DRM_IOC_WRITE		_IOC_WRITE
+ #define DRM_IOC_READWRITE	_IOC_READ|_IOC_WRITE
+ #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+-#if defined(__FreeBSD__) && defined(IN_MODULE)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(IN_MODULE)
+ /* Prevent name collision when including sys/ioccom.h */
+ #undef ioctl
+ #include <sys/ioccom.h>

Deleted: trunk/web/patches/libdrm.diff
===================================================================
--- trunk/web/patches/libdrm.diff	2006-04-20 14:01:56 UTC (rev 1465)
+++ trunk/web/patches/libdrm.diff	2006-04-20 15:04:55 UTC (rev 1466)
@@ -1,18 +0,0 @@
-
-Author: aurel32
-Status: in debian BTS and https://bugs.freedesktop.org/show_bug.cgi?id=3810
-
-diff -ur libdrm-2.0.1.old/shared-core/drm.h libdrm-2.0.1/shared-core/drm.h
---- libdrm-2.0.1.old/shared-core/drm.h	2006-01-02 06:55:31.000000000 +0100
-+++ libdrm-2.0.1/shared-core/drm.h	2006-04-19 12:06:18.000000000 +0200
-@@ -79,8 +79,8 @@
- #define DRM_IOC_WRITE		_IOC_WRITE
- #define DRM_IOC_READWRITE	_IOC_READ|_IOC_WRITE
- #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
--#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
--#if defined(__FreeBSD__) && defined(IN_MODULE)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(IN_MODULE)
- /* Prevent name collision when including sys/ioccom.h */
- #undef ioctl
- #include <sys/ioccom.h>