Upgrading to GitLab 11.11.0.

Commit 2ab5885b authored by Matteo F. Vescovi's avatar Matteo F. Vescovi

New upstream version 6.0.0

parent 08abdfe1
commit 95fdbe8337d2ff31dcfb68f35f3e4441dc27d92f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date: Sun Jan 14 10:45:31 2018 +0100
Update NEWS
commit 230d8c8140316f1633cb48c11870938d5784b5b7
Author: Pierre Lamot <pierre@videolabs.io>
Date: Tue Jan 9 15:52:17 2018 +0100
Don't abort if PGCN or PCN == 0 when reading VTS_PTT_SRPT
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit 26cc345d57a2660fe2bfdb25be099ede233d7d48
Author: Pierre Lamot <pierre@videolabs.io>
Date: Tue Jan 9 15:52:16 2018 +0100
Update incomplete structures
From the spec.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit 22f0cd7398da14b85bdb20eef81309ad30ec8da8
Author: Pierre Lamot <pierre@videolabs.io>
Date: Tue Jan 9 15:52:15 2018 +0100
Don't abort if PGC structure can't be read.
Some DVD contains unused invalids PGC (ie: inaccessible location).
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit 7433fb130827ada0e09a6b123b8a1df4fdf6bb40
Author: Pierre Lamot <pierre@videolabs.io>
Date: Tue Jan 9 15:52:14 2018 +0100
Provide compatibility with media having incomplete TT_SRPT and PTT_SRPT
Some media don't provide the last byte field in "Title Search Pointer Table"
(TT_SRPT) and "Video Title Set Part of Title Search Pointer Table"
(VST_PTT_SRPT)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit 74853950580354f0fba0e8bbae643068da9c3fb7
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon Jan 8 18:28:22 2018 +0100
Update NEWS for 6.0
commit 5ec409508803037dfa931591aef93851458d1d2a
Author: Lawrence D'Oliveiro <ldo@geek-central.gen.nz>
Date: Fri Feb 19 16:16:09 2016 +0100
Restrict Exported Symbols To Those Currently Declared In Public Includes
The shared library currently exports the symbols “dvdinput_close”,
“dvdinput_open”, “dvdinput_read”, “dvdinput_seek”,
“dvdinput_setup” and “dvdinput_title”, even though these are not
currently declared in any of the public include files.
This restricts the export-symbols-regex to stop exporting these.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit 494311d309441846eae697f915b61d2980bfa69d
Author: Petri Hintukainen <phintuka@gmail.com>
Date: Wed Oct 14 20:49:55 2015 +0300
Remove unused dvdinput_error()
commit d52ac0a705e6969862d94b94729854108b7eb4b4
Author: Petri Hintukainen <phintuka@gmail.com>
Date: Wed Oct 14 14:03:33 2015 +0300
Remove redundant redeclaration of InternalUDFReadBlocksRaw
commit 54c4660e7592e6f8e30d205b117dfc9b1e3997be
Author: Petri Hintukainen <phintuka@gmail.com>
Date: Thu Sep 24 14:02:23 2015 +0300
dvdinput_close(): fix leak in error path
Memory should be freed even if DVDCSS_close() or close() returns an error.
Error return value is only for diagnostics; those functions can't be called again.
=> dvdinput_close() can't be called again.
commit 32c6f60f29875a7ee05817ee81107bb5ca0ea7ae
Author: Petri Hintukainen <phintuka@gmail.com>
Date: Thu Sep 24 14:01:51 2015 +0300
Use NULL when comparing pointer
commit 5e2ffa4bd2f260cd68e064ada27aa21b042f8856
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed Sep 9 12:19:22 2015 +0200
Update NEWS
commit d056043f4ba26944163c404421077ebfe3c8c60f
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed Sep 9 12:17:46 2015 +0200
Next major version will be 6.0.0
Bump version to 5.90.0 for now
commit 511ac9c8199d7b604d6a65193fd2777b74fad776
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed Sep 9 09:51:03 2015 +0200
Prepare for 5.0.4
commit 105aa319b085b3eb4f67de80cb41af27e0f2fe0f
Author: Petri Hintukainen <phintuka@gmail.com>
Date: Mon Sep 7 14:46:31 2015 +0300
configure: generate version.h
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit 752bbae6bc7b517f9819d182a2e3ddca44b112d8
Author: Petri Hintukainen <phintuka@gmail.com>
Date: Wed Sep 9 10:12:29 2015 +0300
DVDReadBytes(): Check that requested size fits in ssize_t
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit 1d4a5ceef8e32659ae61fff4244d346c9f3453aa
Author: Petri Hintukainen <phintuka@gmail.com>
Date: Wed Sep 9 10:11:16 2015 +0300
sprintf -> strcpy
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit 08d1ca695b55121bb0e7e82e0fa21028196141a5
Author: Petri Hintukainen <phintuka@gmail.com>
Date: Wed Sep 9 10:10:26 2015 +0300
Add const
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit 7247a1995bf8cb33fb716eab9dd57ad2a90a083e
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date: Tue Sep 1 15:40:18 2015 +0200
Next version will be 5.0.4 (+ NEWS)
commit 46ef934304b3a326615ae6dafc63b337f2f2628f
Author: Petri Hintukainen <phintuka@gmail.com>
Date: Wed May 20 13:41:57 2015 +0300
Use calloc
Remove redundant initializations to 0.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit 75c0cae2f32be6d7b076818571341dde83c1771b
Author: Petri Hintukainen <phintuka@gmail.com>
Date: Wed May 20 13:41:38 2015 +0300
Use correct constant
TITLES_MAX was used as length of string "/video_ts".
There's no relation between these two constants.
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit a0b8b3e4e1e95131430149c24c75d19fb8219087
Author: Petri Hintukainen <phintuka@gmail.com>
Date: Wed May 20 13:41:01 2015 +0300
Fix possible buffer overflow
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit 2b77f469eb511b8f43e8f9b10a3b57685ec1ff3c
Author: Petri Hintukainen <phintuka@gmail.com>
Date: Wed May 20 13:40:27 2015 +0300
Cosmetics
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit 4e269e52103a0422a3954ecc2f1901dec5fb4f0d
Author: Petri Hintukainen <phintuka@gmail.com>
Date: Sun Mar 29 22:21:31 2015 +0300
Fix write after free
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
commit 2b8f60f0c4efd85f17116a5443851d4bb4a288b7
Author: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed Mar 25 14:55:05 2015 +0100
......@@ -970,7 +1168,7 @@ Date: Mon Nov 18 23:43:16 2013 +0000
The memory is allocated in
if((cached_dir_base = malloc(dir_lba * DVD_VIDEO_LB_LEN + 2048)) == NULL)
if((cached_dir_base = malloc(dir_lba * DVD_VIDEO_LB_LEN + 2048)) == NULL)
and has to be freed before returning from the function.
......
ACLOCAL_AMFLAGS = -Im4
AM_CPPFLAGS = -I$(top_srcdir)/src $(CSS_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/dvdread $(CSS_CFLAGS)
dist_doc_DATA = AUTHORS ChangeLog COPYING NEWS README TODO
......@@ -34,7 +34,7 @@ libdvdread_la_SOURCES = \
libdvdread_la_LIBADD = $(CSS_LIBS)
libdvdread_la_LDFLAGS = -version-info $(DVDREAD_LTVERSION) \
-export-symbols-regex "(^dvd.*|^nav.*|^ifo.*|^DVD.*|^UDF.*)"
-export-symbols-regex "(^dvdread.*|^nav.*|^ifo.*|^DVD.*|^UDF.*)"
pkgincludedir = $(includedir)/dvdread
pkginclude_HEADERS = \
......@@ -46,7 +46,8 @@ pkginclude_HEADERS = \
src/dvdread/ifo_types.h \
src/dvdread/nav_print.h \
src/dvdread/nav_read.h \
src/dvdread/nav_types.h
src/dvdread/nav_types.h \
src/dvdread/version.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = misc/dvdread.pc
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -104,7 +104,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = doc/doxygen.cfg misc/dvdread.pc
CONFIG_CLEAN_FILES = doc/doxygen.cfg misc/dvdread.pc \
src/dvdread/version.h
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
......@@ -217,9 +218,10 @@ CSCOPE = cscope
AM_RECURSIVE_TARGETS = cscope
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/doc/doxygen.cfg.in \
$(top_srcdir)/misc/dvdread.pc.in AUTHORS COPYING ChangeLog \
NEWS README TODO compile config.guess config.sub depcomp \
install-sh ltmain.sh missing
$(top_srcdir)/misc/dvdread.pc.in \
$(top_srcdir)/src/dvdread/version.h.in AUTHORS COPYING \
ChangeLog NEWS README TODO compile config.guess config.sub \
depcomp install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -262,6 +264,9 @@ DOXYGEN = @DOXYGEN@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
DVDREAD_LTVERSION = @DVDREAD_LTVERSION@
DVDREAD_VERSION_MAJOR = @DVDREAD_VERSION_MAJOR@
DVDREAD_VERSION_MICRO = @DVDREAD_VERSION_MICRO@
DVDREAD_VERSION_MINOR = @DVDREAD_VERSION_MINOR@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
......@@ -354,6 +359,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -363,7 +369,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -Im4
AM_CPPFLAGS = -I$(top_srcdir)/src $(CSS_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/dvdread $(CSS_CFLAGS)
dist_doc_DATA = AUTHORS ChangeLog COPYING NEWS README TODO
MAINTAINERCLEANFILES = ChangeLog
EXTRA_DIST = msvc/ doc/footer.html doc/header.html
......@@ -385,7 +391,7 @@ libdvdread_la_SOURCES = \
libdvdread_la_LIBADD = $(CSS_LIBS)
libdvdread_la_LDFLAGS = -version-info $(DVDREAD_LTVERSION) \
-export-symbols-regex "(^dvd.*|^nav.*|^ifo.*|^DVD.*|^UDF.*)"
-export-symbols-regex "(^dvdread.*|^nav.*|^ifo.*|^DVD.*|^UDF.*)"
pkginclude_HEADERS = \
src/dvdread/bitreader.h \
......@@ -396,7 +402,8 @@ pkginclude_HEADERS = \
src/dvdread/ifo_types.h \
src/dvdread/nav_print.h \
src/dvdread/nav_read.h \
src/dvdread/nav_types.h
src/dvdread/nav_types.h \
src/dvdread/version.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = misc/dvdread.pc
......@@ -457,6 +464,8 @@ doc/doxygen.cfg: $(top_builddir)/config.status $(top_srcdir)/doc/doxygen.cfg.in
cd $(top_builddir) && $(SHELL) ./config.status $@
misc/dvdread.pc: $(top_builddir)/config.status $(top_srcdir)/misc/dvdread.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
src/dvdread/version.h: $(top_builddir)/config.status $(top_srcdir)/src/dvdread/version.h.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
......@@ -725,7 +734,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
......@@ -750,7 +759,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
......@@ -768,7 +777,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
......@@ -778,7 +787,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......
libdvdread (6.0.0)
* restrict the number of symbols to be exposed to the shared-object
* remove dvdinput_error function
* improve compatibility with some DVDs (notably the eOne ones)
* fix write after free in ifoFree functions
* fix possible buffer overflow in open
* additional checks on DVDReadBytes arguments
* fix leaks
libdvdread (5.0.3)
* Cache IFO and BUP files (only for ImageFiles) in order to reduce the number
* cache IFO and BUP files (only for ImageFiles) in order to reduce the number
of read/seek access
* Fix compilation warnings for OS/2
* fix compilation warnings for OS/2
libdvdread (5.0.2)
* Add DVDOpenStream to open a dvd from a set of callbacks
* add DVDOpenStream to open a dvd from a set of callbacks
libdvdread (5.0.1)
* support DragonFly BSD bswap
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
AC_INIT(libdvdread, 5.0.3)
dnl library version number
m4_define([dvdread_major], 6)
m4_define([dvdread_minor], 0)
m4_define([dvdread_micro], 0)
m4_define([dvdread_version],[dvdread_major.dvdread_minor.dvdread_micro])
AC_INIT(libdvdread, dvdread_version)
AC_CONFIG_SRCDIR([src/dvd_reader.c])
AC_PREREQ(2.53)
......@@ -105,6 +112,14 @@ AS_IF([test "x$ac_cv_c_compiler_gnu" = "xyes"], [
AC_DEFINE([UNUSED], [], [Unused parameter annotation])
])
dnl export library version number
DVDREAD_VERSION_MAJOR=dvdread_major()
DVDREAD_VERSION_MINOR=dvdread_minor()
DVDREAD_VERSION_MICRO=dvdread_micro()
AC_SUBST(DVDREAD_VERSION_MAJOR)
AC_SUBST(DVDREAD_VERSION_MINOR)
AC_SUBST(DVDREAD_VERSION_MICRO)
dnl ---------------------------------------------
dnl Output configuration files
dnl ---------------------------------------------
......@@ -112,4 +127,5 @@ AC_OUTPUT([
Makefile
doc/doxygen.cfg
misc/dvdread.pc
src/dvdread/version.h
])
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2013-05-30.07; # UTC
scriptversion=2016-01-11.22; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......@@ -786,6 +786,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2013-12-25.23; # UTC
scriptversion=2014-09-12.12; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
......@@ -324,34 +324,41 @@ do
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
# $RANDOM is not portable (e.g. dash); use it when possible to
# lower collision chance
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
# As "mkdir -p" follows symlinks and we work in /tmp possibly; so
# create the $tmpdir first (and fail if unsuccessful) to make sure
# that nobody tries to guess the $tmpdir name.
if (umask $mkdir_umask &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
$mkdirprog $mkdir_mode "$tmpdir" &&
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
test_tmpdir="$tmpdir/a"
ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
$mkdirprog -m$different_mode -p -- "$tmpdir" && {
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
$mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
rmdir "$tmpdir/d" "$tmpdir"
rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
trap '' 0;;
esac;;
......
......@@ -31,7 +31,7 @@
PROGRAM=libtool
PACKAGE=libtool
VERSION=2.4.6
VERSION="2.4.6 Debian-2.4.6-2"
package_revision=2.4.6
......@@ -2068,12 +2068,12 @@ include the following information:
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
version: $progname (GNU libtool) 2.4.6
version: $progname $scriptversion Debian-2.4.6-2
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
Report bugs to <bug-libtool@gnu.org>.
GNU libtool home page: <http://www.gnu.org/software/libtool/>.
GNU libtool home page: <http://www.gnu.org/s/libtool/>.
General help using GNU software: <http://www.gnu.org/gethelp/>."
exit 0
}
......@@ -7272,10 +7272,13 @@ func_mode_link ()
# -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
# -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang
# -fsanitize=* Clang/GCC memory and address sanitizer
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-specs=*|-fsanitize=*)
func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
func_append compile_command " $arg"
......@@ -7568,7 +7571,10 @@ func_mode_link ()
case $pass in
dlopen) libs=$dlfiles ;;
dlpreopen) libs=$dlprefiles ;;
link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
link)
libs="$deplibs %DEPLIBS%"
test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
;;
esac
fi
if test lib,dlpreopen = "$linkmode,$pass"; then
......@@ -7887,19 +7893,19 @@ func_mode_link ()
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
func_append tmp_libs " $deplib"
done
elif test prog != "$linkmode" && test lib != "$linkmode"; then
func_fatal_error "'$lib' is not a convenience library"
fi
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
fi
func_append tmp_libs " $deplib"
done
continue
fi # $pass = conv
......@@ -8823,6 +8829,9 @@ func_mode_link ()
revision=$number_minor
lt_irix_increment=no
;;
*)
func_fatal_configuration "$modename: unknown library version type '$version_type'"
;;
esac
;;
no)
......
......@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
......@@ -2887,6 +2886,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
dynamic_linker='GNU/Linux ld.so'
;;
netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
version_type=sunos
need_lib_prefix=no
......@@ -3546,7 +3557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
netbsd*)
netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
......@@ -4424,7 +4435,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
netbsd*)
netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
......@@ -4936,6 +4947,9 @@ m4_if([$1], [CXX], [
;;
esac
;;
linux* | k*bsd*-gnu | gnu*)
_LT_TAGVAR(link_all_deplibs, $1)=no
;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
......@@ -4998,6 +5012,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
openbsd* | bitrig*)
with_gnu_ld=no
;;
linux* | k*bsd*-gnu | gnu*)
_LT_TAGVAR(link_all_deplibs, $1)=no
;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
......@@ -5252,7 +5269,7 @@ _LT_EOF
fi
;;
netbsd*)
netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
......@@ -5773,6 +5790,7 @@ _LT_EOF
if test yes = "$lt_cv_irix_exported_symbol"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
_LT_TAGVAR(link_all_deplibs, $1)=no
else
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
......@@ -5794,7 +5812,7 @@ _LT_EOF
esac
;;
netbsd*)
netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
......
......@@ -35,7 +35,6 @@ int (*dvdinput_close) (dvd_input_t);
int (*dvdinput_seek) (dvd_input_t, int);
int (*dvdinput_title) (dvd_input_t, int);
int (*dvdinput_read) (dvd_input_t, void *, int, int);
char * (*dvdinput_error) (dvd_input_t);
#ifdef HAVE_DVDCSS_DVDCSS_H
/* linking to libdvdcss */
......@@ -46,18 +45,17 @@ char * (*dvdinput_error) (dvd_input_t);
# define DVDcss_close dvdcss_close
# define DVDcss_seek dvdcss_seek
# define DVDcss_read dvdcss_read
# define DVDcss_error dvdcss_error
#else
/* dlopening libdvdcss */
# if defined(HAVE_DLFCN_H) && !defined(USING_BUILTIN_DLFCN)
# include <dlfcn.h>
# else
# if defined(WIN32)
# if defined(WIN32)
/* Only needed on MINGW at the moment */
# include "../msvc/contrib/dlfcn.c"
# include "../msvc/contrib/dlfcn.c"
# endif
# endif
#endif
typedef struct dvdcss_s *dvdcss_t;
typedef struct dvdcss_stream_cb dvdcss_stream_cb;
......@@ -66,7 +64,6 @@ static dvdcss_t (*DVDcss_open) (const char *);
static int (*DVDcss_close) (dvdcss_t);
static int (*DVDcss_seek) (dvdcss_t, int, int);
static int (*DVDcss_read) (dvdcss_t, void *, int, int);
static char * (*DVDcss_error) (dvdcss_t);
#define DVDCSS_SEEK_KEY (1 << 1)
#endif
......@@ -107,7 +104,7 @@ static dvd_input_t css_open(const char *target,
NULL;
#endif
}
if(dev->dvdcss == 0) {
if(dev->dvdcss == NULL) {
fprintf(stderr, "libdvdread: Could not open %s with libdvdcss.\n", target);
free(dev);
return NULL;
......@@ -116,14 +113,6 @@ static dvd_input_t css_open(const char *target,
return dev;
}
/**
* return the last error message
*/
static char *css_error(dvd_input_t dev)
{
return DVDcss_error(dev->dvdcss);
}
/**
* seek into the device.
*/
......@@ -158,12 +147,9 @@ static int css_close(dvd_input_t dev)
ret = DVDcss_close(dev->dvdcss);
if(ret < 0)
return ret;
free(dev);
return 0;
return ret;
}
/**
......@@ -199,15 +185,6 @@ static dvd_input_t file_open(const char *target,
return dev;
}
/**
* return the last error message
*/
static char *file_error(dvd_input_t dev UNUSED)
{
/* use strerror(errno)? */
return (char *)"unknown error";
}
/**
* seek into the device.
*/
......@@ -278,12 +255,9 @@ static int file_close(dvd_input_t dev)
ret = close(dev->fd);
if(ret < 0)
return ret;
free(dev);
return 0;
return ret;
}
......@@ -328,8 +302,6 @@ int dvdinput_setup(void)
dlsym(dvdcss_library, U_S "dvdcss_seek");
DVDcss_read = (int (*)(dvdcss_t, void*, int, int))
dlsym(dvdcss_library, U_S "dvdcss_read");