[Glibc-bsd-commits] r1485 - in trunk/web/patches: . upstream-only

[Robert Millan]

Author: rmh
Date: 2006-04-24 18:30:14 +0000 (Mon, 24 Apr 2006)
New Revision: 1485

Added:
   trunk/web/patches/upstream-only/libdvdread.diff
Removed:
   trunk/web/patches/libdvdread.diff
Log:
libdvdread.diff merged in debian.

Deleted: trunk/web/patches/libdvdread.diff
===================================================================
--- trunk/web/patches/libdvdread.diff	2006-04-24 07:03:44 UTC (rev 1484)
+++ trunk/web/patches/libdvdread.diff	2006-04-24 18:30:14 UTC (rev 1485)
@@ -1,24 +0,0 @@
---- libdvdread-0.9.4.orig/dvdread/dvd_reader.c
-+++ libdvdread-0.9.4/dvdread/dvd_reader.c
-@@ -32,7 +32,7 @@
- #include <limits.h>
- #include <dirent.h>
-  
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) || defined(__FreeBSD_kernel__)
- #define SYS_BSD 1
- #endif
- 
-only in patch2:
-unchanged:
---- libdvdread-0.9.4.orig/dvdread/bswap.h
-+++ libdvdread-0.9.4/dvdread/bswap.h
-@@ -35,7 +35,7 @@
- #include <sys/param.h>
- #endif
- 
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__GLIBC__)
- #include <byteswap.h>
- #define B2N_16(x) x = bswap_16(x)
- #define B2N_32(x) x = bswap_32(x)

Copied: trunk/web/patches/upstream-only/libdvdread.diff (from rev 1472, trunk/web/patches/libdvdread.diff)