Permalink
Browse files

Merge pull request #4107 from Voyager1/libdvd-update

Libdvdread and Libdvdnav update to latest version 4.2.1 - Libdvdcss to 1.2.13
  • Loading branch information...
2 parents f3a4aec + f27f00b commit 8bae9fe7956af55b096d00eea9c3db76aa03eb47 @jmarshallnz jmarshallnz committed Apr 28, 2014
Showing with 4,437 additions and 6,698 deletions.
  1. +24 −12 .gitignore
  2. +4 −4 lib/libdvd/Makefile.in
  3. +4 −4 lib/libdvd/build-xbmc-win32.sh
  4. +16 −15 lib/libdvd/libdvdcss/AUTHORS
  5. +2,094 −2,352 lib/libdvd/libdvdcss/ChangeLog
  6. +15 −34 lib/libdvd/libdvdcss/INSTALL
  7. +63 −7 lib/libdvd/libdvdcss/Makefile.am
  8. +15 −5 lib/libdvd/libdvdcss/NEWS
  9. +7 −9 lib/libdvd/libdvdcss/README
  10. +0 −132 lib/libdvd/libdvdcss/bootstrap
  11. +116 −94 lib/libdvd/libdvdcss/configure.ac
  12. +0 −28 lib/libdvd/libdvdcss/doc/Makefile.am
  13. +9 −95 lib/libdvd/libdvdcss/doc/doxygen.cfg.in
  14. +0 −1 lib/libdvd/libdvdcss/doc/footer.html
  15. +0 −1 lib/libdvd/libdvdcss/doc/header.html
  16. +9 −9 lib/libdvd/libdvdcss/libdvdcss.spec
  17. +296 −0 lib/libdvd/libdvdcss/m4/attributes.m4
  18. +0 −37 lib/libdvd/libdvdcss/src/Makefile.am
  19. +0 −344 lib/libdvd/libdvdcss/src/bsdi_dvd.h
  20. +0 −770 lib/libdvd/libdvdcss/src/bsdi_ioctl.c
  21. +2 −6 lib/libdvd/libdvdcss/src/common.h
  22. +31 −32 lib/libdvd/libdvdcss/src/css.c
  23. +1 −3 lib/libdvd/libdvdcss/src/css.h
  24. +9 −10 lib/libdvd/libdvdcss/src/csstables.h
  25. +28 −59 lib/libdvd/libdvdcss/src/device.c
  26. +11 −10 lib/libdvd/libdvdcss/src/device.h
  27. +0 −3 lib/libdvd/libdvdcss/src/dvdcss/Makefile.am
  28. +2 −1 lib/libdvd/libdvdcss/src/dvdcss/dvdcss.h
  29. +0 −1 lib/libdvd/libdvdcss/src/error.c
  30. +70 −301 lib/libdvd/libdvdcss/src/ioctl.c
  31. +36 −54 lib/libdvd/libdvdcss/src/ioctl.h
  32. +19 −44 lib/libdvd/libdvdcss/src/libdvdcss.c
  33. +2 −4 lib/libdvd/libdvdcss/src/libdvdcss.h
  34. +1 −1 lib/libdvd/libdvdcss/src/libdvdcss.pc.in
  35. +0 −15 lib/libdvd/libdvdcss/test/Makefile.am
  36. +8 −0 lib/libdvd/libdvdnav/ChangeLog
  37. +1 −1 lib/libdvd/libdvdnav/configure.ac
  38. +1 −1 lib/libdvd/libdvdnav/configure2
  39. +9 −220 lib/libdvd/libdvdnav/src/dvdnav.c
  40. +2 −38 lib/libdvd/libdvdnav/src/dvdnav/dvdnav.h
  41. +8 −0 lib/libdvd/libdvdnav/src/dvdnav_internal.h
  42. +4 −2 lib/libdvd/libdvdnav/src/navigation.c
  43. +1 −0 lib/libdvd/libdvdnav/src/remap.c
  44. +30 −2 lib/libdvd/libdvdnav/src/searching.c
  45. +9 −6 lib/libdvd/libdvdnav/src/vm/vm.c
  46. +2 −2 lib/libdvd/libdvdnav/src/vm/vm.h
  47. +1 −1 lib/libdvd/libdvdnav/version.h
  48. +6 −0 lib/libdvd/libdvdread/ChangeLog
  49. +7 −1 lib/libdvd/libdvdread/configure.ac
  50. +14 −2 lib/libdvd/libdvdread/configure2
  51. +72 −0 lib/libdvd/libdvdread/m4/ax_check_compile_flag.m4
  52. +17 −27 lib/libdvd/libdvdread/src/dvd_input.c
  53. +1 −0 lib/libdvd/libdvdread/src/dvd_reader.c
  54. +4 −1 lib/libdvd/libdvdread/src/dvd_udf.c
  55. +2 −0 lib/libdvd/libdvdread/src/dvdread/ifo_types.h
  56. +2 −2 lib/libdvd/libdvdread/src/ifo_print.c
  57. +107 −57 lib/libdvd/libdvdread/src/ifo_read.c
  58. +1 −1 lib/libdvd/libdvdread/src/md5.h
  59. +1 −1 lib/libdvd/libdvdread/version.h
  60. +39 −25 lib/libdvd/patches/01-libdvdread.diff
  61. +0 −15 lib/libdvd/patches/02-libdvdread_fix_symlinks_resolution_vfs.diff
  62. +134 −238 lib/libdvd/patches/cores.diff
  63. +189 −350 lib/libdvd/patches/libdvdcss.diff
  64. +0 −689 lib/libdvd/patches/libdvdnav-accurate_seek.diff
  65. +850 −338 lib/libdvd/patches/libdvdnav.diff
  66. +0 −23 lib/libdvd/patches/libdvdnav_correct_audio_format_enum.diff
  67. +0 −33 lib/libdvd/patches/libdvdnav_correct_dvdnav_audio_stream_format.diff
  68. +0 −28 lib/libdvd/patches/libdvdnav_reenable_serialstring.diff
  69. +0 −15 lib/libdvd/patches/libdvdnav_remove_unneeded_defines.diff
  70. +2 −2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
  71. +10 −30 xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
  72. +0 −3 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/decoder.h
  73. +0 −2 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_types.h
  74. +6 −42 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav.h
  75. +8 −1 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h
  76. +2 −0 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/ifo_types.h
  77. +3 −0 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h
  78. +0 −2 xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vmcmd.h
View
@@ -781,30 +781,42 @@ lib/cpluff/stamp-h1
# /lib/libdvd/libdvdcss/
/lib/libdvd/libdvdcss/.auto/
+/lib/libdvd/libdvdcss/Makefile
/lib/libdvd/libdvdcss/Makefile.in
/lib/libdvd/libdvdcss/aclocal.m4
/lib/libdvd/libdvdcss/autom4te.cache/
+/lib/libdvd/libdvdcss/config.guess
+/lib/libdvd/libdvdcss/config.h
+/lib/libdvd/libdvdcss/config.h.in
/lib/libdvd/libdvdcss/config.h.in~
-/lib/libdvd/libdvdcss/configure
-/lib/libdvd/libdvdcss/doc/Makefile.in
-/lib/libdvd/libdvdcss/src/Makefile.in
-/lib/libdvd/libdvdcss/src/dvdcss/Makefile.in
-/lib/libdvd/libdvdcss/test/Makefile.in
+/lib/libdvd/libdvdcss/config.status
+/lib/libdvd/libdvdcss/config.sub
/lib/libdvd/libdvdcss/config.log
/lib/libdvd/libdvdcss/config.st
-/lib/libdvd/libdvdcss/stamp-h1
-/lib/libdvd/libdvdcss/config.h
-/lib/libdvd/libdvdcss/libtool
+/lib/libdvd/libdvdcss/configure
/lib/libdvd/libdvdcss/configure.lineno
-/lib/libdvd/libdvdcss/Makefile
-/lib/libdvd/libdvdcss/config.status
-/lib/libdvd/libdvdcss/config.h.in
-/lib/libdvd/libdvdcss/doc/Makefile
+/lib/libdvd/libdvdcss/depcomp
+/lib/libdvd/libdvdcss/install-sh
+/lib/libdvd/libdvdcss/libtool
+/lib/libdvd/libdvdcss/ltmain.sh
+/lib/libdvd/libdvdcss/missing
+/lib/libdvd/libdvdcss/stamp-h1
+/lib/libdvd/libdvdcss/m4/libtool.m4
+/lib/libdvd/libdvdcss/m4/ltoptions.m4
+/lib/libdvd/libdvdcss/m4/ltsugar.m4
+/lib/libdvd/libdvdcss/m4/ltversion.m4
+/lib/libdvd/libdvdcss/m4/lt~obsolete.m4
/lib/libdvd/libdvdcss/src/d
/lib/libdvd/libdvdcss/src/Makefile
/lib/libdvd/libdvdcss/src/dvdcss/Makefile
+/lib/libdvd/libdvdcss/src/.dirstamp
+/lib/libdvd/libdvdcss/src/Makefile.in
+/lib/libdvd/libdvdcss/src/dvdcss/Makefile.in
/lib/libdvd/libdvdcss/test/Makefile
/lib/libdvd/libdvdcss/doc/doxygen.cfg
+/lib/libdvd/libdvdcss/doc/Makefile
+/lib/libdvd/libdvdcss/doc/Makefile.in
+/lib/libdvd/libdvdcss/test/Makefile.in
/lib/libdvd/libdvdcss/test/csstest
/lib/libdvd/libdvdcss/test/csstest.exe
View
@@ -26,7 +26,7 @@ endif
ifeq (@BUILD_DVDCSS@,1)
DIRS += libdvdcss
SOS += libdvdcss-$(ARCH).so
- DVDCSS_A = libdvdcss/src/.libs/libdvdcss.a
+ DVDCSS_A = libdvdcss/.libs/libdvdcss.a
DVDCSS_O = libdvdcss/src/.libs/*.o
DVDNAV_PREREQ = libdvdcss
endif
@@ -44,7 +44,7 @@ all: $(SLIB)
ifeq ($(findstring osx,$(ARCH)), osx)
-$(SYSDIR)/libdvdcss-$(ARCH).so: $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a
+$(SYSDIR)/libdvdcss-$(ARCH).so: $($(WRAPPER)) libdvdcss/.libs/libdvdcss.a
$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
$(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)
@@ -54,7 +54,7 @@ $(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdr
else
-$(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
+$(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/.libs/libdvdcss.a
$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
@@ -66,7 +66,7 @@ $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread
endif
-libdvdcss/src/.libs/libdvdcss.a: libdvdcss;
+libdvdcss/.libs/libdvdcss.a: libdvdcss;
libdvdcss: compile
$(MAKE) -C $@
@@ -21,18 +21,18 @@ then
make distclean
fi
echo "***** Building libdvdcss *****"
-sh bootstrap
+autoreconf -i
./configure \
CFLAGS="-DNDEBUG" \
--disable-doc \
--enable-static \
--with-pic
make $MAKEFLAGS
-strip -S src/.libs/libdvdcss-2.dll
+strip -S .libs/libdvdcss-2.dll
cd ..
mkdir -p includes/dvdcss
cp libdvdcss/src/dvdcss/dvdcss.h includes/dvdcss
-cp libdvdcss/src/.libs/libdvdcss-2.dll /xbmc/system/players/dvdplayer/
+cp libdvdcss/.libs/libdvdcss-2.dll /xbmc/system/players/dvdplayer/
#libdvdread
cd libdvdread
@@ -72,7 +72,7 @@ make $MAKEFLAGS
gcc \
-shared \
-o obj/libdvdnav.dll \
- ../libdvdread/obj/*.o obj/*.o ../libdvdcss/src/.libs/libdvdcss.dll.a \
+ ../libdvdread/obj/*.o obj/*.o ../libdvdcss/.libs/libdvdcss.dll.a \
-ldl \
-Wl,--enable-auto-image-base \
-Xlinker --enable-auto-import
@@ -2,41 +2,40 @@
#
# Authors and contributors are listed alphabetically.
#
-# 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).
+# The fields are: name (N), email (E), web-address (W),
+# PGP key ID and fingerprint (P), description (D)
N: Billy Biggs
E: vektor@dumbterm.net
D: libdvdcss enhancements
-N: St�phane Borel
+N: Diego Biurrun
+E: diego@biurrun.de
+D: misc build and portability fixes, cleanup
+
+N: Stéphane Borel
E: stef@via.ecp.fr
-C: stef
-D: original CSS decryption code from vlc
+D: original CSS decryption code from VLC
N: Sven Heithecker
E: sven.heithecker@web.de
D: cache bug fix for discs with identical content but different keys
-N: H�kan Hjort
+N: Håkan Hjort
E: d95hjort@dtek.chalmers.se
-C: hjort
D: Solaris port of the DVD ioctls
D: libdvdcss enhancements
N: Samuel Hocevar
E: sam@zoy.org
-C: sam
-D: original CSS decryption code from vlc
+D: original CSS decryption code from VLC
N: Eugenio Jarosiewicz
E: ej0@cise.ufl.edu
-C: ej
-D: MacOS X DVD ioctls
+D: Mac OS X DVD ioctls
N: Jon Lech Johansen
E: jon-vl@nanocrew.net
-C: jlj
D: Win32 port
D: Fixes to the Darwin port
@@ -45,7 +44,6 @@ E: komh@chollian.net
D: OS/2 port
N: Jean-Baptiste Kempf
-C: jb
E: jb@videolan.org
D: maintainer
@@ -65,11 +63,15 @@ N: Christophe Massiot
E: massiot@via.ecp.fr
D: former maintainer
+N: Diego Elio Pettenò
+E: flameeyes@flameeyes.eu
+D: build system rewrite
+
N: Steven M. Schultz
E: sms@TO.GD-ES.COM
D: BSD/OS port
-N: David Sieb�rger
+N: David Siebörger
E: drs-videolan@rucus.ru.ac.za
D: HP-UX port of the DVD ioctls
@@ -83,5 +85,4 @@ D: FreeBSD DVD input patch
N: Gildas Bazin
E: gbazin@netcourrier.com
-C: gbazin
D: various fixes to the Win32 port
Oops, something went wrong.

0 comments on commit 8bae9fe

Please sign in to comment.