[vlc-devel] commit: Win32: dvdread fixes for Win32 (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jan  9 23:17:40 2010 +0100| [3684f45081e0b0af0e5719016af789115a5ddd84] | committer: Jean-Baptiste Kempf 

Win32: dvdread fixes for Win32

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3684f45081e0b0af0e5719016af789115a5ddd84
---

 extras/contrib/src/Makefile                        |    2 +-
 ...vdread.patch => libdvdread-dvdcss-static.patch} |    0 
 extras/contrib/src/Patches/libdvdread-win32.patch  |   13 +++++++++++++
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d1efbb6..ea0a0d3 100644
--- 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 73a78f0..1665994 100644
--- 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