Sync with libdvdread upstream

lib/libdvd/libdvdread/COPYING

@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
      59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it

lib/libdvd/libdvdread/ChangeLog

@@ -1,3 +1,21 @@
+libdvdread (4.2.0)
+  * added OS/2 support
+  * fixed ARM memory alignment issue
+  * portability fixes for *BSD, Mac OS X, MINGW and OS/2
+  * added a missing DVDFileStat function
+  * exposed the dvd_stat_t struct in header
+  * fixed libdvdread closing stdin if it can't open the file/device
+  * fixed a segfault in UDFFileEntry on some badly mastered DVDs
+  * fixed big-endian builds
+  * Win32: large file support under Mingw to go over 2G limits
+  * configure: remove the special case test for uid=0
+  * provide BUP file support for more issues
+  * move UDFReadBlocksRaw declaration to dvdread_internal.h
+  * fixed double free of parental management information
+  * configure2: Use a single = instead of ==
+  * fixed crash when PTT is too short
+  * fixed segfault when reading certain DVDs, for example "Thor"
+
 libdvdread (4.1.3)
   * an embarassing amount of fixes regarding potential memory and resource leaks
     (patches contributed by Erik Hovland)
@@ -114,7 +132,7 @@ libdvdnav (0.1.0-1.1) unstable; urgency=low
       (see patch from Jamie Wilkinson for a better solution)
 
  -- Siggi Langauf <siggi@debian.org>  Mon, 20 May 2002 15:57:40 +0200
- 
+
 libdvdnav (0.0.1-1) unstable; urgency=low
 
   * Repackaged using dh-make.

lib/libdvd/libdvdread/Makefile

@@ -18,15 +18,15 @@ DVDREAD_L=libdvdread
 DVDREAD_LIB = $(DVDREAD_L).a
 DVDREAD_SHLIB = $(DVDREAD_L).so
 VPATH+= $(SRC_PATH_BARE)/src
-DVDREAD_HEADERS = src/dvd_reader.h \
-	src/ifo_print.h \
-	src/ifo_read.h \
-	src/ifo_types.h \
-	src/nav_print.h \
-	src/nav_read.h \
-	src/dvd_udf.h \
-	src/nav_types.h \
-	src/bitreader.h
+DVDREAD_HEADERS = src/dvdread/dvd_reader.h \
+	src/dvdread/ifo_print.h \
+	src/dvdread/ifo_read.h \
+	src/dvdread/ifo_types.h \
+	src/dvdread/nav_print.h \
+	src/dvdread/nav_read.h \
+	src/dvdread/dvd_udf.h \
+	src/dvdread/nav_types.h \
+	src/dvdread/bitreader.h
 DVDREAD_SRCS = dvd_input.c dvd_reader.c dvd_udf.c ifo_print.c ifo_read.c \
 	md5.c nav_print.c nav_read.c bitreader.c
 CFLAGS += -I$(SRC_PATH)/src
@@ -67,7 +67,7 @@ endif
 
 version.h:
 	sh $(SRC_PATH)/version.sh $(SRC_PATH) "$(SHLIB_VERSION)"
-	
+
 $(SRCS) $(DVDREAD_SRCS): version.h
 
 
@@ -121,7 +121,7 @@ install-static: $(LIB)
 # Clean targets
 
 clean:
-	rm -rf  *~ $(.OBJDIR)/* 
+	rm -rf  *~ $(.OBJDIR)/* version.h
 
 
 distclean: clean

lib/libdvd/libdvdread/README

@@ -26,7 +26,7 @@ from xine-dvdnav and went into the first version of libdvdnav.
 Where is it now?
 ----------------
 
-libdvdnav is hosted on http://www.mplayerhq.hu/MPlayer/releases/dvdnav/ .
+libdvdnav is hosted on http://dvdnav.mplayerhq.hu/ .
 Please report bugs to the developers mailinglist at
 mailto:dvdnav-discuss@mplayerhq.hu .
 

lib/libdvd/libdvdread/autogen.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
 #
-# $Id: autogen.sh 1128 2008-08-30 22:32:00Z rathann $
-#
 # run this to generate all the initial makefiles, etc.
 
 srcdir=`dirname "$0"`

lib/libdvd/libdvdread/configure.ac

@@ -13,12 +13,12 @@ dnl
 dnl These are defined in m4 so they can be passed to AC_INIT
 dnl --------------------------------------------------------------
 m4_define([dvdread_major], [4])
-m4_define([dvdread_minor], [1])
-m4_define([dvdread_sub],   [3])
+m4_define([dvdread_minor], [2])
+m4_define([dvdread_sub],   [0])
 m4_define([dvdread_pre],   [])
 
 AC_INIT([libdvdread], [dvdread_major.dvdread_minor.dvdread_sub[]dvdread_pre])
-AC_CONFIG_SRCDIR([src/dvd_reader.h])
+AC_CONFIG_SRCDIR([src/dvdread/dvd_reader.h])
 AM_INIT_AUTOMAKE([1.6])
 
 dnl create a config.h file (Automake will add -DHAVE_CONFIG_H)
@@ -35,7 +35,7 @@ AC_SUBST(DVDREAD_MINOR)
 AC_SUBST(DVDREAD_SUB)
 
 dnl The libtool version numbers (DVDREAD_LT_*); Don't even think about faking this!
-dnl 
+dnl
 dnl immediately before every release do:
 dnl ===================================
 dnl if (the interface is totally unchanged from previous release)
@@ -48,7 +48,7 @@ dnl       AGE ++;
 dnl    if (any interfaces have been _removed_ or _incompatibly changed_)
 dnl       AGE = 0;
 dnl }
-dnl 
+dnl
 dnl If you want to know more about what you are doing, here are some details:
 dnl  * DVDREAD_LT_CURRENT is the current API version
 dnl  * DVDREAD_LT_REVISION is an internal revision number which is increased when the API
@@ -145,12 +145,15 @@ case $host in
   *cygwin*)
     LDFLAGS="-no-undefined $LDFLAGS"
     ;;
+  *os2*)
+    LDFLAGS="-no-undefined -Zbin-files $LDFLAGS"
+    ;;
   *)
     AC_CHECK_LIB(c, dlopen,
-	         DYNAMIC_LD_LIBS="",
-	         AC_CHECK_LIB(dl, dlopen,
-             	              DYNAMIC_LD_LIBS="-ldl",
-	                      AC_MSG_ERROR(dynamic linker needed)))
+                 DYNAMIC_LD_LIBS="",
+                 AC_CHECK_LIB(dl, dlopen,
+                              DYNAMIC_LD_LIBS="-ldl",
+                              AC_MSG_ERROR(dynamic linker needed)))
     AC_SUBST(DYNAMIC_LD_LIBS)
     ;;
 esac
@@ -164,26 +167,6 @@ DEBUG_CFLAGS="-g -DDEBUG $CFLAGS"
 
 AC_SUBST(DEBUG_CFLAGS)
 
-dnl ---------------------------------------------
-dnl Get where .m4 should be installed.
-dnl ---------------------------------------------
-case "`id`" in
-  uid=0\(* )
-    AC_MSG_CHECKING(for aclocal directory)
-    if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-      ACLOCAL_DIR="`eval $ACLOCAL --print-ac-dir`"
-      AC_MSG_RESULT($ACLOCAL_DIR)
-    else
-      ACLOCAL_DIR="/usr/local/share/aclocal"
-      AC_MSG_RESULT(none - will be installed in $ACLOCAL_DIR)
-    fi
-    escapedprefix="`echo $prefix | sed -e 's/\\//\\\\\//g'`"
-    ACLOCAL_DIR="`echo $ACLOCAL_DIR|sed -e 's/^'$escapedprefix/'\${prefix}'/`"
-    AC_SUBST(ACLOCAL_DIR)
-    ;;
-esac
-AM_CONDITIONAL(INSTALL_M4, test x"$ACLOCAL_DIR" != "x")
-
 dnl ---------------------------------------------
 dnl Check for doxygen (dynamic documentation generator)
 dnl ---------------------------------------------
@@ -199,7 +182,7 @@ dnl ---------------------------------------------
 dnl Output configuration files
 dnl ---------------------------------------------
 AC_OUTPUT([
-Makefile 
+Makefile
 src/Makefile
 misc/Makefile
 misc/dvdread-config

lib/libdvd/libdvdread/configure2

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-dvdread_sh_version=4.1.3
+dvdread_sh_version=4.2.0
 dvdread_sh_major=`echo $dvdread_sh_version | awk -F. '{print $1}'`
 
 cc=gcc
@@ -108,7 +108,20 @@ case $targetos in
   ;;
 esac
 
-cat > config.mak << EOF 
+echo -n "Checking if we're big-endian... "
+bigendian=no
+TMPD=`mktemp -d`
+TMPC=$TMPD/endian.c
+TMPO=$TMPD/endian.o
+cat > $TMPC <<EOF
+unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
+EOF
+$cc $optimizations $cflags -c -o $TMPO $TMPC
+od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && bigendian=yes
+rm -rf $TMPD
+echo "$bigendian"
+
+cat > config.mak << EOF
 # Automatically generated by configure, do not edit
 PREFIX=$PREFIX
 libdir=$libdir
@@ -136,6 +149,7 @@ cat > config.h << EOF
 /* Automatically generated by configure, do not edit */
 #include "version.h"
 EOF
+test "$bigendian" = "yes" && echo "#define WORDS_BIGENDIAN" || echo "#undef WORDS_BIGENDIAN" >> config.h
 
 # build tree in object directory if source path is different from current one
 if test "$source_path_used" != "no"; then

lib/libdvd/libdvdread/m4/Makefile.am

@@ -2,10 +2,6 @@ include $(top_srcdir)/misc/Makefile.common
 
 EXTRA_DIST = dvdread.m4
 
-if INSTALL_M4
-m4datadir = @ACLOCAL_DIR@
-else
 m4datadir = $(datadir)/aclocal
-endif
 
 m4data_DATA = dvdread.m4

lib/libdvd/libdvdread/misc/dvdread-config.in

@@ -8,20 +8,20 @@ exec_prefix_set=no
 
 usage()
 {
-	cat <<EOF
+        cat <<EOF
 Usage: dvdnav-config [OPTIONS] [LIBRARIES]
 Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
-	[--version]
+        [--prefix[=DIR]]
+        [--exec-prefix[=DIR]]
+        [--version]
         [--libs]
-	[--cflags]
+        [--cflags]
 EOF
-	exit $1
+        exit $1
 }
 
 if test $# -eq 0; then
-	usage 1 1>&2
+        usage 1 1>&2
 fi
 
 while test $# -gt 0; do
@@ -64,11 +64,11 @@ while test $# -gt 0; do
 done
 
 if test "$echo_prefix" = "yes"; then
-	echo $prefix
+        echo $prefix
 fi
 
 if test "$echo_exec_prefix" = "yes"; then
-	echo $exec_prefix
+        echo $exec_prefix
 fi
 
 if test "$echo_cflags" = "yes"; then

lib/libdvd/libdvdread/misc/dvdread-config.sh

@@ -2,19 +2,19 @@ dvdreadlib="-ldvdread"
 
 usage()
 {
-	cat <<EOF
+        cat <<EOF
 Usage: dvdread-config [OPTIONS] [LIBRARIES]
 Options:
-	[--prefix[=DIR]]
-	[--version]
+        [--prefix[=DIR]]
+        [--version]
         [--libs]
-	[--cflags]
+        [--cflags]
 EOF
-	exit $1
+        exit $1
 }
 
 if test $# -eq 0; then
-	usage 1 1>&2
+        usage 1 1>&2
 fi
 
 while test $# -gt 0; do
@@ -44,7 +44,7 @@ while test $# -gt 0; do
 done
 
 if test "$echo_prefix" = "yes"; then
-	echo $prefix
+        echo $prefix
 fi
 
 if test "$echo_cflags" = "yes"; then
@@ -53,4 +53,4 @@ fi
 
 if test "$echo_libs" = "yes"; then
       echo -L$libdir $dvdreadlib
-fi      
+fi

lib/libdvd/libdvdread/misc/libdvdread.spec.in

@@ -1,17 +1,17 @@
-%define	prefix  @prefix@
+%define prefix  @prefix@
 %define name    @PACKAGE_NAME@
 %define ver     @PACKAGE_VERSION@
 %define rel     0
 
-Name:		%{name}
-Summary:	Low level DVD access library
-Version:	%{ver}
-Release:	%{rel}
-Group:		Development/Libraries
-Copyright:	GPL
-Url:		http://dvd.sourceforge.net/
-Source:		%{name}-%{version}.tar.gz
-Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+Name:           %{name}
+Summary:        Low level DVD access library
+Version:        %{ver}
+Release:        %{rel}
+Group:          Development/Libraries
+Copyright:      GPL
+Url:            http://dvd.sourceforge.net/
+Source:         %{name}-%{version}.tar.gz
+Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 libdvdread provides support to applications wishing to make use of basic
@@ -21,7 +21,7 @@ DVD reading features.
 %setup
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} 
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
 make
 
 %install