Win32: dvdread fixes for Win32

This should simplify the mms-bitfield issue and avoid the compilation of the dvdread plugin on Windows...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d1efbb644fb0f4b5e606b10cf1d09834b31c14e2..ea0a0d377b1a2881e93ddbb732cd67c46fe3a6f5 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1141,7 +1141,7 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # ***************************************************************************
 libdvdread:
        $(SVN) co $(LIBDVDREAD_SVN)  libdvdread
-       (cd $@; patch  -p 0 < ../Patches/libdvdread.patch)
+       (cd $@; patch  -p 0 < ../Patches/libdvdread-dvdcss-static.patch)
 ifdef HAVE_WIN32
        (cd $@; patch  -p 0 < ../Patches/libdvdread-win32.patch)
 endif

diff --git a/extras/contrib/src/Patches/libdvdread.patch b/extras/contrib/src/Patches/libdvdread-dvdcss-static.patch
similarity index 100%
rename from extras/contrib/src/Patches/libdvdread.patch
rename to extras/contrib/src/Patches/libdvdread-dvdcss-static.patch

diff --git a/extras/contrib/src/Patches/libdvdread-win32.patch b/extras/contrib/src/Patches/libdvdread-win32.patch
index 73a78f0cf761ddf838ccdc919fc2a10928a151a4..166599411f2c996973f9d59af5d8f57f2c71817f 100644 (file)
--- a/extras/contrib/src/Patches/libdvdread-win32.patch
+++ b/extras/contrib/src/Patches/libdvdread-win32.patch
@@ -18,3 +18,16 @@ Index: src/dvd_reader.c
  
  #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DARWIN__)
  #define SYS_BSD 1
+Index: src/dvdread/ifo_types.h
+===================================================================
+--- src/dvdread/ifo_types.h    (révision 1188)
++++ src/dvdread/ifo_types.h    (copie de travail)
+@@ -32,7 +32,7 @@
+ 
+ #if defined(__GNUC__)
+ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
+-#define ATTRIBUTE_PACKED __attribute__ ((packed))
++#define ATTRIBUTE_PACKED __attribute__ ((packed,gcc_struct))
+ #define PRAGMA_PACK 0
+ #endif
+ #endif