Merge pull request xbmc#2128 from Paxxi/libdvd

updated libdvdcss, read and nav to the latest versions - 4.2.0

.gitignore

@@ -631,6 +631,11 @@ lib/cmyth/Makefile
 /lib/libdvd/includes/dvdread/ifo_read.h
 /lib/libdvd/includes/dvdread/nav_types.h
 
+# /lib/libdvd/includes/dvdnav
+/lib/libdvd/includes/dvdnav/dvd_types.h
+/lib/libdvd/includes/dvdnav/dvdnav.h
+/lib/libdvd/includes/dvdnav/dvdnav_events.h
+
 # /lib/libdvd/libdvdcss/
 /lib/libdvd/libdvdcss/.auto/
 /lib/libdvd/libdvdcss/Makefile.in

lib/libdvd/build-xbmc-win32.sh

@@ -47,7 +47,7 @@ echo "***** Building libdvdread *****"
       --extra-cflags="-DHAVE_DVDCSS_DVDCSS_H -D_XBMC -DNDEBUG -D_MSC_VER -I`pwd`/../includes" \
       --disable-debug
 mkdir -p ../includes/dvdread
-cp ../libdvdread/src/*.h ../includes/dvdread
+cp ../libdvdread/src/dvdread/*.h ../includes/dvdread
 make $MAKEFLAGS
 cd ..
 
@@ -65,6 +65,8 @@ echo "***** Building libdvdnav *****"
       --extra-cflags="-D_XBMC -DNDEBUG -I`pwd`/../includes" \
       --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
       --disable-debug
+mkdir -p ../includes/dvdnav
+cp ../libdvdnav/src/dvdnav/*.h ../includes/dvdnav
 make $MAKEFLAGS
 gcc \
       -shared \

lib/libdvd/includes/dvdnav/.ignoreme

@@ -0,0 +1,2 @@
+Dummy file so that this directory shows up for git users.
+Ignore this file.

lib/libdvd/libdvdcss/AUTHORS

@@ -2,7 +2,7 @@
 # 
 # Authors and contributors are listed alphabetically.
 # 
-# The fields are: name (N), email (E), web-address (W), CVS account login (C),
+# The fields are: name (N), email (E), web-address (W), CVS/SVN account login (C),
 # PGP key ID and fingerprint (P), description (D), and snail-mail address (S).
 
 N: Billy Biggs 
@@ -20,6 +20,7 @@ D: cache bug fix for discs with identical content but different keys
 
 N: H�kan Hjort
 E: [email protected]
+C: hjort
 D: Solaris port of the DVD ioctls
 D: libdvdcss enhancements
 
@@ -39,6 +40,15 @@ C: jlj
 D: Win32 port
 D: Fixes to the Darwin port
 
+N: KO Myung-Hun
+E: [email protected]
+D: OS/2 port
+
+N: Jean-Baptiste Kempf
+C: jb
+E: [email protected]
+D: maintainer
+
 N: Markus Kuespert
 E: [email protected]
 D: BeOS port of the DVD ioctls
@@ -47,6 +57,14 @@ N: Pascal Levesque
 E: [email protected]
 D: QNX port
 
+N: Steve Lhomme
+E: [email protected]
+D: win32 improvements
+
+N: Christophe Massiot
+E: [email protected]
+D: former maintainer
+
 N: Steven M. Schultz
 E: [email protected]
 D: BSD/OS port