Upgrading to GitLab 11.11.0.

Commit b9946169 authored by Benjamin Drung's avatar Benjamin Drung

Imported Upstream version 4.2.1

parent 7340c76d
libdvdread (4.2.1)
* fix huge memory consumption when reading DVDs: "Up" and "Dark Knight"
* fix segfault when reading DVDs: "The Express", "Transformers 3"
and "Cars 2"
* fix packed structures with mingw gcc >= 4.7
libdvdread (4.2.0)
* added OS/2 support
* fixed ARM memory alignment issue
......
This diff is collapsed.
......@@ -15,6 +15,7 @@ EXTRA_DIST = autogen.sh \
libtool \
ltmain.sh \
missing \
mkinstalldirs \
README \
TODO
......@@ -22,7 +23,8 @@ MOSTLYCLEANFILES += $(PACKAGE)_$(VERSION).tar.gz \
$(distdir).tar.gz $(PACKAGE).tgz package_descriptions
MAINTAINERCLEANFILES += configure $(ACLOCAL_M4) config.h.in \
ltmain.sh config.guess config.sub install-sh missing
ltmain.sh config.guess config.sub install-sh missing \
mkinstalldirs
world:
@$(MAKE) clean all install 2> warnings.log
......
This diff is collapsed.
* Support DVDs with errors on them. So we can recover from corrupt sectors in
the .VOB. Be able to read the VAT ICB at the last sector of the UDF disk (see
function UDFGetAVDP)
* Support Random and Shuffle Titles. Only sequential Titles are currently supported.
* Support DVDs with errors on them. So we can recover from corrupt sectors in the .VOB. Also, handle corrupt .IFO files by using the backup .BUP files.
* Support Random and Shuffle Titles. Only sequencial Titles are currently supported.
* rework documentation
* implement restriction levels:
0 - execute everything as the app commands
......@@ -10,4 +8,5 @@
3 - fully respect user prohibitions
* cleanup public API and fix libtool versioning
* Update decoder.c with some of the more rare commands. Update already done to vmcmd.c
* Replace the auto* build system with a custom and clean one based on ffmpeg's (mostly done)
* RELEASE! (maybe it's time for libdvdnav 0.5?)
* Replace the auto* build system with a custom and clean one based on ffmpeg's (partly done)
This diff is collapsed.
This diff is collapsed.
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
/* Define to 1 if you have the <dvdcss/dvdcss.h> header file. */
/* #undef HAVE_DVDCSS_DVDCSS_H */
/* Define to 1 if you have the `gettimeofday' function. */
/* #undef HAVE_GETTIMEOFDAY */
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the `dvdcss' library (-ldvdcss). */
/* #undef HAVE_LIBDVDCSS */
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#define LT_OBJDIR ".libs/"
/* Name of package */
#define PACKAGE "libdvdread"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
/* Define to the full name of this package. */
#define PACKAGE_NAME "libdvdread"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "libdvdread 4.2.0"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libdvdread"
/* Define to the home page for this package. */
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION "4.2.0"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* "Define to 1 to use builtin dlfcn" */
/* #undef USING_BUILTIN_DLFCN */
/* Version number of package */
#define VERSION "4.2.0"
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
# endif
#else
# ifndef WORDS_BIGENDIAN
/* # undef WORDS_BIGENDIAN */
# endif
#endif
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
/* #undef inline */
#endif
/* Define to `long int' if <sys/types.h> does not define. */
/* #undef off_t */
/* Define to `unsigned int' if <sys/types.h> does not define. */
/* #undef size_t */
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the <dvdcss/dvdcss.h> header file. */
#undef HAVE_DVDCSS_DVDCSS_H
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the `dvdcss' library (-ldvdcss). */
#undef HAVE_LIBDVDCSS
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* "Define to 1 to use builtin dlfcn" */
#undef USING_BUILTIN_DLFCN
/* Version number of package */
#undef VERSION
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
# endif
#else
# ifndef WORDS_BIGENDIAN
# undef WORDS_BIGENDIAN
# endif
#endif
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
#undef inline
#endif
/* Define to `long int' if <sys/types.h> does not define. */
#undef off_t
/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -14,7 +14,7 @@ dnl These are defined in m4 so they can be passed to AC_INIT
dnl --------------------------------------------------------------
m4_define([dvdread_major], [4])
m4_define([dvdread_minor], [2])
m4_define([dvdread_sub], [0])
m4_define([dvdread_sub], [1])
m4_define([dvdread_pre], [])
AC_INIT([libdvdread], [dvdread_major.dvdread_minor.dvdread_sub[]dvdread_pre])
......@@ -138,31 +138,9 @@ esac
dnl ---------------------------------------------
dnl dynamic linker
dnl ---------------------------------------------
AC_ARG_ENABLE([libdvdcss], [ --enable-libdvdcss force linking against libdvdcss])
AC_ARG_ENABLE([dlfcn],
[AS_HELP_STRING([--enable-dlfcn],
[use builtin dlfcn for mingw (default is auto)])],
[use_builtin_dlfcn=$enableval],
[use_builtin_dlfcn=no])
if [[ $use_builtin_dlfcn = "yes" ]]; then
AC_DEFINE([USING_BUILTIN_DLFCN], [1], ["Define to 1 to use builtin dlfcn"])
fi
CSS_LIBS=""
if test x"$enable_libdvdcss" != xyes; then
dnl dlopen libdvdcss
case $host in
*mingw32*)
if [[ $use_builtin_dlfcn = "no" ]]; then
AC_CHECK_LIB(c, dlopen,
DYNAMIC_LD_LIBS="",
AC_CHECK_LIB(dl, dlopen,
DYNAMIC_LD_LIBS="-ldl",
AC_MSG_WARN(Using builtin dlopen)))
AC_SUBST(DYNAMIC_LD_LIBS)
fi
CFLAGS="-idirafter \$(top_srcdir)/msvc/include $CFLAGS"
LDFLAGS="-no-undefined $LDFLAGS"
;;
*cygwin*)
......@@ -180,19 +158,6 @@ case $host in
AC_SUBST(DYNAMIC_LD_LIBS)
;;
esac
else
dnl link with libdvdcss
CSS_LIBS=-ldvdcss
case "${host}" in
*darwin*) CSS_LIBS="${CSS_LIBS} -Wl,-framework,CoreFoundation -Wl,-framework,IOKit"
;;
esac
AC_CHECK_LIB(dvdcss, dvdcss_interface_2,, AC_MSG_ERROR(You need libdvdcss.so.2 or later))
AC_CHECK_HEADERS(dvdcss/dvdcss.h,, AC_MSG_ERROR(You need libdvdcss (dvdcss.h)))
fi
AC_SUBST(CSS_LIBS)
dnl ---------------------------------------------
dnl cflags
......
#!/bin/sh
dvdread_sh_version=4.2.0
dvdread_sh_version=4.2.1
dvdread_sh_major=`echo $dvdread_sh_version | awk -F. '{print $1}'`
cc=gcc
......@@ -96,7 +96,7 @@ PREFIX=`cd $PREFIX && pwd`
test -z "$libdir" && libdir=$PREFIX/lib
test -z "$shlibdir" && shlibdir=$PREFIX/lib
test -z "$incdir" && incdir=$PREFIX/include/dvdread
test -z "$incdir" && dvdread_incdir=$PREFIX/include/dvdread
targetos=`uname -s`
case $targetos in
......@@ -121,12 +121,25 @@ od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && bigendian=yes
rm -rf $TMPD
echo "$bigendian"
echo -n "Checking for -mno-ms-bitfields flag support... "
no_ms_bitfields=no
TMPD=`mktemp -d`
TMPC=$TMPD/no_ms_bitfields.c
TMPO=$TMPD/no_ms_bitfields.o
cat > $TMPC <<EOF
int main(void) { return 0; }
EOF
$cc $optimizations $cflags -mno-ms-bitfields -c -o $TMPO $TMPC && no_ms_bitfields=yes && cflags="$cflags -mno-ms-bitfields"
rm -rf $TMPD
echo "$no_ms_bitfields"
cat > config.mak << EOF
# Automatically generated by configure, do not edit
PREFIX=$PREFIX
libdir=$libdir
shlibdir=$shlibdir
incdir=$incdir
dvdread_incdir=$dvdread_incdir
BUILD_SHARED=$SHARED
BUILD_STATIC=$STATIC
SHLIB_VERSION=$dvdread_sh_version
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
#!/bin/sh
#
#
prefix=/usr/local
exec_prefix=${prefix}
exec_prefix_set=no
usage()
{
cat <<EOF
Usage: dvdnav-config [OPTIONS] [LIBRARIES]
Options:
[--prefix[=DIR]]
[--exec-prefix[=DIR]]
[--version]
[--libs]
[--cflags]
EOF
exit $1
}
if test $# -eq 0; then
usage 1 1>&2
fi
while test $# -gt 0; do
case "$1" in
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
*) optarg= ;;
esac
case $1 in
--prefix=*)
prefix=$optarg
if test $exec_prefix_set = no ; then
exec_prefix=$optarg
fi
;;
--prefix)
echo_prefix=yes
;;
--exec-prefix=*)
exec_prefix=$optarg
exec_prefix_set=yes
;;
--exec-prefix)
echo_exec_prefix=yes
;;
--version)
echo 4.2.0
;;
--cflags)
echo_cflags=yes
;;
--libs)
echo_libs=yes
;;
*)
usage 1 1>&2
;;
esac
shift
done
if test "$echo_prefix" = "yes"; then
echo $prefix
fi
if test "$echo_exec_prefix" = "yes"; then
echo $exec_prefix
fi
if test "$echo_cflags" = "yes"; then
echo -I${prefix}/include
fi
if test "$echo_libs" = "yes"; then
echo -L${exec_prefix}/lib -ldvdread
fi
prefix=/usr/local
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: libdvdread
Description: Low level DVD access library
Version: 4.2.0
Cflags: -I${includedir}
Libs: -L${libdir} -ldvdread
......@@ -8,4 +8,4 @@ Description: Low level DVD access library
Version: @VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -ldvdread @CSS_LIBS@
Libs: -L${libdir} -ldvdread
%define prefix /usr/local
%define name libdvdread
%define ver 4.2.0
%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
%description
libdvdread provides support to applications wishing to make use of basic
DVD reading features.
%prep
%setup
%build
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
make
%install
rm -rf $RPM_BUILD_ROOT
make install-strip DESTDIR=$RPM_BUILD_ROOT
%clean
rm -r $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING INSTALL README
%{prefix}/bin/dvdread-config
%{prefix}/lib/libdvdread*.la
%{prefix}/lib/libdvdread*.so.*
%{prefix}/lib/libdvdread*.so
%{prefix}/include/libdvdread/*
@INSTALL_M4_TRUE@@ACLOCAL_DIR@/dvdread.m4
%changelog
* Sun Mar 18 2002 Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
- Add missing files. Fix rpm generation.
* Tue Mar 12 2002 Rich Wareham <richwareham@users.sourceforge.net>
- Canabalisation to form libdvdnav spec file.
* Sun Sep 09 2001 Thomas Vander Stichele <thomas@apestaart.org>
- first spec file
This diff is collapsed.
This diff is collapsed.
......@@ -9,8 +9,8 @@
#include <string.h>
#include <stdio.h>
#include "../include/dlfcn.h"
#include "../include/os_types.h"
#include "dlfcn.h"
#include "os_types.h"
void *dlopen(const char *module_name, int mode)
{
......
This diff is collapsed.
......@@ -8,9 +8,9 @@ lib_LTLIBRARIES = libdvdread.la
libdvdread_la_SOURCES = dvd_reader.c nav_read.c ifo_read.c \
dvd_input.c dvd_udf.c md5.c nav_print.c ifo_print.c bitreader.c \
bswap.h dvd_input.h dvdread_internal.h md5.h
bswap.h dvd_input.h dvdread_internal.h dvd_udf.h md5.h bitreader.h
libdvdread_la_LIBADD = $(DYNAMIC_LD_LIBS) @CSS_LIBS@
libdvdread_la_LIBADD = $(DYNAMIC_LD_LIBS)
libdvdread_la_LDFLAGS = -version-info $(DVDREAD_LT_CURRENT):$(DVDREAD_LT_REVISION):$(DVDREAD_LT_AGE) \
-export-symbols-regex "(^dvd.*|^nav.*|^ifo.*|^DVD.*|^UDF.*)"
......
This diff is collapsed.
......@@ -67,12 +67,6 @@
#define B2N_32(x) x = be32toh(x)
#define B2N_64(x) x = be64toh(x)
#elif defined(__QNXNTO__)
#include <gulliver.h>
#define B2N_16(x) x = ENDIAN_RET16(x)
#define B2N_32(x) x = ENDIAN_RET32(x)
#define B2N_64(x) x = ENDIAN_RET64(x)
/* This is a slow but portable implementation, it has multiple evaluation
* problems so beware.
* Old FreeBSD's and Solaris don't have <byteswap.h> or any other such
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
timestamp for config.h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment