Permalink
Browse files

Merge pull request #2128 from Paxxi/libdvd

updated libdvdcss, read and nav to the latest versions - 4.2.0
  • Loading branch information...
Voyager1 committed Feb 8, 2013
2 parents 94c518f + 57e27af commit 6a384a18007a0a72df4ca444489de9823469a8d9
Showing with 4,402 additions and 1,397 deletions.
  1. +5 −0 .gitignore
  2. +3 −1 lib/libdvd/build-xbmc-win32.sh
  3. +2 −0 lib/libdvd/includes/dvdnav/.ignoreme
  4. +19 −1 lib/libdvd/libdvdcss/AUTHORS
  5. +323 −0 lib/libdvd/libdvdcss/ChangeLog
  6. +7 −1 lib/libdvd/libdvdcss/INSTALL
  7. +1 −1 lib/libdvd/libdvdcss/Makefile.am
  8. +17 −1 lib/libdvd/libdvdcss/NEWS
  9. +9 −15 lib/libdvd/libdvdcss/README
  10. +1 −1 lib/libdvd/libdvdcss/bootstrap
  11. +6 −2 lib/libdvd/libdvdcss/configure.ac
  12. +2 −2 lib/libdvd/libdvdcss/doc/doxygen.cfg.in
  13. +1 −1 lib/libdvd/libdvdcss/doc/footer.html
  14. +1 −1 lib/libdvd/libdvdcss/doc/header.html
  15. +4 −4 lib/libdvd/libdvdcss/src/bsdi_dvd.h
  16. +8 −8 lib/libdvd/libdvdcss/src/common.h
  17. +60 −13 lib/libdvd/libdvdcss/src/css.c
  18. +11 −4 lib/libdvd/libdvdcss/src/css.h
  19. +7 −4 lib/libdvd/libdvdcss/src/csstables.h
  20. +126 −9 lib/libdvd/libdvdcss/src/device.c
  21. +11 −5 lib/libdvd/libdvdcss/src/device.h
  22. +4 −4 lib/libdvd/libdvdcss/src/dvdcss/dvdcss.h
  23. +6 −6 lib/libdvd/libdvdcss/src/error.c
  24. +6 −6 lib/libdvd/libdvdcss/src/ioctl.c
  25. +10 −5 lib/libdvd/libdvdcss/src/ioctl.h
  26. +37 −19 lib/libdvd/libdvdcss/src/libdvdcss.c
  27. +12 −5 lib/libdvd/libdvdcss/src/libdvdcss.h
  28. +13 −0 lib/libdvd/libdvdnav/ChangeLog
  29. +2 −2 lib/libdvd/libdvdnav/Makefile
  30. +1 −1 lib/libdvd/libdvdnav/README
  31. +0 −2 lib/libdvd/libdvdnav/autogen.sh
  32. +5 −22 lib/libdvd/libdvdnav/configure.ac
  33. +1 −1 lib/libdvd/libdvdnav/configure2
  34. +10 −13 lib/libdvd/libdvdnav/examples/menus.c
  35. +0 −4 lib/libdvd/libdvdnav/m4/Makefile.am
  36. +5 −0 lib/libdvd/libdvdnav/msvc/config.h
  37. +0 −3 lib/libdvd/libdvdnav/msvc/contrib/dlfcn.c
  38. +2 −2 lib/libdvd/libdvdnav/msvc/contrib/getopt.c
  39. +2 −2 lib/libdvd/libdvdnav/msvc/contrib/timer/timer.c
  40. +1 −6 lib/libdvd/libdvdnav/msvc/include/dlfcn.h
  41. +6 −9 lib/libdvd/libdvdnav/msvc/include/dvdnav_internal.h
  42. +2 −2 lib/libdvd/libdvdnav/msvc/include/getopt.h
  43. +2 −2 lib/libdvd/libdvdnav/msvc/include/inttypes.h
  44. +0 −3 lib/libdvd/libdvdnav/msvc/include/os_types.h
  45. +2 −2 lib/libdvd/libdvdnav/msvc/include/pthreads/pthread.h
  46. +2 −2 lib/libdvd/libdvdnav/msvc/include/pthreads/sched.h
  47. +2 −2 lib/libdvd/libdvdnav/msvc/include/sys/time.h
  48. +2 −2 lib/libdvd/libdvdnav/msvc/include/unistd.h
  49. +2 −2 lib/libdvd/libdvdnav/src/Makefile.am
  50. +32 −19 lib/libdvd/libdvdnav/src/dvdnav.c
  51. +7 −10 lib/libdvd/libdvdnav/src/{ → dvdnav}/dvd_types.h
  52. +45 −26 lib/libdvd/libdvdnav/src/{ → dvdnav}/dvdnav.h
  53. +6 −9 lib/libdvd/libdvdnav/src/{ → dvdnav}/dvdnav_events.h
  54. +10 −21 lib/libdvd/libdvdnav/src/dvdnav_internal.h
  55. +6 −10 lib/libdvd/libdvdnav/src/highlight.c
  56. +84 −8 lib/libdvd/libdvdnav/src/navigation.c
  57. +4 −8 lib/libdvd/libdvdnav/src/read_cache.c
  58. +6 −9 lib/libdvd/libdvdnav/src/read_cache.h
  59. +5 −8 lib/libdvd/libdvdnav/src/remap.c
  60. +6 −8 lib/libdvd/libdvdnav/src/remap.h
  61. +49 −19 lib/libdvd/libdvdnav/src/searching.c
  62. +4 −8 lib/libdvd/libdvdnav/src/settings.c
  63. +5 −9 lib/libdvd/libdvdnav/src/vm/decoder.c
  64. +7 −10 lib/libdvd/libdvdnav/src/vm/decoder.h
  65. +150 −33 lib/libdvd/libdvdnav/src/vm/vm.c
  66. +10 −11 lib/libdvd/libdvdnav/src/vm/vm.h
  67. +5 −9 lib/libdvd/libdvdnav/src/vm/vmcmd.c
  68. +7 −10 lib/libdvd/libdvdnav/src/vm/vmcmd.h
  69. +1 −1 lib/libdvd/libdvdnav/version.h
  70. +18 −18 lib/libdvd/libdvdnav/version.sh
  71. +18 −0 lib/libdvd/libdvdread/ChangeLog
  72. +9 −9 lib/libdvd/libdvdread/Makefile
  73. +1 −1 lib/libdvd/libdvdread/README
  74. +0 −2 lib/libdvd/libdvdread/autogen.sh
  75. +6 −23 lib/libdvd/libdvdread/configure.ac
  76. +15 −1 lib/libdvd/libdvdread/configure2
  77. +0 −4 lib/libdvd/libdvdread/m4/Makefile.am
  78. +5 −0 lib/libdvd/libdvdread/msvc/config.h
  79. +0 −3 lib/libdvd/libdvdread/msvc/contrib/dlfcn.c
  80. +2 −2 lib/libdvd/libdvdread/msvc/contrib/getopt.c
  81. +2 −2 lib/libdvd/libdvdread/msvc/contrib/timer/timer.c
  82. +1 −6 lib/libdvd/libdvdread/msvc/include/dlfcn.h
  83. +6 −9 lib/libdvd/libdvdread/msvc/include/dvdnav_internal.h
  84. +2 −2 lib/libdvd/libdvdread/msvc/include/getopt.h
  85. +2 −2 lib/libdvd/libdvdread/msvc/include/inttypes.h
  86. +0 −3 lib/libdvd/libdvdread/msvc/include/os_types.h
  87. +5 −5 lib/libdvd/libdvdread/msvc/include/pthreads/pthread.h
  88. +2 −2 lib/libdvd/libdvdread/msvc/include/pthreads/sched.h
  89. +3 −3 lib/libdvd/libdvdread/msvc/include/sys/time.h
  90. +4 −4 lib/libdvd/libdvdread/msvc/include/unistd.h
  91. +2 −2 lib/libdvd/libdvdread/src/Makefile.am
  92. +9 −9 lib/libdvd/libdvdread/src/bitreader.c
  93. +13 −11 lib/libdvd/libdvdread/src/bswap.h
  94. +15 −12 lib/libdvd/libdvdread/src/dvd_input.c
  95. +14 −13 lib/libdvd/libdvdread/src/dvd_input.h
  96. +271 −63 lib/libdvd/libdvdread/src/dvd_reader.c
  97. +68 −44 lib/libdvd/libdvdread/src/dvd_udf.c
  98. +11 −10 lib/libdvd/libdvdread/src/{ → dvdread}/bitreader.h
  99. +54 −16 lib/libdvd/libdvdread/src/{ → dvdread}/dvd_reader.h
  100. +18 −18 lib/libdvd/libdvdread/src/{ → dvdread}/dvd_udf.h
  101. +28 −0 lib/libdvd/libdvdread/src/dvdread/ifo_print.h
  102. +14 −12 lib/libdvd/libdvdread/src/{ → dvdread}/ifo_read.h
  103. +18 −14 lib/libdvd/libdvdread/src/{ → dvdread}/ifo_types.h
  104. +17 −15 lib/libdvd/libdvdread/src/{ → dvdread}/nav_print.h
  105. +12 −10 lib/libdvd/libdvdread/src/{ → dvdread}/nav_read.h
  106. +9 −10 lib/libdvd/libdvdread/src/{ → dvdread}/nav_types.h
  107. +31 −5 lib/libdvd/libdvdread/src/dvdread_internal.h
  108. +64 −110 lib/libdvd/libdvdread/src/ifo_print.c
  109. +0 −53 lib/libdvd/libdvdread/src/ifo_print.h
  110. +147 −85 lib/libdvd/libdvdread/src/ifo_read.c
  111. +1 −5 lib/libdvd/libdvdread/src/md5.c
  112. +4 −4 lib/libdvd/libdvdread/src/md5.h
  113. +6 −10 lib/libdvd/libdvdread/src/nav_print.c
  114. +11 −11 lib/libdvd/libdvdread/src/nav_read.c
  115. +1 −1 lib/libdvd/libdvdread/version.h
  116. +545 −0 lib/libdvd/patches/cores.diff
  117. +365 −0 lib/libdvd/patches/libdvdcss.diff
  118. +766 −0 lib/libdvd/patches/libdvdnav.diff
  119. +296 −0 lib/libdvd/patches/libdvdread.diff
  120. +7 −10 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/decoder.h
  121. +57 −17 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_reader.h
  122. +9 −13 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_types.h
  123. +96 −30 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav.h
  124. +6 −10 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_events.h
  125. +32 −13 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h
  126. +36 −169 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/ifo_types.h
  127. +9 −10 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/nav_types.h
  128. +6 −8 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/remap.h
  129. +16 −14 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h
  130. +7 −10 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vmcmd.h
View
@@ -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
@@ -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 \
@@ -0,0 +1,2 @@
+Dummy file so that this directory shows up for git users.
+Ignore this file.
@@ -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: d95hjort@dtek.chalmers.se
+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: komh@chollian.net
+D: OS/2 port
+
+N: Jean-Baptiste Kempf
+C: jb
+E: jb@videolan.org
+D: maintainer
+
N: Markus Kuespert
E: ltlBeBoy@beosmail.com
D: BeOS port of the DVD ioctls
@@ -47,6 +57,14 @@ N: Pascal Levesque
E: Pascal.Levesque@mindready.com
D: QNX port
+N: Steve Lhomme
+E: steve.lhomme@free.fr
+D: win32 improvements
+
+N: Christophe Massiot
+E: massiot@via.ecp.fr
+D: former maintainer
+
N: Steven M. Schultz
E: sms@TO.GD-ES.COM
D: BSD/OS port
Oops, something went wrong.

10 comments on commit 6a384a1

@arnova

This comment has been minimized.

Show comment
Hide comment
@arnova

arnova Feb 9, 2013

Member

This broke compilation on Ubuntu 12.10:
In file included from /home/arnova/XBMC-git/master/lib/libdvd/libdvdnav/src/dvdnav.c:36:0:
/home/arnova/XBMC-git/master/lib/libdvd/libdvdnav/src/dvdnav/dvdnav.h:36:34: fatal error: dvdread/dvd_reader.h: No such file or directory
compilation terminated.
make[1]: *** [dvdnav.o] Error 1
make[1]: Leaving directory `/home/arnova/XBMC-git/master/lib/libdvd/libdvdnav'
make: *** [libdvdnav] Error 2

Member

arnova replied Feb 9, 2013

This broke compilation on Ubuntu 12.10:
In file included from /home/arnova/XBMC-git/master/lib/libdvd/libdvdnav/src/dvdnav.c:36:0:
/home/arnova/XBMC-git/master/lib/libdvd/libdvdnav/src/dvdnav/dvdnav.h:36:34: fatal error: dvdread/dvd_reader.h: No such file or directory
compilation terminated.
make[1]: *** [dvdnav.o] Error 1
make[1]: Leaving directory `/home/arnova/XBMC-git/master/lib/libdvd/libdvdnav'
make: *** [libdvdnav] Error 2

@wsnipex

This comment has been minimized.

Show comment
Hide comment
@wsnipex

wsnipex Feb 9, 2013

Member

just noticed the same, did anyone actually compile this on linux before merge?
not only on ubuntu 12.10 but at least >=11.10

Member

wsnipex replied Feb 9, 2013

just noticed the same, did anyone actually compile this on linux before merge?
not only on ubuntu 12.10 but at least >=11.10

@wsnipex

This comment has been minimized.

Show comment
Hide comment
@wsnipex

wsnipex Feb 9, 2013

Member
Member

wsnipex replied Feb 9, 2013

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 9, 2013

Member

thanks for fixing this - we tested on IOS and Win32 - obviously not sufficient :-)

Member

Voyager1 replied Feb 9, 2013

thanks for fixing this - we tested on IOS and Win32 - obviously not sufficient :-)

@wsnipex

This comment has been minimized.

Show comment
Hide comment
@wsnipex

wsnipex Feb 9, 2013

Member

its not fixed yet, the patch works when compiling libdvd directly, but it still errors when built together with xbmc

Member

wsnipex replied Feb 9, 2013

its not fixed yet, the patch works when compiling libdvd directly, but it still errors when built together with xbmc

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 9, 2013

Member

was about to mention it. This patch is not needed on Windows as the mingw build script build-xbmc-win32.sh takes care of it by copying all includes to a git-ignored folder ../includes which we include in the configure2 step for libdvdnav.

Part of the changes were that the include files for libdvdread are now in libdvdread/src/dvdread/.h instead of libdvdread/src/.h
For libdvdnav the same : libdvdnav/src/dvdnav/.h instead of libdvdnav/src/.h

As said this is taken care of by the mingw build script build-xbmc-win32.sh without modifying the original Makefiles.

Therefore I think #2198 should be reverted, this is not the solution.

Regarding compilation in conjunction with xbmc, take a look at the diff file libdvd/patches/cores.diff - which shows the changes in the xbmc/cores/dvdplayer/DVDInputstreams/dvdnav header files.

Member

Voyager1 replied Feb 9, 2013

was about to mention it. This patch is not needed on Windows as the mingw build script build-xbmc-win32.sh takes care of it by copying all includes to a git-ignored folder ../includes which we include in the configure2 step for libdvdnav.

Part of the changes were that the include files for libdvdread are now in libdvdread/src/dvdread/.h instead of libdvdread/src/.h
For libdvdnav the same : libdvdnav/src/dvdnav/.h instead of libdvdnav/src/.h

As said this is taken care of by the mingw build script build-xbmc-win32.sh without modifying the original Makefiles.

Therefore I think #2198 should be reverted, this is not the solution.

Regarding compilation in conjunction with xbmc, take a look at the diff file libdvd/patches/cores.diff - which shows the changes in the xbmc/cores/dvdplayer/DVDInputstreams/dvdnav header files.

@wsnipex

This comment has been minimized.

Show comment
Hide comment
@wsnipex

wsnipex Feb 9, 2013

Member

hmm, false alarm, tried again with clean git 2 times and it works for me. can anyone try the PR?

Member

wsnipex replied Feb 9, 2013

hmm, false alarm, tried again with clean git 2 times and it works for me. can anyone try the PR?

@wsnipex

This comment has been minimized.

Show comment
Hide comment
@wsnipex

wsnipex Feb 9, 2013

Member

I looked at the build script, imho its a dirty hack, instead the autoconf stuff should be fixed.

Member

wsnipex replied Feb 9, 2013

I looked at the build script, imho its a dirty hack, instead the autoconf stuff should be fixed.

@Voyager1

This comment has been minimized.

Show comment
Hide comment
@Voyager1

Voyager1 Feb 9, 2013

Member

FYI In previous code used the DVDNAV_COMPILE define to manage the includes-dependencies. That's why it compiled without problem before...
Any suggestion on how to fix the autoconf stuff?

Member

Voyager1 replied Feb 9, 2013

FYI In previous code used the DVDNAV_COMPILE define to manage the includes-dependencies. That's why it compiled without problem before...
Any suggestion on how to fix the autoconf stuff?

@vicbitter

This comment has been minimized.

Show comment
Hide comment
@vicbitter

vicbitter Feb 9, 2013

Problem in lib/libdvd/libdvdcss/configure.ac

When I try and compile on Linux (Ubuntu 12.10) I get the following error:
configure.ac:8: error: 'AM_CONFIG_HEADER': this macro is obsolete.
You should use the 'AC_CONFIG_HEADERS' macro instead.

I had to use AC_CONFIG_HEADERS(config.h) to compile successfully

Problem in lib/libdvd/libdvdcss/configure.ac

When I try and compile on Linux (Ubuntu 12.10) I get the following error:
configure.ac:8: error: 'AM_CONFIG_HEADER': this macro is obsolete.
You should use the 'AC_CONFIG_HEADERS' macro instead.

I had to use AC_CONFIG_HEADERS(config.h) to compile successfully

Please sign in to comment.