* a part of our patch was submitted upstream

diff --git a/extras/contrib/src/Patches/libdvdnav.patch b/extras/contrib/src/Patches/libdvdnav.patch
index e8c761134f23e47d515a8befc45f184578f74df3..9437c0aad02e2780dc16e2f470d6082b783b3425 100644 (file)
--- a/extras/contrib/src/Patches/libdvdnav.patch
+++ b/extras/contrib/src/Patches/libdvdnav.patch
@@ -113,32 +113,6 @@ diff -r -u libdvdnav-4.1.1/src/dvdnav_internal.h libdvdnav/src/dvdnav_internal.h
  #include <io.h> /* read() */
  #define lseek64 _lseeki64
  
-diff -r -u libdvdnav-4.1.1/src/dvdread/bswap.h libdvdnav/src/dvdread/bswap.h
---- libdvdnav-4.1.1/src/dvdread/bswap.h        2007-05-05 11:32:13.000000000 +0100
-+++ libdvdnav/src/dvdread/bswap.h      2007-11-12 11:17:38.343750000 +0000
-@@ -81,14 +81,14 @@
-       (((x) & 0x0000ff00) <<  8) | \
-       (((x) & 0x000000ff) << 24))
- #define B2N_64(x) \
-- x = ((((x) & 0xff00000000000000) >> 56) | \
--      (((x) & 0x00ff000000000000) >> 40) | \
--      (((x) & 0x0000ff0000000000) >> 24) | \
--      (((x) & 0x000000ff00000000) >>  8) | \
--      (((x) & 0x00000000ff000000) <<  8) | \
--      (((x) & 0x0000000000ff0000) << 24) | \
--      (((x) & 0x000000000000ff00) << 40) | \
--      (((x) & 0x00000000000000ff) << 56))
-+ x = ((((x) & 0xff00000000000000LL) >> 56) | \
-+      (((x) & 0x00ff000000000000LL) >> 40) | \
-+      (((x) & 0x0000ff0000000000LL) >> 24) | \
-+      (((x) & 0x000000ff00000000LL) >>  8) | \
-+      (((x) & 0x00000000ff000000LL) <<  8) | \
-+      (((x) & 0x0000000000ff0000LL) << 24) | \
-+      (((x) & 0x000000000000ff00LL) << 40) | \
-+      (((x) & 0x00000000000000ffLL) << 56))
- 
- #else
- 
 diff -r -u libdvdnav-4.1.1/src/dvdread/dvd_input.c libdvdnav/src/dvdread/dvd_input.c
 --- libdvdnav-4.1.1/src/dvdread/dvd_input.c    2007-04-19 16:45:30.000000000 +0100
 +++ libdvdnav/src/dvdread/dvd_input.c  2007-11-12 11:19:57.984375000 +0000