Skip to content

Commit 421d9fd

Browse files
committed
Updated libdvdcss, read and nav to the latest versions
All XBMC modifications are kept intact Moved get/set state functions from vm.h to dvdnav_internal.h where they should be Added comments to clarify which functions are added by XBMC
1 parent 7b2dddc commit 421d9fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+2430
-1397
lines changed

.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,11 @@ lib/cmyth/Makefile
631631
/lib/libdvd/includes/dvdread/ifo_read.h
632632
/lib/libdvd/includes/dvdread/nav_types.h
633633

634+
# /lib/libdvd/includes/dvdnav
635+
/lib/libdvd/includes/dvdnav/dvd_types.h
636+
/lib/libdvd/includes/dvdnav/dvdnav.h
637+
/lib/libdvd/includes/dvdnav/dvdnav_events.h
638+
634639
# /lib/libdvd/libdvdcss/
635640
/lib/libdvd/libdvdcss/.auto/
636641
/lib/libdvd/libdvdcss/Makefile.in

lib/libdvd/build-xbmc-win32.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ echo "***** Building libdvdread *****"
4747
--extra-cflags="-DHAVE_DVDCSS_DVDCSS_H -D_XBMC -DNDEBUG -D_MSC_VER -I`pwd`/../includes" \
4848
--disable-debug
4949
mkdir -p ../includes/dvdread
50-
cp ../libdvdread/src/*.h ../includes/dvdread
50+
cp ../libdvdread/src/dvdread/*.h ../includes/dvdread
5151
make $MAKEFLAGS
5252
cd ..
5353

@@ -65,6 +65,8 @@ echo "***** Building libdvdnav *****"
6565
--extra-cflags="-D_XBMC -DNDEBUG -I`pwd`/../includes" \
6666
--with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
6767
--disable-debug
68+
mkdir -p ../includes/dvdnav
69+
cp ../libdvdnav/src/dvdnav/*.h ../includes/dvdnav
6870
make $MAKEFLAGS
6971
gcc \
7072
-shared \

lib/libdvd/includes/dvdnav/.ignoreme

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

lib/libdvd/libdvdcss/AUTHORS

+19-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Authors and contributors are listed alphabetically.
44
#
5-
# The fields are: name (N), email (E), web-address (W), CVS account login (C),
5+
# The fields are: name (N), email (E), web-address (W), CVS/SVN account login (C),
66
# PGP key ID and fingerprint (P), description (D), and snail-mail address (S).
77

88
N: Billy Biggs
@@ -20,6 +20,7 @@ D: cache bug fix for discs with identical content but different keys
2020

2121
N: H�kan Hjort
2222
23+
C: hjort
2324
D: Solaris port of the DVD ioctls
2425
D: libdvdcss enhancements
2526

@@ -39,6 +40,15 @@ C: jlj
3940
D: Win32 port
4041
D: Fixes to the Darwin port
4142

43+
N: KO Myung-Hun
44+
45+
D: OS/2 port
46+
47+
N: Jean-Baptiste Kempf
48+
C: jb
49+
50+
D: maintainer
51+
4252
N: Markus Kuespert
4353
4454
D: BeOS port of the DVD ioctls
@@ -47,6 +57,14 @@ N: Pascal Levesque
4757
4858
D: QNX port
4959

60+
N: Steve Lhomme
61+
62+
D: win32 improvements
63+
64+
N: Christophe Massiot
65+
66+
D: former maintainer
67+
5068
N: Steven M. Schultz
5169
5270
D: BSD/OS port

0 commit comments

Comments
 (0)