diff -Nru libbluray-0.8.1/aclocal.m4 libbluray-1.0.1/aclocal.m4 --- libbluray-0.8.1/aclocal.m4 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/aclocal.m4 2017-06-23 13:35:15.000000000 +0000 @@ -0,0 +1,1160 @@ +# generated automatically by aclocal 1.15 -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.15' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.15], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.15])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) + +# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) + +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([m4/attributes.m4]) +m4_include([m4/ax_prog_doxygen.m4]) +m4_include([m4/libtool.m4]) +m4_include([m4/ltoptions.m4]) +m4_include([m4/ltsugar.m4]) +m4_include([m4/ltversion.m4]) +m4_include([m4/lt~obsolete.m4]) +m4_include([m4/pkg.m4]) diff -Nru libbluray-0.8.1/bootstrap libbluray-1.0.1/bootstrap --- libbluray-0.8.1/bootstrap 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/bootstrap 2017-06-23 13:35:19.000000000 +0000 @@ -1,3 +1,7 @@ #!/bin/sh +set -e + +cd "$(dirname "$0")" + autoreconf -vif diff -Nru libbluray-0.8.1/build-aux/compile libbluray-1.0.1/build-aux/compile --- libbluray-0.8.1/build-aux/compile 2015-09-02 11:11:20.000000000 +0000 +++ libbluray-1.0.1/build-aux/compile 2017-06-23 13:35:15.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff -Nru libbluray-0.8.1/build-aux/config.guess libbluray-1.0.1/build-aux/config.guess --- libbluray-0.8.1/build-aux/config.guess 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/build-aux/config.guess 2017-06-23 13:35:15.000000000 +0000 @@ -0,0 +1,1462 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright 1992-2016 Free Software Foundation, Inc. + +timestamp='2016-10-02' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. +# +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# +# Please send patches to . + + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright 1992-2016 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently (or will in the future) and ABI. + case "${UNAME_MACHINE_ARCH}" in + earm*) + os=netbsdelf + ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}${abi}" + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE=alpha ;; + "EV4.5 (21064)") + UNAME_MACHINE=alpha ;; + "LCA4 (21066/21068)") + UNAME_MACHINE=alpha ;; + "EV5 (21164)") + UNAME_MACHINE=alphaev5 ;; + "EV5.6 (21164A)") + UNAME_MACHINE=alphaev56 ;; + "EV5.6 (21164PC)") + UNAME_MACHINE=alphapca56 ;; + "EV5.7 (21164PC)") + UNAME_MACHINE=alphapca57 ;; + "EV6 (21264)") + UNAME_MACHINE=alphaev6 ;; + "EV6.7 (21264A)") + UNAME_MACHINE=alphaev67 ;; + "EV6.8CB (21264C)") + UNAME_MACHINE=alphaev68 ;; + "EV6.8AL (21264B)") + UNAME_MACHINE=alphaev68 ;; + "EV6.8CX (21264D)") + UNAME_MACHINE=alphaev68 ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE=alphaev69 ;; + "EV7 (21364)") + UNAME_MACHINE=alphaev7 ;; + "EV7.9 (21364A)") + UNAME_MACHINE=alphaev79 ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH=i386 + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH=x86_64 + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = hppa2.0w ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH=hppa2.0w + else + HP_ARCH=hppa64 + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + *:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + frv:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configure will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = x86; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = 386; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; +esac + +cat >&2 </dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -Nru libbluray-0.8.1/build-aux/config.sub libbluray-1.0.1/build-aux/config.sub --- libbluray-0.8.1/build-aux/config.sub 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/build-aux/config.sub 2017-06-23 13:35:15.000000000 +0000 @@ -0,0 +1,1825 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright 1992-2016 Free Software Foundation, Inc. + +timestamp='2016-11-04' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). + + +# Please send patches to . +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright 1992-2016 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | ba \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ + | pyramid \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | we32k \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | ba-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | e2k-* | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ + | pyramid-* \ + | riscv32-* | riscv64-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + asmjs) + basic_machine=asmjs-unknown + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc | ppcbe) basic_machine=powerpc-unknown + ;; + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; + -ios) + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -Nru libbluray-0.8.1/build-aux/depcomp libbluray-1.0.1/build-aux/depcomp --- libbluray-0.8.1/build-aux/depcomp 2015-09-02 11:11:20.000000000 +0000 +++ libbluray-1.0.1/build-aux/depcomp 2017-06-23 13:35:15.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 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 diff -Nru libbluray-0.8.1/build-aux/install-sh libbluray-1.0.1/build-aux/install-sh --- libbluray-0.8.1/build-aux/install-sh 2015-09-02 11:11:20.000000000 +0000 +++ libbluray-1.0.1/build-aux/install-sh 2017-06-23 13:35:15.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # 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 @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,81 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/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"` - 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"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # 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/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 && + $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. + 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 -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +377,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +456,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +474,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff -Nru libbluray-0.8.1/build-aux/ltmain.sh libbluray-1.0.1/build-aux/ltmain.sh --- libbluray-0.8.1/build-aux/ltmain.sh 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/build-aux/ltmain.sh 2017-06-23 13:35:15.000000000 +0000 @@ -0,0 +1,11156 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 + +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit , 1996 + +# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +PROGRAM=libtool +PACKAGE=libtool +VERSION="2.4.6 Debian-2.4.6-2" +package_revision=2.4.6 + + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# 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 +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac +fi + +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +do + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" + fi" +done + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" + +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + + +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. + +: ${CP="cp -f"} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} +: ${MAKE="make"} +: ${MKDIR="mkdir"} +: ${MV="mv -f"} +: ${RM="rm -f"} +: ${SHELL="${CONFIG_SHELL-/bin/sh}"} + + +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## + +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' + +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' + +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" + + +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. + +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. + +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: + +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 + +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` + +# Make sure we have an absolute progpath for reexecution: +case $progpath in + [\\/]*|[A-Za-z]:\\*) ;; + *[\\/]*) + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` + progdir=`cd "$progdir" && pwd` + progpath=$progdir/$progname + ;; + *) + _G_IFS=$IFS + IFS=${PATH_SEPARATOR-:} + for progdir in $PATH; do + IFS=$_G_IFS + test -x "$progdir/$progname" && break + done + IFS=$_G_IFS + test -n "$progdir" || progdir=`pwd` + progpath=$progdir/$progname + ;; +esac + + +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. + +opt_dry_run=false +opt_quiet=false +opt_verbose=false + +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } + + require_term_colors=: +} + + +## ----------------- ## +## Function library. ## +## ----------------- ## + +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. + + +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. + + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd + + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- +# Check whether EXPRESSION matches any line of FILENAME, without output. +func_grep () +{ + $debug_cmd + + $GREP "$1" "$2" >/dev/null 2>&1 +} + + +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- +# Make sure the entire path to DIRECTORY-PATH is available. +func_mkdir_p () +{ + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= + + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then + + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; + esac + + # While some portion of DIR does not yet exist... + while test ! -d "$_G_directory_path"; do + # ...make a list in topmost first order. Use a colon delimited + # list incase some portion of path contains whitespace. + _G_dir_list=$_G_directory_path:$_G_dir_list + + # If the last portion added has no slash in it, the list is done + case $_G_directory_path in */*) ;; *) break ;; esac + + # ...otherwise throw away the child directory and loop + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` + done + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` + + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes + # try to create one of the directories concurrently. Don't + # stop in that case! + $MKDIR "$_G_dir" 2>/dev/null || : + done + IFS=$func_mkdir_p_IFS + + # Bail out if we (or some other process) failed to create a directory. + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" + fi +} + + +# func_mktempdir [BASENAME] +# ------------------------- +# Make a temporary directory that won't clash with other running +# libtool processes, and avoids race conditions if possible. If +# given, BASENAME is the basename for that directory. +func_mktempdir () +{ + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} + + if test : = "$opt_dry_run"; then + # Return a directory name, but don't create it in dry-run mode + _G_tmpdir=$_G_template-$$ + else + + # If mktemp works, use that first and foremost + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` + + if test ! -d "$_G_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_tr_sh +# ---------- +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd + + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} + + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} + + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result +} + + +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () +{ + $debug_cmd + + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result +} + + +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () +{ + $debug_cmd + + func_parse_options_result= + + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift + + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break + + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; + + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result +} + + +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () +{ + $debug_cmd + + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" + + func_run_hooks func_validate_options ${1+"$@"} + + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result +} + + + +## ----------------- ## +## Helper functions. ## +## ----------------- ## + +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () +{ + $debug_cmd + + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE +} + + +# func_help +# --------- +# Echo long help message to standard output and exit. +func_help () +{ + $debug_cmd + + func_usage_message + $ECHO "$long_help_message" + exit 0 +} + + +# func_missing_arg ARGNAME +# ------------------------ +# Echo program name prefixed message to standard error and set global +# exit_cmd. +func_missing_arg () +{ + $debug_cmd + + func_error "Missing argument for '$1'." + exit_cmd=exit +} + + +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () +{ + $debug_cmd + + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} + + +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () +{ + $debug_cmd + + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} + + +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + + exit $? +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: + +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' + + +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () +{ + $debug_cmd + + $warning_func ${1+"$@"} +} + + +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" + +# Additional text appended to 'usage_message' in response to '--help'. +func_help () +{ + $debug_cmd + + func_usage_message + $ECHO "$long_help_message + +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + 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 . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi + + +# func_fatal_configuration ARG... +# ------------------------------- +# Echo program name prefixed message to standard error, followed by +# a configuration failure hint, and exit. +func_fatal_configuration () +{ + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." +} + + +# func_config +# ----------- +# Display the configuration for all the tags in this script. +func_config () +{ + re_begincf='^# ### BEGIN LIBTOOL' + re_endcf='^# ### END LIBTOOL' + + # Default configuration. + $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" + + # Now print the configurations for the tags. + for tagname in $taglist; do + $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" + done + + exit $? +} + + +# func_features +# ------------- +# Display the features supported by this script. +func_features () +{ + echo "host: $host" + if test yes = "$build_libtool_libs"; then + echo "enable shared libraries" + else + echo "disable shared libraries" + fi + if test yes = "$build_old_libs"; then + echo "enable static libraries" + else + echo "disable static libraries" + fi + + exit $? +} + + +# func_enable_tag TAGNAME +# ----------------------- +# Verify that TAGNAME is valid, and either flag an error and exit, or +# enable the TAGNAME tag. We also add TAGNAME to the global $taglist +# variable here. +func_enable_tag () +{ + # Global variable: + tagname=$1 + + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac + + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; + *) + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" + + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac +} + + +# func_check_version_match +# ------------------------ +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () +{ + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi + + exit $EXIT_MISMATCH + fi +} + + +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + + nonopt= + preserve_args= + + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep + + +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd + + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; + + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options + + + +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift + fi + + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } + + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result +} +func_add_hook func_validate_options libtool_validate_options + + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift + + + +## ----------- ## +## Main. ## +## ----------- ## + +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + +# func_lalib_p file +# True iff FILE is a libtool '.la' library or '.lo' object file. +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_lalib_p () +{ + test -f "$1" && + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p +} + +# func_lalib_unsafe_p file +# True iff FILE is a libtool '.la' library or '.lo' object file. +# This function implements the same check as func_lalib_p without +# resorting to external programs. To this end, it redirects stdin and +# closes it afterwards, without saving the original file descriptor. +# As a safety measure, use it only where a negative result would be +# fatal anyway. Works if 'file' does not exist. +func_lalib_unsafe_p () +{ + lalib_p=no + if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then + for lalib_p_l in 1 2 3 4 + do + read lalib_p_line + case $lalib_p_line in + \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; + esac + done + exec 0<&5 5<&- + fi + test yes = "$lalib_p" +} + +# func_ltwrapper_script_p file +# True iff FILE is a libtool wrapper script +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_script_p () +{ + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p +} + +# func_ltwrapper_executable_p file +# True iff FILE is a libtool wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_executable_p () +{ + func_ltwrapper_exec_suffix= + case $1 in + *.exe) ;; + *) func_ltwrapper_exec_suffix=.exe ;; + esac + $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 +} + +# func_ltwrapper_scriptname file +# Assumes file is an ltwrapper_executable +# uses $file to determine the appropriate filename for a +# temporary ltwrapper_script. +func_ltwrapper_scriptname () +{ + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper +} + +# func_ltwrapper_p file +# True iff FILE is a libtool wrapper script or wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_p () +{ + func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" +} + + +# func_execute_cmds commands fail_cmd +# Execute tilde-delimited COMMANDS. +# If FAIL_CMD is given, eval that upon failure. +# FAIL_CMD may read-access the current command in variable CMD! +func_execute_cmds () +{ + $debug_cmd + + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$sp$nl + eval cmd=\"$cmd\" + IFS=$save_ifs + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +} + + +# func_source file +# Source FILE, adding directory component if necessary. +# Note that it is not necessary on cygwin/mingw to append a dot to +# FILE even if both FILE and FILE.exe exist: automatic-append-.exe +# behavior happens only for exec(3), not for open(2)! Also, sourcing +# 'FILE.' does not work on cygwin managed mounts. +func_source () +{ + $debug_cmd + + case $1 in + */* | *\\*) . "$1" ;; + *) . "./$1" ;; + esac +} + + +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case $lt_sysroot:$1 in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result='='$func_stripname_result + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + +# func_infer_tag arg +# Infer tagged configuration to use if any are available and +# if one wasn't chosen via the "--tag" command line option. +# Only attempt this if the compiler in the base compile +# command doesn't match the default compiler. +# arg is usually of the form 'gcc ...' +func_infer_tag () +{ + $debug_cmd + + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do + func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` + case $@ in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do + if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + # Evaluate the configuration. + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. + func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` + case "$@ " in + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then + func_echo "unable to infer tagged configuration" + func_fatal_error "specify a tag with '--tag'" +# else +# func_verbose "using $tagname tagged configuration" + fi + ;; + esac + fi +} + + + +# func_write_libtool_object output_name pic_name nonpic_name +# Create a libtool object file (analogous to a ".la" file), +# but don't create it if we're doing a dry run. +func_write_libtool_object () +{ + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' + else + write_lobj=none + fi + + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' + else + write_oldobj=none + fi + + $opt_dry_run || { + cat >${write_libobj}T </dev/null` + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $debug_cmd + + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result= + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result"; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $debug_cmd + + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $debug_cmd + + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $debug_cmd + + if test -z "$2" && test -n "$1"; then + func_error "Could not determine host file name corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result=$1 + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $debug_cmd + + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + func_error " '$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result=$3 + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $debug_cmd + + case $4 in + $1 ) func_to_host_path_result=$3$func_to_host_path_result + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via '$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $debug_cmd + + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $debug_cmd + + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result=$1 +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $debug_cmd + + func_to_host_file_result=$1 + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result=$func_convert_core_msys_to_w32_result + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $debug_cmd + + func_to_host_file_result=$1 + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# and a working winepath. Returns result in func_to_host_file_result. +func_convert_file_nix_to_w32 () +{ + $debug_cmd + + func_to_host_file_result=$1 + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $debug_cmd + + func_to_host_file_result=$1 + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_cygpath_result + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $debug_cmd + + func_to_host_file_result=$1 + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_cygpath_result + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via '$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $debug_cmd + + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd=func_convert_path_$func_stripname_result + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $debug_cmd + + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result=$1 +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $debug_cmd + + func_to_host_path_result=$1 + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result=$func_convert_core_msys_to_w32_result + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () +{ + $debug_cmd + + func_to_host_path_result=$1 + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 + + +# func_convert_path_nix_to_w32 ARG +# Convert path ARG from *nix to w32 format. Requires a wine environment and +# a working winepath. Returns result in func_to_host_file_result. +func_convert_path_nix_to_w32 () +{ + $debug_cmd + + func_to_host_path_result=$1 + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_nix_to_w32 + + +# func_convert_path_msys_to_cygwin ARG +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_path_msys_to_cygwin () +{ + $debug_cmd + + func_to_host_path_result=$1 + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_cygpath_result + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_msys_to_cygwin + + +# func_convert_path_nix_to_cygwin ARG +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in +# func_to_host_file_result. +func_convert_path_nix_to_cygwin () +{ + $debug_cmd + + func_to_host_path_result=$1 + if test -n "$1"; then + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_cygpath_result + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_nix_to_cygwin + + +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + +# func_mode_compile arg... +func_mode_compile () +{ + $debug_cmd + + # Get the compilation command and the source file. + base_compile= + srcfile=$nonopt # always keep a non-empty value in "srcfile" + suppress_opt=yes + suppress_output= + arg_mode=normal + libobj= + later= + pie_flag= + + for arg + do + case $arg_mode in + arg ) + # do not "continue". Instead, add this to base_compile + lastarg=$arg + arg_mode=normal + ;; + + target ) + libobj=$arg + arg_mode=normal + continue + ;; + + normal ) + # Accept any command-line options. + case $arg in + -o) + test -n "$libobj" && \ + func_fatal_error "you cannot specify '-o' more than once" + arg_mode=target + continue + ;; + + -pie | -fpie | -fPIE) + func_append pie_flag " $arg" + continue + ;; + + -shared | -static | -prefer-pic | -prefer-non-pic) + func_append later " $arg" + continue + ;; + + -no-suppress) + suppress_opt=no + continue + ;; + + -Xcompiler) + arg_mode=arg # the next one goes into the "base_compile" arg list + continue # The current "srcfile" will either be retained or + ;; # replaced later. I would guess that would be a bug. + + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + lastarg= + save_ifs=$IFS; IFS=, + for arg in $args; do + IFS=$save_ifs + func_append_quoted lastarg "$arg" + done + IFS=$save_ifs + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + + # Add the arguments to base_compile. + func_append base_compile " $lastarg" + continue + ;; + + *) + # Accept the current argument as the source file. + # The previous "srcfile" becomes the current argument. + # + lastarg=$srcfile + srcfile=$arg + ;; + esac # case $arg + ;; + esac # case $arg_mode + + # Aesthetically quote the previous argument. + func_append_quoted base_compile "$lastarg" + done # for arg + + case $arg_mode in + arg) + func_fatal_error "you must specify an argument for -Xcompile" + ;; + target) + func_fatal_error "you must specify a target with '-o'" + ;; + *) + # Get the name of the library object. + test -z "$libobj" && { + func_basename "$srcfile" + libobj=$func_basename_result + } + ;; + esac + + # Recognize several different file suffixes. + # If the user specifies -o file.o, it is replaced with file.lo + case $libobj in + *.[cCFSifmso] | \ + *.ada | *.adb | *.ads | *.asm | \ + *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) + func_xform "$libobj" + libobj=$func_xform_result + ;; + esac + + case $libobj in + *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; + *) + func_fatal_error "cannot determine name of library object from '$libobj'" + ;; + esac + + func_infer_tag $base_compile + + for arg in $later; do + case $arg in + -shared) + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" + build_old_libs=no + continue + ;; + + -static) + build_libtool_libs=no + build_old_libs=yes + continue + ;; + + -prefer-pic) + pic_mode=yes + continue + ;; + + -prefer-non-pic) + pic_mode=no + continue + ;; + esac + done + + func_quote_for_eval "$libobj" + test "X$libobj" != "X$func_quote_for_eval_result" \ + && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ + && func_warning "libobj name '$libobj' may not contain shell special characters." + func_dirname_and_basename "$obj" "/" "" + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname + + test -z "$base_compile" && \ + func_fatal_help "you must specify a compilation command" + + # Delete any leftover library objects. + if test yes = "$build_old_libs"; then + removelist="$obj $lobj $libobj ${libobj}T" + else + removelist="$lobj $libobj ${libobj}T" + fi + + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in + cygwin* | mingw* | pw32* | os2* | cegcc*) + pic_mode=default + ;; + esac + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then + # non-PIC code in shared libraries is not supported + pic_mode=default + fi + + # Calculate the filename of the output object if compiler does + # not support -o with -c + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock + else + output_obj= + need_locks=no + lockfile= + fi + + # Lock this critical section if it is needed + # We use this script file to make the link, it avoids creating a new file + if test yes = "$need_locks"; then + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + elif test warn = "$need_locks"; then + if test -f "$lockfile"; then + $ECHO "\ +*** ERROR, $lockfile exists and contains: +`cat $lockfile 2>/dev/null` + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support '-c' and '-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + func_append removelist " $output_obj" + $ECHO "$srcfile" > "$lockfile" + fi + + $opt_dry_run || $RM $removelist + func_append removelist " $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result + + # Only build a PIC object if we are building libtool libraries. + if test yes = "$build_libtool_libs"; then + # Without this assignment, base_compile gets emptied. + fbsd_hideous_sh_bug=$base_compile + + if test no != "$pic_mode"; then + command="$base_compile $qsrcfile $pic_flag" + else + # Don't build PIC code + command="$base_compile $qsrcfile" + fi + + func_mkdir_p "$xdir$objdir" + + if test -z "$output_obj"; then + # Place PIC objects in $objdir + func_append command " -o $lobj" + fi + + func_show_eval_locale "$command" \ + 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' + + if test warn = "$need_locks" && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support '-c' and '-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed, then go on to compile the next one + if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then + func_show_eval '$MV "$output_obj" "$lobj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi + + # Allow error messages only from the first compilation. + if test yes = "$suppress_opt"; then + suppress_output=' >/dev/null 2>&1' + fi + fi + + # Only build a position-dependent object if we build old libraries. + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then + # Don't build PIC code + command="$base_compile $qsrcfile$pie_flag" + else + command="$base_compile $qsrcfile $pic_flag" + fi + if test yes = "$compiler_c_o"; then + func_append command " -o $obj" + fi + + # Suppress compiler output if we already did a PIC compilation. + func_append command "$suppress_output" + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + + if test warn = "$need_locks" && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +This indicates that another process is trying to use the same +temporary object file, and libtool could not work around it because +your compiler does not support '-c' and '-o' together. If you +repeat this compilation, it may succeed, by chance, but you had better +avoid parallel builds (make -j) in this platform, or get a better +compiler." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed + if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then + func_show_eval '$MV "$output_obj" "$obj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi + fi + + $opt_dry_run || { + func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" + + # Unlock the critical section if it was locked + if test no != "$need_locks"; then + removelist=$lockfile + $RM "$lockfile" + fi + } + + exit $EXIT_SUCCESS +} + +$opt_help || { + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} +} + +func_mode_help () +{ + # We need to display help for each of the modes. + case $opt_mode in + "") + # Generic help is extracted from the usage comments + # at the start of this file. + func_help + ;; + + clean) + $ECHO \ +"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... + +Remove files from the build directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed +to RM. + +If FILE is a libtool library, object or program, all the files associated +with it are deleted. Otherwise, only FILE itself is deleted using RM." + ;; + + compile) + $ECHO \ +"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE + +Compile a source file into a libtool library object. + +This mode accepts the following additional options: + + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler + +COMPILE-COMMAND is a command to be used in creating a 'standard' object file +from the given SOURCEFILE. + +The output file name is determined by removing the directory component from +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." + ;; + + execute) + $ECHO \ +"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... + +Automatically set library path, then run a program. + +This mode accepts the following additional options: + + -dlopen FILE add the directory containing FILE to the library path + +This mode sets the library path environment variable according to '-dlopen' +flags. + +If any of the ARGS are libtool executable wrappers, then they are translated +into their corresponding uninstalled binary, and any of their required library +directories are added to the library path. + +Then, COMMAND is executed, with ARGS as arguments." + ;; + + finish) + $ECHO \ +"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... + +Complete the installation of libtool libraries. + +Each LIBDIR is a directory that contains libtool libraries. + +The commands that this mode executes may require superuser privileges. Use +the '--dry-run' option if you just want to see what would be executed." + ;; + + install) + $ECHO \ +"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... + +Install executables or libraries. + +INSTALL-COMMAND is the installation command. The first component should be +either the 'install' or 'cp' program. + +The following components of INSTALL-COMMAND are treated specially: + + -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation + +The rest of the components are interpreted as arguments to that command (only +BSD-compatible install options are recognized)." + ;; + + link) + $ECHO \ +"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... + +Link object files or libraries together to form another library, or to +create an executable program. + +LINK-COMMAND is a command using the C compiler that you would use to create +a program from several object files. + +The following components of LINK-COMMAND are treated specially: + + -all-static do not do any dynamic linking at all + -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime + -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols + -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) + -export-symbols SYMFILE + try to export only the symbols listed in SYMFILE + -export-symbols-regex REGEX + try to export only the symbols matching REGEX + -LLIBDIR search LIBDIR for required installed libraries + -lNAME OUTPUT-FILE requires the installed library libNAME + -module build a library that can dlopened + -no-fast-install disable the fast-install mode + -no-install link a not-installable executable + -no-undefined declare that a library does not refer to external symbols + -o OUTPUT-FILE create OUTPUT-FILE from the specified objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) + -precious-files-regex REGEX + don't remove output files matching REGEX + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries + -shared only do dynamic linking of libtool libraries + -shrext SUFFIX override the standard shared library file extension + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries + -version-info CURRENT[:REVISION[:AGE]] + specify library version info [each variable defaults to 0] + -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) + +All other options (arguments beginning with '-') are ignored. + +Every other argument is treated as a filename. Files ending in '.la' are +treated as uninstalled libtool libraries, other files are standard or library +object files. + +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is +required, except when creating a convenience library. + +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. + +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file +is created, otherwise an executable program is created." + ;; + + uninstall) + $ECHO \ +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... + +Remove libraries from an installation directory. + +RM is the name of the program to use to delete files associated with each FILE +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed +to RM. + +If FILE is a libtool library, all the files associated with it are deleted. +Otherwise, only FILE itself is deleted using RM." + ;; + + *) + func_fatal_help "invalid operation mode '$opt_mode'" + ;; + esac + + echo + $ECHO "Try '$progname --help' for more information about other modes." +} + +# Now that we've collected a possible --mode arg, show help if necessary +if $opt_help; then + if test : = "$opt_help"; then + func_mode_help + else + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done + } | + $SED '1d + /^When reporting/,/^Report/{ + H + d + } + $x + /information about other modes/d + /more detailed .*MODE/d + s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' + fi + exit $? +fi + + +# func_mode_execute arg... +func_mode_execute () +{ + $debug_cmd + + # The first argument is the command name. + cmd=$nonopt + test -z "$cmd" && \ + func_fatal_help "you must specify a COMMAND" + + # Handle -dlopen flags immediately. + for file in $opt_dlopen; do + test -f "$file" \ + || func_fatal_help "'$file' is not a file" + + dir= + case $file in + *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "'$lib' is not a valid libtool archive" + + # Read the libtool library. + dlname= + library_names= + func_source "$file" + + # Skip this library if it cannot be dlopened. + if test -z "$dlname"; then + # Warn if it was a shared library. + test -n "$library_names" && \ + func_warning "'$file' was not linked with '-export-dynamic'" + continue + fi + + func_dirname "$file" "" "." + dir=$func_dirname_result + + if test -f "$dir/$objdir/$dlname"; then + func_append dir "/$objdir" + else + if test ! -f "$dir/$dlname"; then + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" + fi + fi + ;; + + *.lo) + # Just add the directory containing the .lo file. + func_dirname "$file" "" "." + dir=$func_dirname_result + ;; + + *) + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" + continue + ;; + esac + + # Get the absolute pathname. + absdir=`cd "$dir" && pwd` + test -n "$absdir" && dir=$absdir + + # Now add the directory to shlibpath_var. + if eval "test -z \"\$$shlibpath_var\""; then + eval "$shlibpath_var=\"\$dir\"" + else + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done + + # This variable tells wrapper scripts just to set shlibpath_var + # rather than running their programs. + libtool_execute_magic=$magic + + # Check if any of the arguments is a wrapper script. + args= + for file + do + case $file in + -* | *.la | *.lo ) ;; + *) + # Do a test to see if this is really a libtool program. + if func_ltwrapper_script_p "$file"; then + func_source "$file" + # Transform arg to wrapped name. + file=$progdir/$program + elif func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + func_source "$func_ltwrapper_scriptname_result" + # Transform arg to wrapped name. + file=$progdir/$program + fi + ;; + esac + # Quote arguments (to preserve shell metacharacters). + func_append_quoted args "$file" + done + + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else + if test -n "$shlibpath_var"; then + # Export the shlibpath_var. + eval "export $shlibpath_var" + fi + + # Restore saved environment variables + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + else + $lt_unset $lt_var + fi" + done + + # Now prepare to actually exec the command. + exec_cmd=\$cmd$args + fi +} + +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} + + +# func_mode_finish arg... +func_mode_finish () +{ + $debug_cmd + + libs= + libdirs= + admincmds= + + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "'$opt' is not a valid libtool archive" + fi + + else + func_fatal_error "invalid argument '$opt'" + fi + done + + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and '=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. + func_execute_cmds "$finish_cmds" 'admincmds="$admincmds +'"$cmd"'"' + fi + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" + $opt_dry_run || eval "$cmds" || func_append admincmds " + $cmds" + fi + done + fi + + # Exit here if they wanted silent mode. + $opt_quiet && exit $EXIT_SUCCESS + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the '$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the '$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" + + $ECHO " - use the '$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" + fi + echo + + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" + fi + exit $EXIT_SUCCESS +} + +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} + + +# func_mode_install arg... +func_mode_install () +{ + $debug_cmd + + # There may be an optional sh(1) argument at the beginning of + # install_prog (especially on Windows NT). + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || + # Allow the use of GNU shtool's install command. + case $nonopt in *shtool*) :;; *) false;; esac + then + # Aesthetically quote it. + func_quote_for_eval "$nonopt" + install_prog="$func_quote_for_eval_result " + arg=$1 + shift + else + install_prog= + arg=$nonopt + fi + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" + func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; + *) install_cp=false ;; + esac + + # We need to accept at least all the BSD install flags. + dest= + files= + opts= + prev= + install_type= + isdir=false + stripme= + no_mode=: + for arg + do + arg2= + if test -n "$dest"; then + func_append files " $dest" + dest=$arg + continue + fi + + case $arg in + -d) isdir=: ;; + -f) + if $install_cp; then :; else + prev=$arg + fi + ;; + -g | -m | -o) + prev=$arg + ;; + -s) + stripme=" -s" + continue + ;; + -*) + ;; + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi + prev= + else + dest=$arg + continue + fi + ;; + esac + + # Aesthetically quote the argument. + func_quote_for_eval "$arg" + func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + func_append install_shared_prog " $func_quote_for_eval_result" + done + + test -z "$install_prog" && \ + func_fatal_help "you must specify an install program" + + test -n "$prev" && \ + func_fatal_help "the '$prev' option requires an argument" + + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" + func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + + if test -z "$files"; then + if test -z "$dest"; then + func_fatal_help "no file or destination specified" + else + func_fatal_help "you must specify a destination" + fi + fi + + # Strip any trailing slash from the destination. + func_stripname '' '/' "$dest" + dest=$func_stripname_result + + # Check to see that the destination is a directory. + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest + destname= + else + func_dirname_and_basename "$dest" "" "." + destdir=$func_dirname_result + destname=$func_basename_result + + # Not a directory, so check to see that there is only one file specified. + set dummy $files; shift + test "$#" -gt 1 && \ + func_fatal_help "'$dest' is not a directory" + fi + case $destdir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + for file in $files; do + case $file in + *.lo) ;; + *) + func_fatal_help "'$destdir' must be an absolute directory name" + ;; + esac + done + ;; + esac + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic=$magic + + staticlibs= + future_libdirs= + current_libdirs= + for file in $files; do + + # Do each installation. + case $file in + *.$libext) + # Do the static libraries later. + func_append staticlibs " $file" + ;; + + *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "'$file' is not a valid libtool archive" + + library_names= + old_library= + relink_command= + func_source "$file" + + # Add the libdir to current_libdirs if it is the destination. + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; + *) func_append current_libdirs " $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; + *) func_append future_libdirs " $libdir" ;; + esac + fi + + func_dirname "$file" "/" "" + dir=$func_dirname_result + func_append dir "$objdir" + + if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + # At present, this check doesn't affect windows .dll's that + # are installed into $libdir/../bin (currently, that works fine) + # but it's something to keep an eye on. + test "$inst_prefix_dir" = "$destdir" && \ + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + else + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + fi + + func_warning "relinking '$file'" + func_show_eval "$relink_command" \ + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' + fi + + # See the names of the shared library. + set dummy $library_names; shift + if test -n "$1"; then + realname=$1 + shift + + srcname=$realname + test -n "$relink_command" && srcname=${realname}T + + # Install the shared library and build the symlinks. + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ + 'exit $?' + tstripme=$stripme + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + case $realname in + *.dll.a) + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= + ;; + esac + ;; + esac + if test -n "$tstripme" && test -n "$striplib"; then + func_show_eval "$striplib $destdir/$realname" 'exit $?' + fi + + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. + # Try 'ln -sf' first, because the 'ln' binary might depend on + # the symlink we replace! Solaris /bin/ln does not understand -f, + # so we also need to try rm && ln -s. + for linkname + do + test "$linkname" != "$realname" \ + && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" + done + fi + + # Do each command in the postinstall commands. + lib=$destdir/$realname + func_execute_cmds "$postinstall_cmds" 'exit $?' + fi + + # Install the pseudo-library for information purposes. + func_basename "$file" + name=$func_basename_result + instname=$dir/${name}i + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + + # Maybe install the static library, too. + test -n "$old_library" && func_append staticlibs " $dir/$old_library" + ;; + + *.lo) + # Install (i.e. copy) a libtool object. + + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile=$destdir/$destname + else + func_basename "$file" + destfile=$func_basename_result + destfile=$destdir/$destfile + fi + + # Deduce the name of the destination old-style object file. + case $destfile in + *.lo) + func_lo2o "$destfile" + staticdest=$func_lo2o_result + ;; + *.$objext) + staticdest=$destfile + destfile= + ;; + *) + func_fatal_help "cannot copy a libtool object to '$destfile'" + ;; + esac + + # Install the libtool object if requested. + test -n "$destfile" && \ + func_show_eval "$install_prog $file $destfile" 'exit $?' + + # Install the old object if enabled. + if test yes = "$build_old_libs"; then + # Deduce the name of the old-style object file. + func_lo2o "$file" + staticobj=$func_lo2o_result + func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' + fi + exit $EXIT_SUCCESS + ;; + + *) + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile=$destdir/$destname + else + func_basename "$file" + destfile=$func_basename_result + destfile=$destdir/$destfile + fi + + # If the file is missing, and there is a .exe on the end, strip it + # because it is most likely a libtool script we actually want to + # install + stripped_ext= + case $file in + *.exe) + if test ! -f "$file"; then + func_stripname '' '.exe' "$file" + file=$func_stripname_result + stripped_ext=.exe + fi + ;; + esac + + # Do a test to see if this is really a libtool program. + case $host in + *cygwin* | *mingw*) + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + wrapper=$func_ltwrapper_scriptname_result + else + func_stripname '' '.exe' "$file" + wrapper=$func_stripname_result + fi + ;; + *) + wrapper=$file + ;; + esac + if func_ltwrapper_script_p "$wrapper"; then + notinst_deplibs= + relink_command= + + func_source "$wrapper" + + # Check the variables that should have been set. + test -z "$generated_by_libtool_version" && \ + func_fatal_error "invalid libtool wrapper script '$wrapper'" + + finalize=: + for lib in $notinst_deplibs; do + # Check to see that each library is installed. + libdir= + if test -f "$lib"; then + func_source "$lib" + fi + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` + if test -n "$libdir" && test ! -f "$libfile"; then + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false + fi + done + + relink_command= + func_source "$wrapper" + + outputname= + if test no = "$fast_install" && test -n "$relink_command"; then + $opt_dry_run || { + if $finalize; then + tmpdir=`func_mktempdir` + func_basename "$file$stripped_ext" + file=$func_basename_result + outputname=$tmpdir/$file + # Replace the output file specification. + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` + + $opt_quiet || { + func_quote_for_expand "$relink_command" + eval "func_echo $func_quote_for_expand_result" + } + if eval "$relink_command"; then : + else + func_error "error: relink '$file' with the above command before installing it" + $opt_dry_run || ${RM}r "$tmpdir" + continue + fi + file=$outputname + else + func_warning "cannot relink '$file'" + fi + } + else + # Install the binary that we compiled earlier. + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` + fi + fi + + # remove .exe since cygwin /usr/bin/install will append another + # one anyway + case $install_prog,$host in + */usr/bin/install*,*cygwin*) + case $file:$destfile in + *.exe:*.exe) + # this is ok + ;; + *.exe:*) + destfile=$destfile.exe + ;; + *:*.exe) + func_stripname '' '.exe' "$destfile" + destfile=$func_stripname_result + ;; + esac + ;; + esac + func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' + $opt_dry_run || if test -n "$outputname"; then + ${RM}r "$tmpdir" + fi + ;; + esac + done + + for file in $staticlibs; do + func_basename "$file" + name=$func_basename_result + + # Set up the ranlib parameters. + oldlib=$destdir/$name + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result + + func_show_eval "$install_prog \$file \$oldlib" 'exit $?' + + if test -n "$stripme" && test -n "$old_striplib"; then + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' + fi + + # Do each command in the postinstall commands. + func_execute_cmds "$old_postinstall_cmds" 'exit $?' + done + + test -n "$future_libdirs" && \ + func_warning "remember to run '$progname --finish$future_libdirs'" + + if test -n "$current_libdirs"; then + # Maybe just do a dry run. + $opt_dry_run && current_libdirs=" -n$current_libdirs" + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' + else + exit $EXIT_SUCCESS + fi +} + +test install = "$opt_mode" && func_mode_install ${1+"$@"} + + +# func_generate_dlsyms outputname originator pic_p +# Extract symbols from dlprefiles and create ${outputname}S.o with +# a dlpreopen symbol table. +func_generate_dlsyms () +{ + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` + my_dlsyms= + + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + if test -n "$NM" && test -n "$global_symbol_pipe"; then + my_dlsyms=${my_outputname}S.c + else + func_error "not configured to extract global symbols from dlpreopened files" + fi + fi + + if test -n "$my_dlsyms"; then + case $my_dlsyms in + "") ;; + *.c) + # Discover the nlist of each of the dlfiles. + nlist=$output_objdir/$my_outputname.nm + + func_show_eval "$RM $nlist ${nlist}S ${nlist}T" + + # Parse the name list into a source file. + func_verbose "creating $output_objdir/$my_dlsyms" + + $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ + +#ifdef __cplusplus +extern \"C\" { +#endif + +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined __osf__ +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + +/* External symbol declarations for the compiler. */\ +" + + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" + + $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" + + # Add our own program objects to the symbol list. + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + for progfile in $progfiles; do + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + export_symbols=$output_objdir/$outputname.exp + $opt_dry_run || { + $RM $export_symbols + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } + else + $opt_dry_run || { + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } + fi + fi + + for dlprefile in $dlprefiles; do + func_verbose "extracting global C symbols from '$dlprefile'" + func_basename "$dlprefile" + name=$func_basename_result + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" + dlprefile_dlbasename= + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname"; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename=$func_basename_result + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename"; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac + done + + $opt_dry_run || { + # Make sure we have at least an empty file. + test -f "$nlist" || : > "$nlist" + + if test -n "$exclude_expsyms"; then + $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T + $MV "$nlist"T "$nlist" + fi + + # Try sorting and uniquifying the output. + if $GREP -v "^: " < "$nlist" | + if sort -k 3 /dev/null 2>&1; then + sort -k 3 + else + sort +2 + fi | + uniq > "$nlist"S; then + : + else + $GREP -v "^: " < "$nlist" > "$nlist"S + fi + + if test -f "$nlist"S; then + eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' + else + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" + fi + + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + + echo >> "$output_objdir/$my_dlsyms" "\ + +/* The mapping between symbol names and symbols. */ +typedef struct { + const char *name; + void *address; +} lt_dlsymlist; +extern LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ +LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[] = +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi + + case $need_lib_prefix in + no) + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + *) + eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + esac + echo >> "$output_objdir/$my_dlsyms" "\ + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt_${my_prefix}_LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif\ +" + } # !$opt_dry_run + + pic_flag_for_symtable= + case "$compile_command " in + *" -static "*) ;; + *) + case $host in + # compiling the symbol table file with pic_flag works around + # a FreeBSD bug that causes programs to crash when -lm is + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; + *-*-hpux*) + pic_flag_for_symtable=" $pic_flag" ;; + *) + $my_pic_p && pic_flag_for_symtable=" $pic_flag" + ;; + esac + ;; + esac + symtab_cflags= + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; + *) func_append symtab_cflags " $arg" ;; + esac + done + + # Now compile the dynamic symbol file. + func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' + + # Clean up the generated files. + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' + + # Transform the symbol file into the correct name. + symfileobj=$output_objdir/${my_outputname}S.$objext + case $host in + *cygwin* | *mingw* | *cegcc* ) + if test -f "$output_objdir/$my_outputname.def"; then + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + else + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + fi + ;; + *) + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + ;; + esac + ;; + *) + func_fatal_error "unknown suffix for '$my_dlsyms'" + ;; + esac + else + # We keep going just in case the user didn't refer to + # lt_preloaded_symbols. The linker will fail if global_symbol_pipe + # really was required. + + # Nullify the symbol file. + compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` + fi +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_win32_libid arg +# return the library type of file 'arg' +# +# Need a lot of goo to handle *both* DLLs and import libs +# Has to be a shell function in order to 'eat' the argument +# that is supplied when $file_magic_command is called. +# Despite the name, also deal with 64 bit binaries. +func_win32_libid () +{ + $debug_cmd + + win32_libid_type=unknown + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in + *ar\ archive\ import\ library*) # definitely import + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' + 1,100{ + / I /{ + s|.*|import| + p + q + } + }'` + ;; + esac + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac + fi + ;; + *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... + case $win32_fileres in + *MS\ Windows\ PE\ Intel*) + win32_libid_type="x86 DLL" + ;; + esac + ;; + esac + $ECHO "$win32_libid_type" +} + +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $debug_cmd + + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $debug_cmd + + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1"; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result= + fi +} + + +# func_extract_an_archive dir oldlib +func_extract_an_archive () +{ + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test yes = "$lock_old_archive_extraction"; then + $opt_dry_run || rm -f "$lockfile" + fi + if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then + : + else + func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" + fi +} + + +# func_extract_archives gentop oldlib ... +func_extract_archives () +{ + $debug_cmd + + my_gentop=$1; shift + my_oldlibs=${1+"$@"} + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= + + for my_xlib in $my_oldlibs; do + # Extract the objects. + case $my_xlib in + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + func_basename "$my_xlib" + my_xlib=$func_basename_result + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + func_arith $extracted_serial + 1 + extracted_serial=$func_arith_result + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u + + func_mkdir_p "$my_xdir" + + case $host in + *-darwin*) + func_verbose "Extracting $my_xabs" + # Do not bother doing anything if just a dry run + $opt_dry_run || { + darwin_orig_dir=`pwd` + cd $my_xdir || exit $? + darwin_archive=$my_xabs + darwin_curdir=`pwd` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result + darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` + if test -n "$darwin_arches"; then + darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` + darwin_arch= + func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" + cd "$darwin_curdir" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" + done # $darwin_arches + ## Okay now we've a bunch of thin objects, gotta fatten them up :) + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ + cd "$darwin_orig_dir" + else + cd $darwin_orig_dir + func_extract_an_archive "$my_xdir" "$my_xabs" + fi # $darwin_arches + } # !$opt_dry_run + ;; + *) + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + done + + func_extract_archives_result=$my_oldobjs +} + + +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory where it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=${1-no} + + $ECHO "\ +#! $SHELL + +# $output - temporary wrapper script for $objdir/$outputname +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION +# +# The $output program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='$sed_quote_subst' + +# Be Bourne compatible +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +relink_command=\"$relink_command\" + +# This environment variable determines our operation mode. +if test \"\$libtool_install_magic\" = \"$magic\"; then + # install mode needs the following variables: + generated_by_libtool_version='$macro_version' + notinst_deplibs='$notinst_deplibs' +else + # When we are sourced in execute mode, \$file and \$ECHO are already set. + if test \"\$libtool_execute_magic\" != \"$magic\"; then + file=\"\$0\"" + + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + ECHO=\"$qECHO\" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ that is used only on +# windows platforms, and (c) all begin with the string "--lt-" +# (application programs are unlikely to have options that match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's $0 value, followed by "$@". +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=\$0 + shift + for lt_opt + do + case \"\$lt_opt\" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` + cat \"\$lt_dump_D/\$lt_dump_F\" + exit 0 + ;; + --lt-*) + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ +" + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from \$@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac + func_exec_program_core \${1+\"\$@\"} +} + + # Parse options + func_parse_lt_options \"\$0\" \${1+\"\$@\"} + + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` + test \"x\$thisdir\" = \"x\$file\" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` + while test -n \"\$file\"; do + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` + + # If there was a directory component, then change thisdir. + if test \"x\$destdir\" != \"x\$file\"; then + case \"\$destdir\" in + [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; + *) thisdir=\"\$thisdir/\$destdir\" ;; + esac + fi + + file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` + done + + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then + # special case for '.' + if test \"\$thisdir\" = \".\"; then + thisdir=\`pwd\` + fi + # remove .libs from thisdir + case \"\$thisdir\" in + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; + $objdir ) thisdir=. ;; + esac + fi + + # Try to get the absolute directory name. + absdir=\`cd \"\$thisdir\" && pwd\` + test -n \"\$absdir\" && thisdir=\"\$absdir\" +" + + if test yes = "$fast_install"; then + $ECHO "\ + program=lt-'$outputname'$exeext + progdir=\"\$thisdir/$objdir\" + + if test ! -f \"\$progdir/\$program\" || + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ + test \"X\$file\" != \"X\$progdir/\$program\"; }; then + + file=\"\$\$-\$program\" + + if test ! -d \"\$progdir\"; then + $MKDIR \"\$progdir\" + else + $RM \"\$progdir/\$file\" + fi" + + $ECHO "\ + + # relink executable if necessary + if test -n \"\$relink_command\"; then + if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + \$ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" + exit 1 + fi + fi + + $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || + { $RM \"\$progdir/\$program\"; + $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } + $RM \"\$progdir/\$file\" + fi" + else + $ECHO "\ + program='$outputname' + progdir=\"\$thisdir/$objdir\" +" + fi + + $ECHO "\ + + if test -f \"\$progdir/\$program\"; then" + + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + + # Export our shlibpath_var if we have one. + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var + $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" + + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` + + export $shlibpath_var +" + fi + + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. + func_exec_program \${1+\"\$@\"} + fi + else + # The program doesn't exist. + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + exit 1 + fi +fi\ +" +} + + +# func_emit_cwrapperexe_src +# emit the source code for a wrapper executable on stdout +# Must ONLY be called from within func_mode_link because +# it depends on a number of variable set therein. +func_emit_cwrapperexe_src () +{ + cat < +#include +#ifdef _MSC_VER +# include +# include +# include +#else +# include +# include +# ifdef __CYGWIN__ +# include +# endif +#endif +#include +#include +#include +#include +#include +#include +#include +#include + +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + +/* declarations of non-ANSI functions */ +#if defined __MINGW32__ +# ifdef __STRICT_ANSI__ +int _putenv (const char *); +# endif +#elif defined __CYGWIN__ +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +/* #elif defined other_platform || defined ... */ +#endif + +/* portability defines, excluding path handling macros */ +#if defined _MSC_VER +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +# define S_IXUSR _S_IEXEC +#elif defined __MINGW32__ +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +#elif defined __CYGWIN__ +# define HAVE_SETENV +# define FOPEN_WB "wb" +/* #elif defined other platforms ... */ +#endif + +#if defined PATH_MAX +# define LT_PATHMAX PATH_MAX +#elif defined MAXPATHLEN +# define LT_PATHMAX MAXPATHLEN +#else +# define LT_PATHMAX 1024 +#endif + +#ifndef S_IXOTH +# define S_IXOTH 0 +#endif +#ifndef S_IXGRP +# define S_IXGRP 0 +#endif + +/* path handling portability macros */ +#ifndef DIR_SEPARATOR +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' +#endif + +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ +# define HAVE_DOS_BASED_FILE_SYSTEM +# define FOPEN_WB "wb" +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif +#endif + +#ifndef DIR_SEPARATOR_2 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +#else /* DIR_SEPARATOR_2 */ +# define IS_DIR_SEPARATOR(ch) \ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +#endif /* DIR_SEPARATOR_2 */ + +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ + +#ifndef FOPEN_WB +# define FOPEN_WB "w" +#endif +#ifndef _O_BINARY +# define _O_BINARY 0 +#endif + +#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +#define XFREE(stale) do { \ + if (stale) { free (stale); stale = 0; } \ +} while (0) + +#if defined LT_DEBUGWRAPPER +static int lt_debug = 1; +#else +static int lt_debug = 0; +#endif + +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ + +void *xmalloc (size_t num); +char *xstrdup (const char *string); +const char *base_name (const char *name); +char *find_executable (const char *wrapper); +char *chase_symlinks (const char *pathspec); +int make_executable (const char *path); +int check_executable (const char *path); +char *strendzap (char *str, const char *pat); +void lt_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); +void lt_setenv (const char *name, const char *value); +char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_update_exe_path (const char *name, const char *value); +void lt_update_lib_path (const char *name, const char *value); +char **prepare_spawn (char **argv); +void lt_dump_script (FILE *f); +EOF + + cat <= 0) + && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) + return 1; + else + return 0; +} + +int +make_executable (const char *path) +{ + int rval = 0; + struct stat st; + + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", + nonempty (path)); + if ((!path) || (!*path)) + return 0; + + if (stat (path, &st) >= 0) + { + rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); + } + return rval; +} + +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise + Does not chase symlinks, even on platforms that support them. +*/ +char * +find_executable (const char *wrapper) +{ + int has_slash = 0; + const char *p; + const char *p_next; + /* static buffer for getcwd */ + char tmp[LT_PATHMAX + 1]; + size_t tmp_len; + char *concat_name; + + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", + nonempty (wrapper)); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; + + /* Absolute path? */ +#if defined HAVE_DOS_BASED_FILE_SYSTEM + if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } +#if defined HAVE_DOS_BASED_FILE_SYSTEM + } +#endif + + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char *path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char *q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR (*q)) + break; + p_len = (size_t) (q - p); + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = + XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + return NULL; +} + +char * +chase_symlinks (const char *pathspec) +{ +#ifndef S_ISLNK + return xstrdup (pathspec); +#else + char buf[LT_PATHMAX]; + struct stat s; + char *tmp_pathspec = xstrdup (pathspec); + char *p; + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { + lt_debugprintf (__FILE__, __LINE__, + "checking path component for symlinks: %s\n", + tmp_pathspec); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) + { + has_symlinks = 1; + break; + } + + /* search backwards for last DIR_SEPARATOR */ + p = tmp_pathspec + strlen (tmp_pathspec) - 1; + while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + p--; + if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + { + /* no more DIR_SEPARATORS left */ + break; + } + *p = '\0'; + } + else + { + lt_fatal (__FILE__, __LINE__, + "error accessing file \"%s\": %s", + tmp_pathspec, nonnull (strerror (errno))); + } + } + XFREE (tmp_pathspec); + + if (!has_symlinks) + { + return xstrdup (pathspec); + } + + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { + lt_fatal (__FILE__, __LINE__, + "could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); +#endif +} + +char * +strendzap (char *str, const char *pat) +{ + size_t len, patlen; + + assert (str != NULL); + assert (pat != NULL); + + len = strlen (str); + patlen = strlen (pat); + + if (patlen <= len) + { + str += len - patlen; + if (STREQ (str, pat)) + *str = '\0'; + } + return str; +} + +void +lt_debugprintf (const char *file, int line, const char *fmt, ...) +{ + va_list args; + if (lt_debug) + { + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); + } +} + +static void +lt_error_core (int exit_status, const char *file, + int line, const char *mode, + const char *message, va_list ap) +{ + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + + if (exit_status >= 0) + exit (exit_status); +} + +void +lt_fatal (const char *file, int line, const char *message, ...) +{ + va_list ap; + va_start (ap, message); + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + va_end (ap); +} + +static const char * +nonnull (const char *s) +{ + return s ? s : "(null)"; +} + +static const char * +nonempty (const char *s) +{ + return (s && !*s) ? "(empty)" : nonnull (s); +} + +void +lt_setenv (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_setenv) setting '%s' to '%s'\n", + nonnull (name), nonnull (value)); + { +#ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ + char *str = xstrdup (value); + setenv (name, str, 1); +#else + size_t len = strlen (name) + 1 + strlen (value) + 1; + char *str = XMALLOC (char, len); + sprintf (str, "%s=%s", name, value); + if (putenv (str) != EXIT_SUCCESS) + { + XFREE (str); + } +#endif + } +} + +char * +lt_extend_str (const char *orig_value, const char *add, int to_end) +{ + char *new_value; + if (orig_value && *orig_value) + { + size_t orig_value_len = strlen (orig_value); + size_t add_len = strlen (add); + new_value = XMALLOC (char, add_len + orig_value_len + 1); + if (to_end) + { + strcpy (new_value, orig_value); + strcpy (new_value + orig_value_len, add); + } + else + { + strcpy (new_value, add); + strcpy (new_value + add_len, orig_value); + } + } + else + { + new_value = xstrdup (add); + } + return new_value; +} + +void +lt_update_exe_path (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + /* some systems can't cope with a ':'-terminated path #' */ + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) + { + new_value[--len] = '\0'; + } + lt_setenv (name, new_value); + XFREE (new_value); + } +} + +void +lt_update_lib_path (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + } +} + +EOF + case $host_os in + mingw*) + cat <<"EOF" + +/* Prepares an argument vector before calling spawn(). + Note that spawn() does not by itself call the command interpreter + (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : + ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&v); + v.dwPlatformId == VER_PLATFORM_WIN32_NT; + }) ? "cmd.exe" : "command.com"). + Instead it simply concatenates the arguments, separated by ' ', and calls + CreateProcess(). We must quote the arguments since Win32 CreateProcess() + interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a + special way: + - Space and tab are interpreted as delimiters. They are not treated as + delimiters if they are surrounded by double quotes: "...". + - Unescaped double quotes are removed from the input. Their only effect is + that within double quotes, space and tab are treated like normal + characters. + - Backslashes not followed by double quotes are not special. + - But 2*n+1 backslashes followed by a double quote become + n backslashes followed by a double quote (n >= 0): + \" -> " + \\\" -> \" + \\\\\" -> \\" + */ +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +char ** +prepare_spawn (char **argv) +{ + size_t argc; + char **new_argv; + size_t i; + + /* Count number of arguments. */ + for (argc = 0; argv[argc] != NULL; argc++) + ; + + /* Allocate new argument vector. */ + new_argv = XMALLOC (char *, argc + 1); + + /* Put quoted arguments into the new argument vector. */ + for (i = 0; i < argc; i++) + { + const char *string = argv[i]; + + if (string[0] == '\0') + new_argv[i] = xstrdup ("\"\""); + else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) + { + int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); + size_t length; + unsigned int backslashes; + const char *s; + char *quoted_string; + char *p; + + length = 0; + backslashes = 0; + if (quote_around) + length++; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + length += backslashes + 1; + length++; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + length += backslashes + 1; + + quoted_string = XMALLOC (char, length + 1); + + p = quoted_string; + backslashes = 0; + if (quote_around) + *p++ = '"'; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + { + unsigned int j; + for (j = backslashes + 1; j > 0; j--) + *p++ = '\\'; + } + *p++ = c; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + { + unsigned int j; + for (j = backslashes; j > 0; j--) + *p++ = '\\'; + *p++ = '"'; + } + *p = '\0'; + + new_argv[i] = quoted_string; + } + else + new_argv[i] = (char *) string; + } + new_argv[argc] = NULL; + + return new_argv; +} +EOF + ;; + esac + + cat <<"EOF" +void lt_dump_script (FILE* f) +{ +EOF + func_emit_wrapper yes | + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' + cat <<"EOF" +} +EOF +} +# end: func_emit_cwrapperexe_src + +# func_win32_import_lib_p ARG +# True if ARG is an import lib, as indicated by $file_magic_cmd +func_win32_import_lib_p () +{ + $debug_cmd + + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +} + +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + +# func_mode_link arg... +func_mode_link () +{ + $debug_cmd + + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + # It is impossible to link a dll without this setting, and + # we shouldn't force the makefile maintainer to figure out + # what system we are compiling for in order to pass an extra + # flag for every libtool invocation. + # allow_undefined=no + + # FIXME: Unfortunately, there are problems with the above when trying + # to make a dll that has undefined symbols, in which case not + # even a static library is built. For now, we need to specify + # -no-undefined on the libtool link line when we can be certain + # that all symbols are satisfied, otherwise we get a static library. + allow_undefined=yes + ;; + *) + allow_undefined=yes + ;; + esac + libtool_args=$nonopt + base_compile="$nonopt $@" + compile_command=$nonopt + finalize_command=$nonopt + + compile_rpath= + finalize_rpath= + compile_shlibpath= + finalize_shlibpath= + convenience= + old_convenience= + deplibs= + old_deplibs= + compiler_flags= + linker_flags= + dllsearchpath= + lib_search_path=`pwd` + inst_prefix_dir= + new_inherited_linker_flags= + + avoid_version=no + bindir= + dlfiles= + dlprefiles= + dlself=no + export_dynamic=no + export_symbols= + export_symbols_regex= + generated= + libobjs= + ltlibs= + module=no + no_install=no + objs= + os2dllname= + non_pic_objects= + precious_files_regex= + prefer_static_libs=no + preload=false + prev= + prevarg= + release= + rpath= + xrpath= + perm_rpath= + temp_rpath= + thread_safe=no + vinfo= + vinfo_number=no + weak_libs= + single_module=$wl-single_module + func_infer_tag $base_compile + + # We need to know -static, to get the right output filenames. + for arg + do + case $arg in + -shared) + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" + build_old_libs=no + break + ;; + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then + func_warning "complete static linking is impossible in this configuration" + fi + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + -static) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=built + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac + build_libtool_libs=no + build_old_libs=yes + break + ;; + esac + done + + # See if our shared archives depend on static archives. + test -n "$old_archive_from_new_cmds" && build_old_libs=yes + + # Go through the arguments, transforming them on the way. + while test "$#" -gt 0; do + arg=$1 + shift + func_quote_for_eval "$arg" + qarg=$func_quote_for_eval_unquoted_result + func_append libtool_args " $func_quote_for_eval_result" + + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case $prev in + output) + func_append compile_command " @OUTPUT@" + func_append finalize_command " @OUTPUT@" + ;; + esac + + case $prev in + bindir) + bindir=$arg + prev= + continue + ;; + dlfiles|dlprefiles) + $preload || { + # Add the symbol object into the linking commands. + func_append compile_command " @SYMFILE@" + func_append finalize_command " @SYMFILE@" + preload=: + } + case $arg in + *.la | *.lo) ;; # We handle these cases below. + force) + if test no = "$dlself"; then + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + self) + if test dlprefiles = "$prev"; then + dlself=yes + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then + dlself=yes + else + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + *) + if test dlfiles = "$prev"; then + func_append dlfiles " $arg" + else + func_append dlprefiles " $arg" + fi + prev= + continue + ;; + esac + ;; + expsyms) + export_symbols=$arg + test -f "$arg" \ + || func_fatal_error "symbol file '$arg' does not exist" + prev= + continue + ;; + expsyms_regex) + export_symbols_regex=$arg + prev= + continue + ;; + framework) + case $host in + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; + *) func_append deplibs " $qarg.ltframework" # this is fixed later + ;; + esac + ;; + esac + prev= + continue + ;; + inst_prefix) + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. + prev= + continue + ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg + moreargs= + for fil in `cat "$save_arg"` + do +# func_append moreargs " $fil" + arg=$fil + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= + + # Read the .lo file + func_source "$arg" + + if test -z "$pic_object" || + test -z "$non_pic_object" || + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" + fi + + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir=$func_dirname_result + + if test none != "$pic_object"; then + # Prepend the subdirectory the object is found in. + pic_object=$xdir$pic_object + + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then + func_append dlfiles " $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test dlprefiles = "$prev"; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= + fi + + # A PIC object. + func_append libobjs " $pic_object" + arg=$pic_object + fi + + # Non-PIC object. + if test none != "$non_pic_object"; then + # Prepend the subdirectory the object is found in. + non_pic_object=$xdir$non_pic_object + + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object=$pic_object + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir=$func_dirname_result + + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "'$arg' is not a valid libtool object" + fi + fi + done + else + func_fatal_error "link input file '$arg' does not exist" + fi + arg=$save_arg + prev= + continue + ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; + precious_regex) + precious_files_regex=$arg + prev= + continue + ;; + release) + release=-$arg + prev= + continue + ;; + rpath | xrpath) + # We need an absolute path. + case $arg in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + if test rpath = "$prev"; then + case "$rpath " in + *" $arg "*) ;; + *) func_append rpath " $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; + *) func_append xrpath " $arg" ;; + esac + fi + prev= + continue + ;; + shrext) + shrext_cmds=$arg + prev= + continue + ;; + weak) + func_append weak_libs " $arg" + prev= + continue + ;; + xcclinker) + func_append linker_flags " $qarg" + func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) + func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) + func_append linker_flags " $qarg" + func_append compiler_flags " $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" + continue + ;; + *) + eval "$prev=\"\$arg\"" + prev= + continue + ;; + esac + fi # test -n "$prev" + + prevarg=$arg + + case $arg in + -all-static) + if test -n "$link_static_flag"; then + # See comment for -static flag below, for more details. + func_append compile_command " $link_static_flag" + func_append finalize_command " $link_static_flag" + fi + continue + ;; + + -allow-undefined) + # FIXME: remove this flag sometime in the future. + func_fatal_error "'-allow-undefined' must not be used because it is the default" + ;; + + -avoid-version) + avoid_version=yes + continue + ;; + + -bindir) + prev=bindir + continue + ;; + + -dlopen) + prev=dlfiles + continue + ;; + + -dlpreopen) + prev=dlprefiles + continue + ;; + + -export-dynamic) + export_dynamic=yes + continue + ;; + + -export-symbols | -export-symbols-regex) + if test -n "$export_symbols" || test -n "$export_symbols_regex"; then + func_fatal_error "more than one -exported-symbols argument is not allowed" + fi + if test X-export-symbols = "X$arg"; then + prev=expsyms + else + prev=expsyms_regex + fi + continue + ;; + + -framework) + prev=framework + continue + ;; + + -inst-prefix-dir) + prev=inst_prefix + continue + ;; + + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* + # so, if we see these flags be careful not to treat them like -L + -L[A-Z][A-Z]*:*) + case $with_gcc/$host in + no/*-*-irix* | /*-*-irix*) + func_append compile_command " $arg" + func_append finalize_command " $arg" + ;; + esac + continue + ;; + + -L*) + func_stripname "-L" '' "$arg" + if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between '-L' and '$1'" + else + func_fatal_error "need path for '-L' option" + fi + fi + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` + test -z "$absdir" && \ + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir + ;; + esac + case "$deplibs " in + *" -L$dir "* | *" $arg "*) + # Will only happen for absolute or sysroot arguments + ;; + *) + # Preserve sysroot, but never include relative directories + case $dir in + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; + *) func_append deplibs " -L$dir" ;; + esac + func_append lib_search_path " $dir" + ;; + esac + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; + *) func_append dllsearchpath ":$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac + continue + ;; + + -l*) + if test X-lc = "X$arg" || test X-lm = "X$arg"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + # These systems don't actually have a C or math library (as such) + continue + ;; + *-*-os2*) + # These systems don't actually have a C library (as such) + test X-lc = "X$arg" && continue + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + # Do not include libc due to us having libc/libc_r. + test X-lc = "X$arg" && continue + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework + func_append deplibs " System.ltframework" + continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test X-lc = "X$arg" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test X-lc = "X$arg" && continue + ;; + esac + elif test X-lc_r = "X$arg"; then + case $host in + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; + esac + fi + func_append deplibs " $arg" + continue + ;; + + -mllvm) + prev=mllvm + continue + ;; + + -module) + module=yes + continue + ;; + + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. + -model|-arch|-isysroot|--sysroot) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler + continue + ;; + + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac + continue + ;; + + -multi_module) + single_module=$wl-multi_module + continue + ;; + + -no-fast-install) + fast_install=no + continue + ;; + + -no-install) + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) + # The PATH hackery in wrapper scripts is required on Windows + # and Darwin in order for the loader to find any dlls it needs. + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" + fast_install=no + ;; + *) no_install=yes ;; + esac + continue + ;; + + -no-undefined) + allow_undefined=no + continue + ;; + + -objectlist) + prev=objectlist + continue + ;; + + -os2dllname) + prev=os2dllname + continue + ;; + + -o) prev=output ;; + + -precious-files-regex) + prev=precious_regex + continue + ;; + + -release) + prev=release + continue + ;; + + -rpath) + prev=rpath + continue + ;; + + -R) + prev=xrpath + continue + ;; + + -R*) + func_stripname '-R' '' "$arg" + dir=$func_stripname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + =*) + func_stripname '=' '' "$dir" + dir=$lt_sysroot$func_stripname_result + ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; + *) func_append xrpath " $dir" ;; + esac + continue + ;; + + -shared) + # The effects of -shared are defined in a previous loop. + continue + ;; + + -shrext) + prev=shrext + continue + ;; + + -static | -static-libtool-libs) + # The effects of -static are defined in a previous loop. + # We used to do the same as -all-static on platforms that + # didn't have a PIC flag, but the assumption that the effects + # would be equivalent was wrong. It would break on at least + # Digital Unix and AIX. + continue + ;; + + -thread-safe) + thread_safe=yes + continue + ;; + + -version-info) + prev=vinfo + continue + ;; + + -version-number) + prev=vinfo + vinfo_number=yes + continue + ;; + + -weak) + prev=weak + continue + ;; + + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs=$IFS; IFS=, + for flag in $args; do + IFS=$save_ifs + func_quote_for_eval "$flag" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" + done + IFS=$save_ifs + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; + + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs=$IFS; IFS=, + for flag in $args; do + IFS=$save_ifs + func_quote_for_eval "$flag" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" + done + IFS=$save_ifs + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; + + -Xcompiler) + prev=xcompiler + continue + ;; + + -Xlinker) + prev=xlinker + continue + ;; + + -XCClinker) + prev=xcclinker + continue + ;; + + # -msg_* for osf cc + -msg_*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + ;; + + # Flags to be passed through unchanged, with rationale: + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC + # -F/path path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC + # @file GCC response files + # -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=*| \ + -specs=*|-fsanitize=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" + func_append finalize_command " $arg" + func_append compiler_flags " $arg" + continue + ;; + + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + + # Some other compiler flag. + -* | +*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + ;; + + *.$objext) + # A standard object. + func_append objs " $arg" + ;; + + *.lo) + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= + + # Read the .lo file + func_source "$arg" + + if test -z "$pic_object" || + test -z "$non_pic_object" || + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" + fi + + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir=$func_dirname_result + + test none = "$pic_object" || { + # Prepend the subdirectory the object is found in. + pic_object=$xdir$pic_object + + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then + func_append dlfiles " $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test dlprefiles = "$prev"; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= + fi + + # A PIC object. + func_append libobjs " $pic_object" + arg=$pic_object + } + + # Non-PIC object. + if test none != "$non_pic_object"; then + # Prepend the subdirectory the object is found in. + non_pic_object=$xdir$non_pic_object + + # A standard non-PIC object + func_append non_pic_objects " $non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object=$pic_object + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir=$func_dirname_result + + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "'$arg' is not a valid libtool object" + fi + fi + ;; + + *.$libext) + # An archive. + func_append deplibs " $arg" + func_append old_deplibs " $arg" + continue + ;; + + *.la) + # A libtool-controlled library. + + func_resolve_sysroot "$arg" + if test dlfiles = "$prev"; then + # This library was specified with -dlopen. + func_append dlfiles " $func_resolve_sysroot_result" + prev= + elif test dlprefiles = "$prev"; then + # The library was specified with -dlpreopen. + func_append dlprefiles " $func_resolve_sysroot_result" + prev= + else + func_append deplibs " $func_resolve_sysroot_result" + fi + continue + ;; + + # Some other compiler argument. + *) + # Unknown arguments in both finalize_command and compile_command need + # to be aesthetically quoted because they are evaled later. + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + ;; + esac # arg + + # Now actually substitute the argument into the commands. + if test -n "$arg"; then + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + done # argument parsing loop + + test -n "$prev" && \ + func_fatal_help "the '$prevarg' option requires an argument" + + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + + oldlibs= + # calculate the name of the file, without its directory + func_basename "$output" + outputname=$func_basename_result + libobjs_save=$libobjs + + if test -n "$shlibpath_var"; then + # get the directories listed in $shlibpath_var + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` + else + shlib_search_path= + fi + eval sys_lib_search_path=\"$sys_lib_search_path_spec\" + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + + func_dirname "$output" "/" "" + output_objdir=$func_dirname_result$objdir + func_to_tool_file "$output_objdir/" + tool_output_objdir=$func_to_tool_file_result + # Create the object directory. + func_mkdir_p "$output_objdir" + + # Determine the type of output + case $output in + "") + func_fatal_help "you must specify an output file" + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; + *.la) linkmode=lib ;; + *) linkmode=prog ;; # Anything else should be a program. + esac + + specialdeplibs= + + libs= + # Find all interdependent deplibs by searching for libraries + # that are linked more than once (e.g. -la -lb -la) + for deplib in $deplibs; do + if $opt_preserve_dup_deps; then + case "$libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append libs " $deplib" + done + + if test lib = "$linkmode"; then + libs="$predeps $libs $compiler_lib_search_path $postdeps" + + # Compute libraries that are listed more than once in $predeps + # $postdeps and mark them as special (i.e., whose duplicates are + # not to be eliminated). + pre_post_deps= + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + esac + func_append pre_post_deps " $pre_post_dep" + done + fi + pre_post_deps= + fi + + deplibs= + newdependency_libs= + newlib_search_path= + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries + notinst_path= # paths that contain not-installed libtool libraries + + case $linkmode in + lib) + passes="conv dlpreopen link" + for file in $dlfiles $dlprefiles; do + case $file in + *.la) ;; + *) + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" + ;; + esac + done + ;; + prog) + compile_deplibs= + finalize_deplibs= + alldeplibs=false + newdlfiles= + newdlprefiles= + passes="conv scan dlopen dlpreopen link" + ;; + *) passes="conv" + ;; + esac + + for pass in $passes; do + # The preopen pass in lib mode reverses $deplibs; put it back here + # so that -L comes before libs that need it for instance... + if test lib,link = "$linkmode,$pass"; then + ## FIXME: Find the place where the list is rebuilt in the wrong + ## order, and fix it there properly + tmp_deplibs= + for deplib in $deplibs; do + tmp_deplibs="$deplib $tmp_deplibs" + done + deplibs=$tmp_deplibs + fi + + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs + deplibs= + fi + if test prog = "$linkmode"; then + case $pass in + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; + esac + fi + if test lib,dlpreopen = "$linkmode,$pass"; then + # Collect and forward deplibs of preopened libtool libs + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= + func_resolve_sysroot "$lib" + case $lib in + *.la) func_source "$func_resolve_sysroot_result" ;; + esac + + # Collect preopened libtool deplibs, except any this library + # has declared as weak libs + for deplib in $dependency_libs; do + func_basename "$deplib" + deplib_base=$func_basename_result + case " $weak_libs " in + *" $deplib_base "*) ;; + *) func_append deplibs " $deplib" ;; + esac + done + done + libs=$dlprefiles + fi + if test dlopen = "$pass"; then + # Collect dlpreopened libraries + save_deplibs=$deplibs + deplibs= + fi + + for deplib in $libs; do + lib= + found=false + case $deplib in + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + func_append compiler_flags " $deplib" + if test lib = "$linkmode"; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi + continue + ;; + -l*) + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" + continue + fi + func_stripname '-l' '' "$deplib" + name=$func_stripname_result + if test lib = "$linkmode"; then + searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" + else + searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" + fi + for searchdir in $searchdirs; do + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib=$searchdir/lib$name$search_ext + if test -f "$lib"; then + if test .la = "$search_ext"; then + found=: + else + found=false + fi + break 2 + fi + done + done + if $found; then + # deplib is a libtool library + # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, + # We need to do some special things here, and not later. + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + case " $predeps $postdeps " in + *" $deplib "*) + if func_lalib_p "$lib"; then + library_names= + old_library= + func_source "$lib" + for l in $old_library $library_names; do + ll=$l + done + if test "X$ll" = "X$old_library"; then # only static version available + found=false + func_dirname "$lib" "" "." + ladir=$func_dirname_result + lib=$ladir/$old_library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + fi + ;; + *) ;; + esac + fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue + fi + ;; # -l + *.ltframework) + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + if test lib = "$linkmode"; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi + continue + ;; + -L*) + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test conv = "$pass" && continue + newdependency_libs="$deplib $newdependency_libs" + func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + prog) + if test conv = "$pass"; then + deplibs="$deplib $deplibs" + continue + fi + if test scan = "$pass"; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + *) + func_warning "'-L' is ignored for archives/objects" + ;; + esac # linkmode + continue + ;; # -L + -R*) + if test link = "$pass"; then + func_stripname '-R' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; + *) func_append xrpath " $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; + *.la) + func_resolve_sysroot "$deplib" + lib=$func_resolve_sysroot_result + ;; + *.$libext) + if test conv = "$pass"; then + deplibs="$deplib $deplibs" + continue + fi + case $linkmode in + lib) + # Linking convenience modules into shared libraries is allowed, + # but linking other static libraries is non-portable. + case " $dlpreconveniencelibs " in + *" $deplib "*) ;; + *) + valid_a_lib=false + case $deplibs_check_method in + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ + | $EGREP "$match_pattern_regex" > /dev/null; then + valid_a_lib=: + fi + ;; + pass_all) + valid_a_lib=: + ;; + esac + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else + echo + $ECHO "*** Warning: Trying to link with static lib archive $deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because the file extensions .$libext of this argument makes me believe" + echo "*** that it is just a static archive that I should not use here." + fi + ;; + esac + continue + ;; + prog) + if test link != "$pass"; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + continue + ;; + esac # linkmode + ;; # *.$libext + *.lo | *.$objext) + if test conv = "$pass"; then + deplibs="$deplib $deplibs" + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then + # If there is no dlopen support or we're linking statically, + # we need to preload. + func_append newdlprefiles " $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + func_append newdlfiles " $deplib" + fi + fi + continue + ;; + %DEPLIBS%) + alldeplibs=: + continue + ;; + esac # case $deplib + + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$lib" \ + || func_fatal_error "'$lib' is not a valid libtool archive" + + func_dirname "$lib" "" "." + ladir=$func_dirname_result + + dlname= + dlopen= + dlpreopen= + libdir= + library_names= + old_library= + inherited_linker_flags= + # If the library was installed with an old release of libtool, + # it will not redefine variables installed, or shouldnotlink + installed=yes + shouldnotlink=no + avoidtemprpath= + + + # Read the .la file + func_source "$lib" + + # Convert "-framework foo" to "foo.ltframework" + if test -n "$inherited_linker_flags"; then + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + esac + done + fi + dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then + test -n "$dlopen" && func_append dlfiles " $dlopen" + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + fi + + if test conv = "$pass"; then + # Only check for convenience libraries + deplibs="$lib $deplibs" + if test -z "$libdir"; then + if test -z "$old_library"; then + func_fatal_error "cannot find name of link library for '$lib'" + fi + # 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 + continue + fi # $pass = conv + + + # Get the name of the library we link against. + linklib= + if test -n "$old_library" && + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then + linklib=$old_library + else + for l in $old_library $library_names; do + linklib=$l + done + fi + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for '$lib'" + fi + + # This library was specified with -dlopen. + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" + if test -z "$dlname" || + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then + # If there is no dlname, no dlopen support or we're linking + # statically, we need to preload. We also need to preload any + # dependent libraries so libltdl's deplib preloader doesn't + # bomb out in the load deplibs phase. + func_append dlprefiles " $lib $dependency_libs" + else + func_append newdlfiles " $lib" + fi + continue + fi # $pass = dlopen + + # We need an absolute path. + case $ladir in + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; + *) + abs_ladir=`cd "$ladir" && pwd` + if test -z "$abs_ladir"; then + func_warning "cannot determine absolute directory name of '$ladir'" + func_warning "passing it literally to the linker, although it might fail" + abs_ladir=$ladir + fi + ;; + esac + func_basename "$lib" + laname=$func_basename_result + + # Find the relevant object directory and library name. + if test yes = "$installed"; then + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir + else + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir + fi + test yes = "$hardcode_automatic" && avoidtemprpath=yes + else + if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then + dir=$ladir + absdir=$abs_ladir + # Remove this search path later + func_append notinst_path " $abs_ladir" + else + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir + # Remove this search path later + func_append notinst_path " $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" + name=$func_stripname_result + + # This library was specified with -dlpreopen. + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" + fi + case $host in + # special handling for platforms with PE-DLLs. + *cygwin* | *mingw* | *cegcc* ) + # Linker will automatically link against shared library if both + # static and shared are present. Therefore, ensure we extract + # symbols from the import library if a shared library is present + # (otherwise, the dlopen module name will be incorrect). We do + # this by putting the import library name into $newdlprefiles. + # We recover the dlopen module name by 'saving' the la file + # name in a special purpose variable, and (later) extracting the + # dlname from the la file. + if test -n "$dlname"; then + func_tr_sh "$dir/$linklib" + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" + func_append newdlprefiles " $dir/$linklib" + else + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + fi + ;; + * ) + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + func_append newdlprefiles " $dir/$dlname" + else + func_append newdlprefiles " $dir/$linklib" + fi + ;; + esac + fi # $pass = dlpreopen + + if test -z "$libdir"; then + # Link the convenience library + if test lib = "$linkmode"; then + deplibs="$dir/$old_library $deplibs" + elif test prog,link = "$linkmode,$pass"; then + compile_deplibs="$dir/$old_library $compile_deplibs" + finalize_deplibs="$dir/$old_library $finalize_deplibs" + else + deplibs="$lib $deplibs" # used for prog,scan pass + fi + continue + fi + + + if test prog = "$linkmode" && test link != "$pass"; then + func_append newlib_search_path " $ladir" + deplibs="$lib $deplibs" + + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: + fi + + tmp_libs= + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + esac + # Need to link against all dependency_libs? + if $linkalldeplibs; then + deplibs="$deplib $deplibs" + else + # Need to hardcode shared library paths + # or/and link against static libraries + newdependency_libs="$deplib $newdependency_libs" + fi + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done # for deplib + continue + fi # $linkmode = prog... + + if test prog,link = "$linkmode,$pass"; then + if test -n "$library_names" && + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || + test -z "$old_library"; }; then + # We need to hardcode the library path + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then + # Make sure the rpath contains only unique directories. + case $temp_rpath: in + *"$absdir:"*) ;; + *) func_append temp_rpath "$absdir:" ;; + esac + fi + + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac + fi # $linkmode,$pass = prog,link... + + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && + test -n "$library_names"; }; }; then + # We only need to search for static libraries + continue + fi + fi + + link_static=no # Whether the deplib will be linked statically + use_static_libs=$prefer_static_libs + if test built = "$use_static_libs" && test yes = "$installed"; then + use_static_libs=no + fi + if test -n "$library_names" && + { test no = "$use_static_libs" || test -z "$old_library"; }; then + case $host in + *cygwin* | *mingw* | *cegcc* | *os2*) + # No point in relinking DLLs because paths are not encoded + func_append notinst_deplibs " $lib" + need_relink=no + ;; + *) + if test no = "$installed"; then + func_append notinst_deplibs " $lib" + need_relink=yes + fi + ;; + esac + # This is a shared library + + # Warn about portability, can't link against -module's on some + # systems (darwin). Don't bleat about dlopened modules though! + dlopenmodule= + for dlpremoduletest in $dlprefiles; do + if test "X$dlpremoduletest" = "X$lib"; then + dlopenmodule=$dlpremoduletest + break + fi + done + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then + echo + if test prog = "$linkmode"; then + $ECHO "*** Warning: Linking the executable $output against the loadable module" + else + $ECHO "*** Warning: Linking the shared library $output against the loadable module" + fi + $ECHO "*** $linklib is not portable!" + fi + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac + fi + + if test -n "$old_archive_from_expsyms_cmds"; then + # figure out the soname + set dummy $library_names + shift + realname=$1 + shift + libname=`eval "\\$ECHO \"$libname_spec\""` + # use dlname if we got it. it's perfectly good, no? + if test -n "$dlname"; then + soname=$dlname + elif test -n "$soname_spec"; then + # bleh windows + case $host in + *cygwin* | mingw* | *cegcc* | *os2*) + func_arith $current - $age + major=$func_arith_result + versuffix=-$major + ;; + esac + eval soname=\"$soname_spec\" + else + soname=$realname + fi + + # Make a new name for the extract_expsyms_cmds to use + soroot=$soname + func_basename "$soroot" + soname=$func_basename_result + func_stripname 'lib' '.dll' "$soname" + newlib=libimp-$func_stripname_result.a + + # If the library has no export list, then create one now + if test -f "$output_objdir/$soname-def"; then : + else + func_verbose "extracting exported symbol list from '$soname'" + func_execute_cmds "$extract_expsyms_cmds" 'exit $?' + fi + + # Create $newlib + if test -f "$output_objdir/$newlib"; then :; else + func_verbose "generating import library for '$soname'" + func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' + fi + # make sure the library variables are pointing to the new library + dir=$output_objdir + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + + if test prog = "$linkmode" || test relink != "$opt_mode"; then + add_shlibpath= + add_dir= + add= + lib_linked=yes + case $hardcode_action in + immediate | unsupported) + if test no = "$hardcode_direct"; then + add=$dir/$linklib + case $host in + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir=-L$dir ;; + *-*-darwin* ) + # if the lib is a (non-dlopened) module then we cannot + # link against it, someone is ignoring the earlier warnings + if /usr/bin/file -L $add 2> /dev/null | + $GREP ": [^:]* bundle" >/dev/null; then + if test "X$dlopenmodule" != "X$lib"; then + $ECHO "*** Warning: lib $linklib is a module, not a shared library" + if test -z "$old_library"; then + echo + echo "*** And there doesn't seem to be a static archive available" + echo "*** The link will probably fail, sorry" + else + add=$dir/$old_library + fi + elif test -n "$old_library"; then + add=$dir/$old_library + fi + fi + esac + elif test no = "$hardcode_minus_L"; then + case $host in + *-*-sunos*) add_shlibpath=$dir ;; + esac + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name + else + lib_linked=no + fi + ;; + relink) + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name + else + lib_linked=no + fi + ;; + *) lib_linked=no ;; + esac + + if test yes != "$lib_linked"; then + func_fatal_configuration "unsupported hardcode properties" + fi + + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; + *) func_append compile_shlibpath "$add_shlibpath:" ;; + esac + fi + if test prog = "$linkmode"; then + test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" + test -n "$add" && compile_deplibs="$add $compile_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; + esac + fi + fi + fi + + if test prog = "$linkmode" || test relink = "$opt_mode"; then + add_shlibpath= + add_dir= + add= + # Finalize command for both is simple: just hardcode it. + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; + esac + add=-l$name + elif test yes = "$hardcode_automatic"; then + if test -n "$inst_prefix_dir" && + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib + else + add=$libdir/$linklib + fi + else + # We cannot seem to hardcode it, guess we'll fake it. + add_dir=-L$libdir + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi + add=-l$name + fi + + if test prog = "$linkmode"; then + test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" + test -n "$add" && finalize_deplibs="$add $finalize_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + fi + fi + elif test prog = "$linkmode"; then + # Here we assume that one of hardcode_direct or hardcode_minus_L + # is not unsupported. This is valid on all known static and + # shared platforms. + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library + compile_deplibs="$dir/$linklib $compile_deplibs" + finalize_deplibs="$dir/$linklib $finalize_deplibs" + else + compile_deplibs="-l$name -L$dir $compile_deplibs" + finalize_deplibs="-l$name -L$dir $finalize_deplibs" + fi + elif test yes = "$build_libtool_libs"; then + # Not a shared library + if test pass_all != "$deplibs_check_method"; then + # We're trying link a shared library against a static one + # but the system doesn't support it. + + # Just print a warning and add the library to dependency_libs so + # that the program can be linked against the static library. + echo + $ECHO "*** Warning: This system cannot link to static lib archive $lib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." + if test yes = "$module"; then + echo "*** But as you try to build a module library, libtool will still create " + echo "*** a static module, that should work as long as the dlopening application" + echo "*** is linked with the -dlopen flag to resolve symbols at runtime." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** 'nm' from GNU binutils and a full rebuild may help." + fi + if test no = "$build_old_libs"; then + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + else + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi + fi # link shared/static library? + + if test lib = "$linkmode"; then + if test -n "$dependency_libs" && + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do + case $libdir in + -R*) func_stripname '-R' '' "$libdir" + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; + *) func_append xrpath " $temp_xrpath";; + esac;; + *) func_append temp_deplibs " $libdir";; + esac + done + dependency_libs=$temp_deplibs + fi + + func_append newlib_search_path " $absdir" + # Link against this library + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result";; + *) func_resolve_sysroot "$deplib" ;; + esac + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $func_resolve_sysroot_result "*) + func_append specialdeplibs " $func_resolve_sysroot_result" ;; + esac + fi + func_append tmp_libs " $func_resolve_sysroot_result" + done + + if test no != "$link_all_deplibs"; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do + path= + case $deplib in + -L*) path=$deplib ;; + *.la) + func_resolve_sysroot "$deplib" + deplib=$func_resolve_sysroot_result + func_dirname "$deplib" "" "." + dir=$func_dirname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; + *) + absdir=`cd "$dir" && pwd` + if test -z "$absdir"; then + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir + fi + ;; + esac + if $GREP "^installed=no" $deplib > /dev/null; then + case $host in + *-*-darwin*) + depdepl= + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do + depdepl=$tmp + done + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -z "$darwin_install_name"; then + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + fi + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" + path= + fi + fi + ;; + *) + path=-L$absdir/$objdir + ;; + esac + else + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "'$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ + func_warning "'$deplib' seems to be moved" + + path=-L$absdir + fi + ;; + esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$path $deplibs" ;; + esac + done + fi # link_all_deplibs != no + fi # linkmode = lib + done # for deplib in $libs + if test link = "$pass"; then + if test prog = "$linkmode"; then + compile_deplibs="$new_inherited_linker_flags $compile_deplibs" + finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" + else + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + fi + fi + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then + # Link the dlpreopened libraries before other libraries + for deplib in $save_deplibs; do + deplibs="$deplib $deplibs" + done + fi + if test dlopen != "$pass"; then + test conv = "$pass" || { + # Make sure lib_search_path contains only unique directories. + lib_search_path= + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; + *) func_append lib_search_path " $dir" ;; + esac + done + newlib_search_path= + } + + if test prog,link = "$linkmode,$pass"; then + vars="compile_deplibs finalize_deplibs" + else + vars=deplibs + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order + eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so + # that some nasty dependency loop isn't accidentally + # broken: + #new_libs="$deplib $new_libs" + # Pragmatically, this seems to cause very few problems in + # practice: + case $deplib in + -L*) new_libs="$deplib $new_libs" ;; + -R*) ;; + *) + # And here is the reason: when a library appears more + # than once as an explicit dependence of a library, or + # is implicitly linked in more than once by the + # compiler, it is considered special, and multiple + # occurrences thereof are not removed. Compare this + # with having the same library being listed as a + # dependency of multiple other libraries: in this case, + # we know (pedantically, we assume) the library does not + # need to be listed more than once, so we keep only the + # last copy. This is not always right, but it is rare + # enough that we require users that really mean to play + # such unportable linking tricks to link the library + # using -Wl,-lname, so that libtool does not consider it + # for duplicate removal. + case " $specialdeplibs " in + *" $deplib "*) new_libs="$deplib $new_libs" ;; + *) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$deplib $new_libs" ;; + esac + ;; + esac + ;; + esac + done + tmp_libs= + for deplib in $new_libs; do + case $deplib in + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; + *) func_append tmp_libs " $deplib" ;; + esac + ;; + *) func_append tmp_libs " $deplib" ;; + esac + done + eval $var=\"$tmp_libs\" + done # for var + fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + + # Last step: remove runtime libs from dependency_libs + # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs; do + case " $predeps $postdeps $compiler_lib_search_path " in + *" $i "*) + i= + ;; + esac + if test -n "$i"; then + func_append tmp_libs " $i" + fi + done + dependency_libs=$tmp_libs + done # for pass + if test prog = "$linkmode"; then + dlfiles=$newdlfiles + fi + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles + fi + + case $linkmode in + oldlib) + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "'-l' and '-L' are ignored for archives" ;; + esac + + test -n "$rpath" && \ + func_warning "'-rpath' is ignored for archives" + + test -n "$xrpath" && \ + func_warning "'-R' is ignored for archives" + + test -n "$vinfo" && \ + func_warning "'-version-info/-version-number' is ignored for archives" + + test -n "$release" && \ + func_warning "'-release' is ignored for archives" + + test -n "$export_symbols$export_symbols_regex" && \ + func_warning "'-export-symbols' is ignored for archives" + + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs=$output + func_append objs "$old_deplibs" + ;; + + lib) + # Make sure we only generate libraries of the form 'libNAME.la'. + case $outputname in + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + ;; + *) + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" + + if test no != "$need_lib_prefix"; then + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result + fi + ;; + esac + + if test -n "$objs"; then + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" + else + echo + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" + func_append libobjs " $objs" + fi + fi + + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" + + set dummy $rpath + shift + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" + + install_libdir=$1 + + oldlibs= + if test -z "$rpath"; then + if test yes = "$build_libtool_libs"; then + # Building a libtool convenience library. + # Some compilers have problems with a '.al' extension so + # convenience libraries should have the same extension an + # archive normally would. + oldlibs="$output_objdir/$libname.$libext $oldlibs" + build_libtool_libs=convenience + build_old_libs=yes + fi + + test -n "$vinfo" && \ + func_warning "'-version-info/-version-number' is ignored for convenience libraries" + + test -n "$release" && \ + func_warning "'-release' is ignored for convenience libraries" + else + + # Parse the version information argument. + save_ifs=$IFS; IFS=: + set dummy $vinfo 0 0 0 + shift + IFS=$save_ifs + + test -n "$7" && \ + func_fatal_help "too many parameters to '-version-info'" + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible + + case $vinfo_number in + yes) + number_major=$1 + number_minor=$2 + number_revision=$3 + # + # There are really only two kinds -- those that + # use the current revision as the major version + # and those that subtract age and use age as + # a minor version. But, then there is irix + # that has an extra 1 added just for fun + # + case $version_type in + # correct linux to gnu/linux during the next big refactor + darwin|freebsd-elf|linux|osf|windows|none) + func_arith $number_major + $number_minor + current=$func_arith_result + age=$number_minor + revision=$number_revision + ;; + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 + ;; + irix|nonstopux) + func_arith $number_major + $number_minor + current=$func_arith_result + age=$number_minor + revision=$number_minor + lt_irix_increment=no + ;; + *) + func_fatal_configuration "$modename: unknown library version type '$version_type'" + ;; + esac + ;; + no) + current=$1 + revision=$2 + age=$3 + ;; + esac + + # Check that each of the things are valid numbers. + case $current in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" + ;; + esac + + case $revision in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" + ;; + esac + + case $age in + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; + *) + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" + ;; + esac + + if test "$age" -gt "$current"; then + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" + fi + + # Calculate the version variables. + major= + versuffix= + verstring= + case $version_type in + none) ;; + + darwin) + # Like Linux, but with the current version available in + # verstring for coding it into the library header + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision + # Darwin ld doesn't like 0 for these options... + func_arith $current + 1 + minor_current=$func_arith_result + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac + ;; + + freebsd-aout) + major=.$current + versuffix=.$current.$revision + ;; + + freebsd-elf) + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision + ;; + + irix | nonstopux) + if test no = "$lt_irix_increment"; then + func_arith $current - $age + else + func_arith $current - $age + 1 + fi + major=$func_arith_result + + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; + *) verstring_prefix=sgi ;; + esac + verstring=$verstring_prefix$major.$revision + + # Add in all the interfaces that we are compatible with. + loop=$revision + while test 0 -ne "$loop"; do + func_arith $revision - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring=$verstring_prefix$major.$iface:$verstring + done + + # Before this point, $major must not contain '.'. + major=.$major + versuffix=$major.$revision + ;; + + linux) # correct to gnu/linux during the next big refactor + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision + ;; + + osf) + func_arith $current - $age + major=.$func_arith_result + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision + + # Add in all the interfaces that we are compatible with. + loop=$age + while test 0 -ne "$loop"; do + func_arith $current - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring=$verstring:$iface.0 + done + + # Make executables depend on our current version. + func_append verstring ":$current.0" + ;; + + qnx) + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current + ;; + + sunos) + major=.$current + versuffix=.$current.$revision + ;; + + windows) + # Use '-' rather than '.', since we only want one + # extension on DOS 8.3 file systems. + func_arith $current - $age + major=$func_arith_result + versuffix=-$major + ;; + + *) + func_fatal_configuration "unknown library version type '$version_type'" + ;; + esac + + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= + case $version_type in + darwin) + # we can't check for "0.0" in archive_cmds due to quoting + # problems, so we reset it completely + verstring= + ;; + *) + verstring=0.0 + ;; + esac + if test no = "$need_version"; then + versuffix= + else + versuffix=.0.0 + fi + fi + + # Remove version info from name if versioning should be avoided + if test yes,no = "$avoid_version,$need_version"; then + major= + versuffix= + verstring= + fi + + # Check to see if the archive will have undefined symbols. + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi + fi + else + # Don't allow undefined symbols. + allow_undefined_flag=$no_undefined_flag + fi + + fi + + func_generate_dlsyms "$libname" "$libname" : + func_append libobjs " $symfileobj" + test " " = "$libobjs" && libobjs= + + if test relink != "$opt_mode"; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= + tempremovelist=`$ECHO "$output_objdir/*"` + for p in $tempremovelist; do + case $p in + *.$objext | *.gcno) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then + if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 + then + continue + fi + fi + func_append removelist " $p" + ;; + *) ;; + esac + done + test -n "$removelist" && \ + func_show_eval "${RM}r \$removelist" + fi + + # Now set the variables for building old libraries. + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then + func_append oldlibs " $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` + fi + + # Eliminate all temporary directories. + #for path in $notinst_path; do + # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` + # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` + # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` + #done + + if test -n "$xrpath"; then + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do + func_replace_sysroot "$libdir" + func_append temp_xrpath " -R$func_replace_sysroot_result" + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + done + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then + dependency_libs="$temp_xrpath $dependency_libs" + fi + fi + + # Make sure dlfiles contains only unique files that won't be dlpreopened + old_dlfiles=$dlfiles + dlfiles= + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; + *) func_append dlfiles " $lib" ;; + esac + done + + # Make sure dlprefiles contains only unique files + old_dlprefiles=$dlprefiles + dlprefiles= + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; + *) func_append dlprefiles " $lib" ;; + esac + done + + if test yes = "$build_libtool_libs"; then + if test -n "$rpath"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) + # these systems don't actually have a c library (as such)! + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework + func_append deplibs " System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test yes = "$build_libtool_need_lc"; then + func_append deplibs " -lc" + fi + ;; + esac + fi + + # Transform deplibs into only deplibs that can be linked in shared. + name_save=$name + libname_save=$libname + release_save=$release + versuffix_save=$versuffix + major_save=$major + # I'm not sure if I'm treating the release correctly. I think + # release should show up in the -l (ie -lgmp5) so we don't want to + # add it in twice. Is that correct? + release= + versuffix= + major= + newdeplibs= + droppeddeps=no + case $deplibs_check_method in + pass_all) + # Don't check for shared/static. Everything works. + # This might be a little naive. We might want to check + # whether the library exists or not. But this is on + # osf3 & osf4 and I'm not really sure... Just + # implementing what was already the behavior. + newdeplibs=$deplibs + ;; + test_compile) + # This code stresses the "libraries are programs" paradigm to its + # limits. Maybe even breaks it. We compile a program, linking it + # against the deplibs as a proxy for the library. Then we can check + # whether they linked in statically or dynamically with ldd. + $opt_dry_run || $RM conftest.c + cat > conftest.c </dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | + $GREP " -> " >/dev/null; then + continue + fi + # The statement above tries to avoid entering an + # endless loop below, in case of cyclic links. + # We might still enter an endless loop, since a link + # loop can be closed while we follow links, + # but so what? + potlib=$potent_lib + while test -h "$potlib" 2>/dev/null; do + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` + case $potliblink in + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; + esac + done + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | + $SED -e 10q | + $EGREP "$file_magic_regex" > /dev/null; then + func_append newdeplibs " $a_deplib" + a_deplib= + break 2 + fi + done + done + fi + if test -n "$a_deplib"; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" + if test -z "$potlib"; then + $ECHO "*** with $libname but no candidates were found. (...for file magic test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a file magic. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + for a_deplib in $deplibs; do + case $a_deplib in + -l*) + func_stripname -l '' "$a_deplib" + name=$func_stripname_result + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + case " $predeps $postdeps " in + *" $a_deplib "*) + func_append newdeplibs " $a_deplib" + a_deplib= + ;; + esac + fi + if test -n "$a_deplib"; then + libname=`eval "\\$ECHO \"$libname_spec\""` + for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + for potent_lib in $potential_libs; do + potlib=$potent_lib # see symlink-check above in file_magic test + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then + func_append newdeplibs " $a_deplib" + a_deplib= + break 2 + fi + done + done + fi + if test -n "$a_deplib"; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" + if test -z "$potlib"; then + $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" + else + $ECHO "*** with $libname and none of the candidates passed a file format test" + $ECHO "*** using a regex pattern. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + none | unknown | *) + newdeplibs= + tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do + # can't use Xsed below, because $i might contain '/' + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` + done + fi + case $tmp_deplibs in + *[!\ \ ]*) + echo + if test none = "$deplibs_check_method"; then + echo "*** Warning: inter-library dependencies are not supported in this platform." + else + echo "*** Warning: inter-library dependencies are not known to be supported." + fi + echo "*** All declared inter-library dependencies are being dropped." + droppeddeps=yes + ;; + esac + ;; + esac + versuffix=$versuffix_save + major=$major_save + release=$release_save + libname=$libname_save + name=$name_save + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library with the System framework + newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` + ;; + esac + + if test yes = "$droppeddeps"; then + if test yes = "$module"; then + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" + $ECHO "*** dependencies of module $libname. Therefore, libtool will create" + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** 'nm' from GNU binutils and a full rebuild may help." + fi + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + else + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." + + if test no = "$allow_undefined"; then + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + fi + fi + # Done checking deplibs! + deplibs=$newdeplibs + fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + case $host in + *-*-darwin*) + newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) func_append new_libs " $deplib" ;; + esac + ;; + *) func_append new_libs " $deplib" ;; + esac + done + deplibs=$new_libs + + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= + dlname= + + # Test again, we may have decided not to build it any more + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac + if test yes = "$hardcode_into_libs"; then + # Hardcode the library paths + hardcode_libdirs= + dep_rpath= + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs=$libdir + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append dep_rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) func_append perm_rpath " $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir=$hardcode_libdirs + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + func_append rpath "$dir:" + done + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi + + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath + if test -n "$shlibpath"; then + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi + + # Get the real and link names of the library. + eval shared_ext=\"$shrext_cmds\" + eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname=$1 + shift + + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" + else + soname=$realname + fi + if test -z "$dlname"; then + dlname=$soname + fi + + lib=$output_objdir/$realname + linknames= + for link + do + func_append linknames " $link" + done + + # Use standard objects if they are pic + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` + test "X$libobjs" = "X " && libobjs= + + delfiles= + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp + func_append delfiles " $export_symbols" + fi + + orig_export_symbols= + case $host_os in + cygwin* | mingw* | cegcc*) + if test -n "$export_symbols" && test -z "$export_symbols_regex"; then + # exporting using user supplied symfile + func_dll_def_p "$export_symbols" || { + # and it's NOT already a .def file. Must figure out + # which of the given symbols are data symbols and tag + # them as such. So, trigger use of export_symbols_cmds. + # export_symbols gets reassigned inside the "prepare + # the list of exported symbols" if statement, so the + # include_expsyms logic still works. + orig_export_symbols=$export_symbols + export_symbols= + always_export_symbols=yes + } + fi + ;; + esac + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs=$IFS; IFS='~' + for cmd1 in $cmds; do + IFS=$save_ifs + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test yes = "$try_normal_branch" \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=$output_objdir/$output_la.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" + func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs + skipped_export=false + else + # The command line is too long to execute in one step. + func_verbose "using reloadable object file for export list..." + skipped_export=: + # Break out early, otherwise skipped_export may be + # set to false by a later but shorter cmd. + break + fi + done + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + fi + + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands, which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + + tmp_deplibs= + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; + *) + func_append tmp_deplibs " $test_deplib" + ;; + esac + done + deplibs=$tmp_deplibs + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec" && + test yes = "$compiler_needs_object" && + test -z "$libobjs"; then + # extract the archives, so we have objects to list. + # TODO: could optimize this to just extract one archive. + whole_archive_flag_spec= + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + + func_extract_archives $gentop $convenience + func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi + + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + func_append linker_flags " $flag" + fi + + # Make a backup of the uninstalled library when relinking + if test relink = "$opt_mode"; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? + fi + + # Do each of the archive commands. + if test yes = "$module" && test -n "$module_cmds"; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else + eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else + eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi + fi + + if test : != "$skipped_export" && + func_len " $test_cmds" && + len=$func_len_result && + test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else + # The command line is too long to link in one step, link piecewise + # or, if using GNU ld and skipped_export is not :, use a linker + # script. + + # Save the value of $output and $libobjs because we want to + # use them later. If we have whole_archive_flag_spec, we + # want to use save_libobjs as it was before + # whole_archive_flag_spec was expanded, because we can't + # assume the linker understands whole_archive_flag_spec. + # This may have to be revisited, in case too many + # convenience libraries get linked in and end up exceeding + # the spec. + if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + fi + save_output=$output + func_basename "$output" + output_la=$func_basename_result + + # Clear the reloadable object creation command queue and + # initialize k to one. + test_cmds= + concat_cmds= + objlist= + last_robj= + k=1 + + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript + func_verbose "creating GNU ld script: $output" + echo 'INPUT (' > $output + for obj in $save_libobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output + done + echo ')' >> $output + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk + func_verbose "creating linker input file list: $output" + : > $output + set x $save_libobjs + shift + firstobj= + if test yes = "$compiler_needs_object"; then + firstobj="$1 " + shift + fi + for obj + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output + done + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-$k.$objext + eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + + # Loop over the list of objects to be linked. + for obj in $save_libobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + if test -z "$objlist" || + test "$len" -lt "$max_cmd_len"; then + func_append objlist " $obj" + else + # The command $test_cmds is almost too long, add a + # command to the queue. + if test 1 -eq "$k"; then + # The first file doesn't have a previous command to add. + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" + else + # All subsequent reloadable object files will link in + # the last one created. + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-$k.$objext + func_arith $k + 1 + k=$func_arith_result + output=$output_objdir/$output_la-$k.$objext + objlist=" $obj" + func_len " $last_robj" + func_arith $len0 + $func_len_result + len=$func_arith_result + fi + done + # Handle the remaining objects by creating one last + # reloadable object file. All subsequent reloadable object + # files will link in the last one created. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" + if test -n "$last_robj"; then + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + func_append delfiles " $output" + + else + output= + fi + + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp + $opt_dry_run || $RM $export_symbols + libobjs=$output + # Append the command to create the export file. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + if test -n "$last_robj"; then + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" + fi + } + + test -n "$save_libobjs" && + func_verbose "creating a temporary reloadable object file: $output" + + # Loop through the commands generated above and execute them. + save_ifs=$IFS; IFS='~' + for cmd in $concat_cmds; do + IFS=$save_ifs + $opt_quiet || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test relink = "$opt_mode"; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi + + exit $lt_exit + } + done + IFS=$save_ifs + + if test -n "$export_symbols_regex" && ${skipped_export-false}; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + + ${skipped_export-false} && { + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test -n "$orig_export_symbols"; then + # The given exports_symbols file has to be filtered, so filter it. + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # 's' commands, which not all seds can handle. GNU sed should be fine + # though. Also, the filter scales superlinearly with the number of + # global variables. join(1) would be nice here, but unfortunately + # isn't a blessed tool. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + } + + libobjs=$output + # Restore the value of output. + output=$save_output + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the + # value of $libobjs for piecewise linking. + + # Do each of the archive commands. + if test yes = "$module" && test -n "$module_cmds"; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + cmds=$module_expsym_cmds + else + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + cmds=$archive_expsym_cmds + else + cmds=$archive_cmds + fi + fi + fi + + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. + eval cmds=\"\$cmds~\$RM $delfiles\" + fi + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles + func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + + save_ifs=$IFS; IFS='~' + for cmd in $cmds; do + IFS=$sp$nl + eval cmd=\"$cmd\" + IFS=$save_ifs + $opt_quiet || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test relink = "$opt_mode"; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi + + exit $lt_exit + } + done + IFS=$save_ifs + + # Restore the uninstalled library and exit + if test relink = "$opt_mode"; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? + + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then + func_show_eval '${RM}r "$gentop"' + fi + fi + + exit $EXIT_SUCCESS + fi + + # Create links to the real library. + for linkname in $linknames; do + if test "$realname" != "$linkname"; then + func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' + fi + done + + # If -module or -export-dynamic was specified, set the dlname. + if test yes = "$module" || test yes = "$export_dynamic"; then + # On all known operating systems, these are identical. + dlname=$soname + fi + fi + ;; + + obj) + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "'-l' and '-L' are ignored for objects" ;; + esac + + test -n "$rpath" && \ + func_warning "'-rpath' is ignored for objects" + + test -n "$xrpath" && \ + func_warning "'-R' is ignored for objects" + + test -n "$vinfo" && \ + func_warning "'-version-info' is ignored for objects" + + test -n "$release" && \ + func_warning "'-release' is ignored for objects" + + case $output in + *.lo) + test -n "$objs$old_deplibs" && \ + func_fatal_error "cannot build library object '$output' from non-libtool objects" + + libobj=$output + func_lo2o "$libobj" + obj=$func_lo2o_result + ;; + *) + libobj= + obj=$output + ;; + esac + + # Delete the old objects. + $opt_dry_run || $RM $obj $libobj + + # Objects from convenience libraries. This assumes + # single-version convenience libraries. Whenever we create + # different ones for PIC/non-PIC, this we'll have to duplicate + # the extraction. + reload_conv_objs= + gentop= + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec"; then + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags + else + gentop=$output_objdir/${obj}x + func_append generated " $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + + # If we're not building shared, we need to use non_pic_objs + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects + + # Create the old-style object. + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs + + output=$obj + func_execute_cmds "$reload_cmds" 'exit $?' + + # Exit if we aren't doing a library object file. + if test -z "$libobj"; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS + fi + + test yes = "$build_libtool_libs" || { + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $show "echo timestamp > $libobj" + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? + exit $EXIT_SUCCESS + } + + if test -n "$pic_flag" || test default != "$pic_mode"; then + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output=$libobj + func_execute_cmds "$reload_cmds" 'exit $?' + fi + + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS + ;; + + prog) + case $host in + *cygwin*) func_stripname '' '.exe' "$output" + output=$func_stripname_result.exe;; + esac + test -n "$vinfo" && \ + func_warning "'-version-info' is ignored for programs" + + test -n "$release" && \ + func_warning "'-release' is ignored for programs" + + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` + ;; + esac + + case $host in + *-*-darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + # But is supposedly fixed on 10.4 or later (yay!). + if test CXX = "$tagname"; then + case ${MACOSX_DEPLOYMENT_TARGET-10.0} in + 10.[0123]) + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" + ;; + esac + fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac + + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) func_append new_libs " $deplib" ;; + esac + ;; + *) func_append new_libs " $deplib" ;; + esac + done + compile_deplibs=$new_libs + + + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" + + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. + for libdir in $rpath $xrpath; do + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + done + fi + + # Now hardcode the library paths + rpath= + hardcode_libdirs= + for libdir in $compile_rpath $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs=$libdir + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) func_append perm_rpath " $libdir" ;; + esac + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; + *) func_append dllsearchpath ":$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir=$hardcode_libdirs + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath=$rpath + + rpath= + hardcode_libdirs= + for libdir in $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs=$libdir + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; + *) func_append finalize_perm_rpath " $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir=$hardcode_libdirs + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath=$rpath + + if test -n "$libobjs" && test yes = "$build_old_libs"; then + # Transform all the library objects into standard objects. + compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + fi + + func_generate_dlsyms "$outputname" "@PROGRAM@" false + + # template prelinking step + if test -n "$prelink_cmds"; then + func_execute_cmds "$prelink_cmds" 'exit $?' + fi + + wrappers_required=: + case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=false + ;; + *cygwin* | *mingw* ) + test yes = "$build_libtool_libs" || wrappers_required=false + ;; + *) + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false + fi + ;; + esac + $wrappers_required || { + # Replace the output file specification. + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + link_command=$compile_command$compile_rpath + + # We have no uninstalled library dependencies, so finalize right now. + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' + fi + + exit $exit_status + } + + if test -n "$compile_shlibpath$finalize_shlibpath"; then + compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" + fi + if test -n "$finalize_shlibpath"; then + finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" + fi + + compile_var= + finalize_var= + if test -n "$runpath_var"; then + if test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + func_append rpath "$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + if test -n "$finalize_perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do + func_append rpath "$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + fi + + if test yes = "$no_install"; then + # We don't need to create a wrapper script. + link_command=$compile_var$compile_command$compile_rpath + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + # Delete the old output file. + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + exit $EXIT_SUCCESS + fi + + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac + + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + + # Delete the old output files. + $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname + + func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + # Now create the wrapper script. + func_verbose "creating $output" + + # Quote the relink command for shipping. + if test -n "$relink_command"; then + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi + done + relink_command="(cd `pwd`; $relink_command)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + fi + + # Only actually do things if not in dry run mode. + $opt_dry_run || { + # win32 will think the script is a binary if it has + # a .exe suffix, so we strip it off here. + case $output in + *.exe) func_stripname '' '.exe' "$output" + output=$func_stripname_result ;; + esac + # test for cygwin because mv fails w/o .exe extensions + case $host in + *cygwin*) + exeext=.exe + func_stripname '' '.exe' "$outputname" + outputname=$func_stripname_result ;; + *) exeext= ;; + esac + case $host in + *cygwin* | *mingw* ) + func_dirname_and_basename "$output" "" "." + output_name=$func_basename_result + output_path=$func_dirname_result + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe + $RM $cwrappersource $cwrapper + trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + func_emit_cwrapperexe_src > $cwrappersource + + # The wrapper executable is built using the $host compiler, + # because it contains $host paths and files. If cross- + # compiling, it, like the target executable, must be + # executed on the $host or under an emulation environment. + $opt_dry_run || { + $LTCC $LTCFLAGS -o $cwrapper $cwrappersource + $STRIP $cwrapper + } + + # Now, create the wrapper script for func_source use: + func_ltwrapper_scriptname $cwrapper + $RM $func_ltwrapper_scriptname_result + trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 + $opt_dry_run || { + # note: this script will not be executed, so do not chmod. + if test "x$build" = "x$host"; then + $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result + else + func_emit_wrapper no > $func_ltwrapper_scriptname_result + fi + } + ;; + * ) + $RM $output + trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 + + func_emit_wrapper no > $output + chmod +x $output + ;; + esac + } + exit $EXIT_SUCCESS + ;; + esac + + # See if we need to build an old-fashioned archive. + for oldlib in $oldlibs; do + + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience + build_libtool_libs=no + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) + oldobjs="$old_deplibs $non_pic_objects" + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac + + if test -n "$addlibs"; then + gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + + func_extract_archives $gentop $addlibs + func_append oldobjs " $func_extract_archives_result" + fi + + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then + cmds=$old_archive_from_new_cmds + else + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles + func_append oldobjs " $func_extract_archives_result" + fi + + # POSIX demands no paths to be encoded in archives. We have + # to avoid creating archives with duplicate basenames if we + # might have to extract them afterwards, e.g., when creating a + # static archive out of a convenience library, or when linking + # the entirety of a libtool archive into another (currently + # not supported by libtool). + if (for obj in $oldobjs + do + func_basename "$obj" + $ECHO "$func_basename_result" + done | sort | sort -uc >/dev/null 2>&1); then + : + else + echo "copying selected object files to avoid basename conflicts..." + gentop=$output_objdir/${outputname}x + func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= + counter=1 + for obj in $save_oldobjs + do + func_basename "$obj" + objbase=$func_basename_result + case " $oldobjs " in + " ") oldobjs=$obj ;; + *[\ /]"$objbase "*) + while :; do + # Make sure we don't pick an alternate name that also + # overlaps. + newobj=lt$counter-$objbase + func_arith $counter + 1 + counter=$func_arith_result + case " $oldobjs " in + *[\ /]"$newobj "*) ;; + *) if test ! -f "$gentop/$newobj"; then break; fi ;; + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" + ;; + *) func_append oldobjs " $obj" ;; + esac + done + fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result + eval cmds=\"$old_archive_cmds\" + + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." + save_RANLIB=$RANLIB + RANLIB=: + objlist= + concat_cmds= + save_oldobjs=$oldobjs + oldobjs= + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj + done + eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + for obj in $save_oldobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + func_append objlist " $obj" + if test "$len" -lt "$max_cmd_len"; then + : + else + # the above command should be used before it gets too long + oldobjs=$objlist + if test "$obj" = "$last_oldobj"; then + RANLIB=$save_RANLIB + fi + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" + objlist= + len=$len0 + fi + done + RANLIB=$save_RANLIB + oldobjs=$objlist + if test -z "$oldobjs"; then + eval cmds=\"\$concat_cmds\" + else + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi + func_execute_cmds "$cmds" 'exit $?' + done + + test -n "$generated" && \ + func_show_eval "${RM}r$generated" + + # Now create the libtool archive. + case $output in + *.la) + old_library= + test yes = "$build_old_libs" && old_library=$libname.$libext + func_verbose "creating $output" + + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi + done + # Quote the link command for shipping. + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + if test yes = "$hardcode_automatic"; then + relink_command= + fi + + # Only create the output if not a dry run. + $opt_dry_run || { + for installed in no yes; do + if test yes = "$installed"; then + if test -z "$install_libdir"; then + break + fi + output=$output_objdir/${outputname}i + # Replace all uninstalled libtool libraries with the installed ones + newdependency_libs= + for deplib in $dependency_libs; do + case $deplib in + *.la) + func_basename "$deplib" + name=$func_basename_result + func_resolve_sysroot "$deplib" + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + test -z "$libdir" && \ + func_fatal_error "'$deplib' is not a valid libtool archive" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" + ;; + *) func_append newdependency_libs " $deplib" ;; + esac + done + dependency_libs=$newdependency_libs + newdlfiles= + + for lib in $dlfiles; do + case $lib in + *.la) + func_basename "$lib" + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "'$lib' is not a valid libtool archive" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + ;; + *) func_append newdlfiles " $lib" ;; + esac + done + dlfiles=$newdlfiles + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + *.la) + # Only pass preopened files to the pseudo-archive (for + # eventual linking with the app. that links it) if we + # didn't already link the preopened objects directly into + # the library: + func_basename "$lib" + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + test -z "$libdir" && \ + func_fatal_error "'$lib' is not a valid libtool archive" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done + dlprefiles=$newdlprefiles + else + newdlfiles= + for lib in $dlfiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlfiles " $abs" + done + dlfiles=$newdlfiles + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlprefiles " $abs" + done + dlprefiles=$newdlprefiles + fi + $RM $output + # place dlname in correct position for cygwin + # In fact, it would be nice if we could use this code for all target + # systems that can't hard-code library paths into their executables + # and that have no shared library path variable independent of PATH, + # but it turns out we can't easily determine that from inspecting + # libtool variables, so we have to hard-code the OSs to which it + # applies here; at the moment, that means platforms that use the PE + # object format with DLL files. See the long comment at the top of + # tests/bindir.at for full details. + tdlname=$dlname + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. + if test -n "$bindir"; then + func_relative_path "$install_libdir" "$bindir" + tdlname=$func_relative_path_result/$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname + fi + ;; + esac + $ECHO > $output "\ +# $outputname - a libtool library file +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='$tdlname' + +# Names of this library. +library_names='$library_names' + +# The name of the static archive. +old_library='$old_library' + +# Linker flags that cannot go in dependency_libs. +inherited_linker_flags='$new_inherited_linker_flags' + +# Libraries that this one depends upon. +dependency_libs='$dependency_libs' + +# Names of additional weak libraries provided by this library +weak_library_names='$weak_libs' + +# Version information for $libname. +current=$current +age=$age +revision=$revision + +# Is this an already installed library? +installed=$installed + +# Should we warn about portability when linking against -modules? +shouldnotlink=$module + +# Files to dlopen/dlpreopen +dlopen='$dlfiles' +dlpreopen='$dlprefiles' + +# Directory that this library needs to be installed in: +libdir='$install_libdir'" + if test no,yes = "$installed,$need_relink"; then + $ECHO >> $output "\ +relink_command=\"$relink_command\"" + fi + done + } + + # Do a symbolic link so that the libtool archive can be found in + # LD_LIBRARY_PATH before the program is installed. + func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' + ;; + esac + exit $EXIT_SUCCESS +} + +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi + + +# func_mode_uninstall arg... +func_mode_uninstall () +{ + $debug_cmd + + RM=$nonopt + files= + rmforce=false + exit_status=0 + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic=$magic + + for arg + do + case $arg in + -f) func_append RM " $arg"; rmforce=: ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; + esac + done + + test -z "$RM" && \ + func_fatal_help "you must specify an RM program" + + rmdirs= + + for file in $files; do + func_dirname "$file" "" "." + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir + else + odir=$dir/$objdir + fi + func_basename "$file" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir + + # Remember odir for removal later, being careful to avoid duplicates + if test clean = "$opt_mode"; then + case " $rmdirs " in + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; + esac + fi + + # Don't error if the file doesn't exist and rm -f was used. + if { test -L "$file"; } >/dev/null 2>&1 || + { test -h "$file"; } >/dev/null 2>&1 || + test -f "$file"; then + : + elif test -d "$file"; then + exit_status=1 + continue + elif $rmforce; then + continue + fi + + rmfiles=$file + + case $name in + *.la) + # Possibly a libtool archive, so verify it. + if func_lalib_p "$file"; then + func_source $dir/$name + + # Delete the libtool libraries and symlinks. + for n in $library_names; do + func_append rmfiles " $odir/$n" + done + test -n "$old_library" && func_append rmfiles " $odir/$old_library" + + case $opt_mode in + clean) + case " $library_names " in + *" $dlname "*) ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + esac + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + ;; + uninstall) + if test -n "$library_names"; then + # Do each command in the postuninstall commands. + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' + fi + + if test -n "$old_library"; then + # Do each command in the old_postuninstall commands. + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' + fi + # FIXME: should reinstall the best remaining shared library. + ;; + esac + fi + ;; + + *.lo) + # Possibly a libtool object, so verify it. + if func_lalib_p "$file"; then + + # Read the .lo file + func_source $dir/$name + + # Add PIC object to the list of files to remove. + if test -n "$pic_object" && test none != "$pic_object"; then + func_append rmfiles " $dir/$pic_object" + fi + + # Add non-PIC object to the list of files to remove. + if test -n "$non_pic_object" && test none != "$non_pic_object"; then + func_append rmfiles " $dir/$non_pic_object" + fi + fi + ;; + + *) + if test clean = "$opt_mode"; then + noexename=$name + case $file in + *.exe) + func_stripname '' '.exe' "$file" + file=$func_stripname_result + func_stripname '' '.exe' "$name" + noexename=$func_stripname_result + # $file with .exe has already been added to rmfiles, + # add $file without .exe + func_append rmfiles " $file" + ;; + esac + # Do a test to see if this is a libtool program. + if func_ltwrapper_p "$file"; then + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result + func_append rmfiles " $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename + fi + + # note $name still contains .exe if it was in $file originally + # as does the version of $file that was added into $rmfiles + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then + func_append rmfiles " $odir/lt-$name" + fi + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" + fi + fi + fi + ;; + esac + func_show_eval "$RM $rmfiles" 'exit_status=1' + done + + # Try to remove the $objdir's in the directories where we deleted files + for dir in $rmdirs; do + if test -d "$dir"; then + func_show_eval "rmdir $dir >/dev/null 2>&1" + fi + done + + exit $exit_status +} + +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi + +test -z "$opt_mode" && { + help=$generic_help + func_fatal_help "you must specify a MODE" +} + +test -z "$exec_cmd" && \ + func_fatal_help "invalid operation mode '$opt_mode'" + +if test -n "$exec_cmd"; then + eval exec "$exec_cmd" + exit $EXIT_FAILURE +fi + +exit $exit_status + + +# The TAGs below are defined such that we never get into a situation +# where we disable both kinds of libraries. Given conflicting +# choices, we go for a static library, that is the most portable, +# since we can't tell whether shared libraries were disabled because +# the user asked for that or because the platform doesn't support +# them. This is particularly important on AIX, because we don't +# support having both static and shared libraries enabled at the same +# time on that platform, so we default to a shared-only configuration. +# If a disable-shared tag is given, we'll fallback to a static-only +# configuration. But we'll never go from static-only to shared-only. + +# ### BEGIN LIBTOOL TAG CONFIG: disable-shared +build_libtool_libs=no +build_old_libs=yes +# ### END LIBTOOL TAG CONFIG: disable-shared + +# ### BEGIN LIBTOOL TAG CONFIG: disable-static +build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` +# ### END LIBTOOL TAG CONFIG: disable-static + +# Local Variables: +# mode:shell-script +# sh-indentation:2 +# End: diff -Nru libbluray-0.8.1/build-aux/missing libbluray-1.0.1/build-aux/missing --- libbluray-0.8.1/build-aux/missing 2015-09-02 11:11:20.000000000 +0000 +++ libbluray-1.0.1/build-aux/missing 2017-06-23 13:35:15.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru libbluray-0.8.1/ChangeLog libbluray-1.0.1/ChangeLog --- libbluray-0.8.1/ChangeLog 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/ChangeLog 2017-06-23 13:35:14.000000000 +0000 @@ -1,3 +1,84 @@ +2017-06-07: Version 1.0.1 +- Add possibility to check whether BD-J is functional without opening a disc. +- Improve main title selection. +- Improve error resilience and stability. +- Fix Windows dll loading. +- Fix JAVA_HOME environment variable handling in Windows. +- Fix build issues when CPPFLAGS is given in make command line. +- Fix MSVC build issues. +- Remove --disable-bdjava and --disable-udf configure options. + +2017-03-02: Version 1.0.0 +- Add support for Java VM (BD-J) on MacOS. +- Add clip_id to BLURAY_CLIP_INFO. +- Add a suitable JVM path for Fedora/RHEL and clones. +- Add support for AVCHD 8.3 filenames. +- Add player setting for disabling persistent storage. +- Add bd_set_rate(). +- Add playback time position to BD_EVENT_SEEK. +- Add BD_VK_ROOT_MENU handling. +- Add support for heavily fragmented 3D .m2ts files. +- Improve Win32 dll loading security. +- Improve playback resume position accuracy. +- Improve error resilience and stability. +- Fix using libmmbd with unmounted discs. +- Fix leaks. +- Delay BD-J overlay opening until something visible has been drawn. +- Close BD-J overlay when window is not visible. +- Use temporary storage when cache or persistent root location is unknown. + +2016-05-15: Version 0.9.3 +- Add bd_open_files(). This function deprecates old global file system hooks. +- Add flag for on-disc menu support to DISC_INFO. +- Add configure argument to disable building of JAR file. +- Add missing player settings enums. +- Update linux Java search path list and preferred JVM. +- Enable UDF support by default. +- Split developer tools from examples. +- Improve BDJ_EVENT_CHAPTER triggering. +- Improve main title detection. +- Improve error resilience. +- Improve BD-J compability. +- Improve detecting of working aacs implementation. +- Improve libmmbd support. +- Fix BD-J media player stop(). +- Fix restoring playback rate with some BD-J discs. +- Fix restoring suspended playback time position. +- Fix current chapter lookup. +- Fix lost key focus with multi-HScene discs. +- Fix playback of discs without Top Menu title. +- Fix caching of some BD-J files from UDF filesystem. +- Fix stopping playback from HDMV menus. +- Fix possible errors in win32 .iso image reading. +- Fix undefined values in DISC_INFO. +- Fix memory leaks. + +2015-12-01: Version 0.9.2 +- Add primary audio stream to bd_select_stream(). +- Improve error resilience. +- Fix Java 8 compability issues. +- Fix Android build. +- Fix SecurityException in AWTAutoShutdown. +- Fix BD-J check when install path in Windows contains non-ASCII chars. +- Fix jvm.dll loading in Windows ($JAVA_HOME/bin should be in dll load path). +- Fix class translating in recent Java 8 versions. + +2015-11-03: Version 0.9.1 +- Improved BD-J security. +- Improved error resilience. +- Improved seeking (avoid skipping PAT/PMT/PCR). +- Fix UO mask check when bd_play_title() is used for Top Menu. +- Fix re-starting of title bound Xlets when title changes. +- Fix loading classes with invalid debug info. + +2015-10-02: Version 0.9.0 +- Add functions to read files from VFS. +- Improved error resilience. +- Improved BD-J compability. +- Fix Xlet-initiated font caching. +- Fix return value when setting BLURAY_PLAYER_SETTING_DECODE_PG. +- Fix build with C++ compiler + 2015-05-15: Version 0.8.1 - Notify application when UO mask changes. - Improved error resilience. diff -Nru libbluray-0.8.1/config.h.in libbluray-1.0.1/config.h.in --- libbluray-0.8.1/config.h.in 2015-09-02 11:11:19.000000000 +0000 +++ libbluray-1.0.1/config.h.in 2017-06-23 13:35:15.000000000 +0000 @@ -1,8 +1,5 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if libudfread is to be used for disc image access */ -#undef ENABLE_UDF - /* Define to 1 if using libbluray J2ME stack */ #undef HAVE_BDJ_J2ME @@ -102,10 +99,12 @@ /* "" */ #undef JDK_HOME -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR +/* Define to 1 to use inefficient pread() replacement */ +#undef NEED_PREAD_IMPL + /* Name of package */ #undef PACKAGE @@ -133,9 +132,6 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* "Define to 1 if using BD-Java" */ -#undef USING_BDJAVA - /* Version number of package */ #undef VERSION diff -Nru libbluray-0.8.1/configure libbluray-1.0.1/configure --- libbluray-0.8.1/configure 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/configure 2017-06-23 13:35:17.000000000 +0000 @@ -0,0 +1,18244 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.69 for libbluray 1.0.1. +# +# Report bugs to . +# +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} +if test "x$CONFIG_SHELL" = x; then + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } + +exitcode=0 +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 + + test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes +else + as_have_required=no +fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + as_found=: + case $as_dir in #( + /*) + for as_base in sh bash ksh sh5; do + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi + done;; + esac + as_found=false +done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } +IFS=$as_save_IFS + + + if test "x$CONFIG_SHELL" != x; then : + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 +fi + + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org and +$0: http://www.videolan.org/developers/libbluray.html about +$0: your system, including any error possibly output before +$0: this message. Then install a modern shell, or manually +$0: run the script under such a shell if you do have one." + fi + exit 1 +fi +fi +fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + + + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + +SHELL=${CONFIG_SHELL-/bin/sh} + + +test -n "$DJDIR" || exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= + +# Identity of this package. +PACKAGE_NAME='libbluray' +PACKAGE_TARNAME='libbluray' +PACKAGE_VERSION='1.0.1' +PACKAGE_STRING='libbluray 1.0.1' +PACKAGE_BUGREPORT='http://www.videolan.org/developers/libbluray.html' +PACKAGE_URL='' + +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" + +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS +LIBOBJS +BDJAVA_CFLAGS +LT_VERSION_INFO +BLURAY_VERSION_MICRO +BLURAY_VERSION_MINOR +BLURAY_VERSION_MAJOR +DOXYGEN_PAPER_SIZE +DX_COND_latex_FALSE +DX_COND_latex_TRUE +DX_COND_pdf_FALSE +DX_COND_pdf_TRUE +DX_PDFLATEX +DX_FLAG_pdf +DX_COND_ps_FALSE +DX_COND_ps_TRUE +DX_EGREP +DX_DVIPS +DX_MAKEINDEX +DX_LATEX +DX_FLAG_ps +DX_COND_html_FALSE +DX_COND_html_TRUE +DX_FLAG_html +DX_COND_chi_FALSE +DX_COND_chi_TRUE +DX_FLAG_chi +DX_COND_chm_FALSE +DX_COND_chm_TRUE +DX_HHC +DX_FLAG_chm +DX_COND_xml_FALSE +DX_COND_xml_TRUE +DX_FLAG_xml +DX_COND_rtf_FALSE +DX_COND_rtf_TRUE +DX_FLAG_rtf +DX_COND_man_FALSE +DX_COND_man_TRUE +DX_FLAG_man +DX_COND_dot_FALSE +DX_COND_dot_TRUE +DX_DOT +DX_FLAG_dot +DX_COND_doc_FALSE +DX_COND_doc_TRUE +DX_PERL +DX_DOXYGEN +DX_FLAG_doc +DX_ENV +DX_DOCDIR +DX_CONFIG +DX_PROJECT +BDJ_BOOTCLASSPATH +BDJ_TYPE +USING_BDJAVA_BUILD_JAR_FALSE +USING_BDJAVA_BUILD_JAR_TRUE +HAVE_ANT +USING_EXAMPLES_FALSE +USING_EXAMPLES_TRUE +FONTCONFIG_LIBS +FONTCONFIG_CFLAGS +FT2_LIBS +FT2_CFLAGS +LIBXML2_LIBS +LIBXML2_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG +DLOPEN_LIBS +CPP +LT_SYS_LIBRARY_PATH +OTOOL64 +OTOOL +LIPO +NMEDIT +DSYMUTIL +MANIFEST_TOOL +RANLIB +ac_ct_AR +AR +DLLTOOL +OBJDUMP +LN_S +NM +ac_ct_DUMPBIN +DUMPBIN +LD +FGREP +EGREP +GREP +SED +LIBTOOL +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +am__nodep +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +JDK_HOME +HAVE_DARWIN_FALSE +HAVE_DARWIN_TRUE +HAVE_WIN32_FALSE +HAVE_WIN32_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +target_alias +host_alias +build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +runstatedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_URL +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_silent_rules +enable_werror +enable_extra_warnings +enable_optimizations +enable_examples +enable_bdjava_jar +with_libxml2 +with_freetype +with_fontconfig +with_bdj_type +with_bdj_bootclasspath +enable_dependency_tracking +enable_shared +enable_static +with_pic +enable_fast_install +with_aix_soname +with_gnu_ld +with_sysroot +enable_libtool_lock +enable_largefile +enable_doxygen_doc +enable_doxygen_dot +enable_doxygen_man +enable_doxygen_rtf +enable_doxygen_xml +enable_doxygen_chm +enable_doxygen_chi +enable_doxygen_html +enable_doxygen_ps +enable_doxygen_pdf +' + ac_precious_vars='build_alias +host_alias +target_alias +JDK_HOME +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +LT_SYS_LIBRARY_PATH +CPP +PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR +LIBXML2_CFLAGS +LIBXML2_LIBS +FT2_CFLAGS +FT2_LIBS +FONTCONFIG_CFLAGS +FONTCONFIG_LIBS +DOXYGEN_PAPER_SIZE' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid feature name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; + + -without-* | --without-*) + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + as_fn_error $? "invalid package name: $ac_useropt" + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + esac + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + as_fn_error $? "missing argument to $ac_option" +fi + +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir runstatedir +do + eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + as_fn_error $? "working directory cannot be determined" +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + as_fn_error $? "pwd does not report name of working directory" + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures libbluray 1.0.1 to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking ...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/libbluray] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] +_ACEOF +fi + +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of libbluray 1.0.1:";; + esac + cat <<\_ACEOF + +Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-werror set warnings as errors via -Werror + [default=disabled] + --disable-extra-warnings + set extra warnings [default=enabled] + --disable-optimizations disable optimizations [default=enabled] + --enable-examples build examples (default is yes) + --disable-bdjava-jar disable building of BD-Java JAR file + [default=enabled] + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --enable-shared[=PKGS] build shared libraries [default=yes] + --enable-static[=PKGS] build static libraries [default=yes] + --enable-fast-install[=PKGS] + optimize for fast installation [default=yes] + --disable-libtool-lock avoid locking (might break parallel builds) + --disable-largefile omit support for large files + --disable-doxygen-doc don't generate any doxygen documentation + --disable-doxygen-dot don't generate graphics for doxygen documentation + --enable-doxygen-man generate doxygen manual pages + --enable-doxygen-rtf generate doxygen RTF documentation + --enable-doxygen-xml generate doxygen XML documentation + --enable-doxygen-chm generate doxygen compressed HTML help documentation + --enable-doxygen-chi generate doxygen seperate compressed HTML help index + file + --disable-doxygen-html don't generate doxygen plain HTML documentation + --disable-doxygen-ps don't generate doxygen PostScript documentation + --disable-doxygen-pdf don't generate doxygen PDF documentation + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --without-libxml2 build without libxml2 support [default=with] + --without-freetype build without freetype support [default=with] + --without-fontconfig build without fontconfig support [default=with] + --with-bdj-type=TYPE Specify the type of BD-J implementation (j2se, + j2me). Default is j2se. + --with-bdj-bootclasspath=PATH + Specify BD-J build-time bootclass path (example + /opt/PhoneME/lib/btclasses.zip;/opt/PhoneME/lib/xmlparer.jar). + Default is empty. + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. + --with-gnu-ld assume the C compiler uses GNU ld [default=no] + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). + +Some influential environment variables: + JDK_HOME Path to the JDK + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. + CPP C preprocessor + PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path + LIBXML2_CFLAGS + C compiler flags for LIBXML2, overriding pkg-config + LIBXML2_LIBS + linker flags for LIBXML2, overriding pkg-config + FT2_CFLAGS C compiler flags for FT2, overriding pkg-config + FT2_LIBS linker flags for FT2, overriding pkg-config + FONTCONFIG_CFLAGS + C compiler flags for FONTCONFIG, overriding pkg-config + FONTCONFIG_LIBS + linker flags for FONTCONFIG, overriding pkg-config + DOXYGEN_PAPER_SIZE + a4wide (default), a4, letter, legal or executive + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +Report bugs to . +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +libbluray configure 1.0.1 +generated by GNU Autoconf 2.69 + +Copyright (C) 2012 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_func + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( $as_echo "## ---------------------------------------------------------------- ## +## Report this to http://www.videolan.org/developers/libbluray.html ## +## ---------------------------------------------------------------- ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES +# ---------------------------------------------------- +# Tries to find if the field MEMBER exists in type AGGR, after including +# INCLUDES, setting cache variable VAR accordingly. +ac_fn_c_check_member () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if eval \${$4+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + eval "$4=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_member +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by libbluray $as_me 1.0.1, which was +generated by GNU Autoconf 2.69. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" + done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 2) + as_fn_append ac_configure_args1 " '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + as_fn_append ac_configure_args " '$ac_arg'" + ;; + esac + done +done +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + $as_echo "## ---------------- ## +## Cache variables. ## +## ---------------- ##" + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + $as_echo "## ----------------- ## +## Output variables. ## +## ----------------- ##" + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + $as_echo "## ------------------- ## +## File substitutions. ## +## ------------------- ##" + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + $as_echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + $as_echo "## ----------- ## +## confdefs.h. ## +## ----------- ##" + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +$as_echo "/* confdefs.h */" > confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE +if test -n "$CONFIG_SITE"; then + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac +elif test "x$prefix" != xNONE; then + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site +else + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site +fi +for ac_site_file in "$ac_site_file1" "$ac_site_file2" +do + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +ac_aux_dir= +for ac_dir in build-aux "$srcdir"/build-aux; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5 +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +am__api_version='1.15' + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$2" = conftest.file + ) +then + # Ok. + : +else + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` + +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` + +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +fi + +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS + +fi + + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + PACKAGE='libbluray' + VERSION='1.0.1' + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar plaintar pax cpio none' + +# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test $am_uid -le $am_max_uid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test $am_gid -le $am_max_gid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 + ($_am_tar --version) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 + ($am__untar &5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + if ${am_cv_prog_tar_ustar+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_prog_tar_ustar=$_am_tool +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +$as_echo "$am_cv_prog_tar_ustar" >&6; } + + + + + + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + +ac_config_headers="$ac_config_headers config.h" + + +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + + +case "${host_os}" in + "") + SYS=unknown + ;; + *mingw32* | *cygwin* | *wince* | *mingwce*) + case "${host_os}" in + *wince* | *mingwce* | *mingw32ce*) + SYS=mingwce + ;; + *mingw32*) + SYS=mingw32 + +$as_echo "#define _WIN32_WINNT 0x0502" >>confdefs.h + + +$as_echo "#define _WIN32_IE 0x0501" >>confdefs.h + + CPPFLAGS="${CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=1" + ;; + esac + ;; + *darwin*) + SYS=darwin + ;; + netbsd*) + SYS=netbsd + CFLAGS="${CFLAGS} -D_NETBSD_SOURCE" + ;; + *) + SYS="${host_os}" + ;; +esac + + if test "${SYS}" = "mingw32"; then + HAVE_WIN32_TRUE= + HAVE_WIN32_FALSE='#' +else + HAVE_WIN32_TRUE='#' + HAVE_WIN32_FALSE= +fi + + if test "${SYS}" = "darwin"; then + HAVE_DARWIN_TRUE= + HAVE_DARWIN_FALSE='#' +else + HAVE_DARWIN_TRUE='#' + HAVE_DARWIN_FALSE= +fi + + +library_not_found="Could not find required library!" +function_not_found="Could not find required function!" + + + +# Check whether --enable-werror was given. +if test "${enable_werror+set}" = set; then : + enableval=$enable_werror; +fi + + +# Check whether --enable-extra-warnings was given. +if test "${enable_extra_warnings+set}" = set; then : + enableval=$enable_extra_warnings; +fi + + +# Check whether --enable-optimizations was given. +if test "${enable_optimizations+set}" = set; then : + enableval=$enable_optimizations; +fi + + +# Check whether --enable-examples was given. +if test "${enable_examples+set}" = set; then : + enableval=$enable_examples; use_examples=$enableval +else + use_examples=yes +fi + + +# Check whether --enable-bdjava-jar was given. +if test "${enable_bdjava_jar+set}" = set; then : + enableval=$enable_bdjava_jar; use_bdjava_jar=$enableval +else + use_bdjava_jar=yes +fi + + + +# Check whether --with-libxml2 was given. +if test "${with_libxml2+set}" = set; then : + withval=$with_libxml2; +fi + + + +# Check whether --with-freetype was given. +if test "${with_freetype+set}" = set; then : + withval=$with_freetype; +fi + + + +# Check whether --with-fontconfig was given. +if test "${with_fontconfig+set}" = set; then : + withval=$with_fontconfig; +fi + + + +# Check whether --with-bdj-type was given. +if test "${with_bdj_type+set}" = set; then : + withval=$with_bdj_type; BDJ_TYPE=$withval +else + BDJ_TYPE=j2se +fi + + + +# Check whether --with-bdj-bootclasspath was given. +if test "${with_bdj_bootclasspath+set}" = set; then : + withval=$with_bdj_bootclasspath; BDJ_BOOTCLASSPATH=$withval +else + BDJ_BOOTCLASSPATH= +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_compiler_gnu=yes +else + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +else + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + + +depcc="$CC" am_compiler_list= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + + +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac + + + +macro_version='2.4.6' +macro_revision='2.4.6' + + + + + + + + + + + + + +ltmain=$ac_aux_dir/ltmain.sh + +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} + +case $ECHO in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if ${ac_cv_path_FGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_FGREP" || continue +# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +case `"$ac_path_FGREP" --version 2>&1` in +*GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" + ac_path_FGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_FGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_FGREP=$FGREP +fi + + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" + + +test -z "$GREP" && GREP=grep + + + + + + + + + + + + + + + + + + + +# Check whether --with-gnu-ld was given. +if test "${with_gnu_ld+set}" = set; then : + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes +else + with_gnu_ld=no +fi + +ac_prog=ld +if test yes = "$GCC"; then + # Check if gcc -print-prog-name=ld gives a path. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return, which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD=$ac_prog + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test yes = "$with_gnu_ld"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi +if ${lt_cv_path_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$LD"; then + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD=$ac_dir/$ac_prog + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : + $as_echo_n "(cached) " >&6 +else + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if ${lt_cv_path_NM+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM=$NM +else + lt_nm_to_check=${ac_tool_prefix}nm + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break 2 + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break 2 + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS=$lt_save_ifs + done + : ${lt_cv_path_NM=no} +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DUMPBIN=$ac_cv_prog_DUMPBIN +if test -n "$DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$DUMPBIN" && break + done +fi +if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN + for ac_prog in dumpbin "link -dump" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN +if test -n "$ac_ct_DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_DUMPBIN" && break +done + + if test "x$ac_ct_DUMPBIN" = x; then + DUMPBIN=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DUMPBIN=$ac_ct_DUMPBIN + fi +fi + + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols -headers" + ;; + *) + DUMPBIN=: + ;; + esac + fi + + if test : != "$DUMPBIN"; then + NM=$DUMPBIN + fi +fi +test -z "$NM" && NM=nm + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if ${lt_cv_nm_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } +fi + +# find the maximum length of command line arguments +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if ${lt_cv_sys_max_cmd_len+:} false; then : + $as_echo_n "(cached) " >&6 +else + i=0 + teststring=ABCD + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test 17 != "$i" # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac + +fi + +if test -n "$lt_cv_sys_max_cmd_len"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } +fi +max_cmd_len=$lt_cv_sys_max_cmd_len + + + + + + +: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} + +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset +else + lt_unset=false +fi + + + + + +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac + +fi + +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac + +fi + +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_reload_flag='-r' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test yes != "$GCC"; then + reload_cmds=false + fi + ;; + darwin*) + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi + +test -z "$OBJDUMP" && OBJDUMP=objdump + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# 'unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. + +case $host_os in +aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; + +beos*) + lt_cv_deplibs_check_method=pass_all + ;; + +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; + +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; + +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; + +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; + +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; + +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; + +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; + +interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; + +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + lt_cv_deplibs_check_method=pass_all + ;; + +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 + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; + +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; + +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; + +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; + +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; + +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; + +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; + +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } + +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi + +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown + + + + + + + + + + + + + + + + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' + +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd=$ECHO + ;; +esac + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO + + + + + + + + +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi + +: ${AR=ar} +: ${AR_FLAGS=cru} + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test 0 -eq "$ac_status"; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test 0 -ne "$ac_status"; then + lt_cv_ar_at_file=@ + fi + fi + rm -f conftest.* libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } + +if test no = "$lt_cv_ar_at_file"; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi + + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +test -z "$STRIP" && STRIP=: + + + + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + +test -z "$RANLIB" && RANLIB=: + + + + + + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + bitrig* | openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" +fi + +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + + +# Check for command to grab the raw symbol name followed by C symbol from nm. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 +else + +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] + +# Character class describing NM global symbol codes. +symcode='[BCDEGRST]' + +# Regexp to match symbols that can be accessed directly from C. +sympat='\([_A-Za-z][_A-Za-z0-9]*\)' + +# Define system-specific variables. +case $host_os in +aix*) + symcode='[BCDT]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[ABCDGISTW]' + ;; +hpux*) + if test ia64 = "$host_cpu"; then + symcode='[ABCDEGRST]' + fi + ;; +irix* | nonstopux*) + symcode='[BCDEGRST]' + ;; +osf*) + symcode='[BCDEGQRST]' + ;; +solaris*) + symcode='[BDRT]' + ;; +sco3.2v5*) + symcode='[DT]' + ;; +sysv4.2uw2*) + symcode='[DT]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' + ;; +sysv4) + symcode='[DFNSTU]' + ;; +esac + +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; +esac + +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" + +# Transform an extracted symbol line into symbol name and symbol address +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" + +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac + +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do + + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" + + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + + # Check to see that the pipe works correctly. + pipe_works=no + + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + # Now try to grab the symbols. + nlist=conftest.nm + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" + else + rm -f "$nlist"T + fi + + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined __osf__ +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_LT_EOF + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' + + cat <<_LT_EOF >> conftest.$ac_ext + +/* The mapping between symbol names and symbols. */ +LT_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[] = +{ + { "@PROGRAM@", (void *) 0 }, +_LT_EOF + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS=conftstm.$ac_objext + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s conftest$ac_exeext; then + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&5 + fi + else + echo "cannot find nm_test_var in $nlist" >&5 + fi + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 + fi + else + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* + + # Do not use the global_symbol_pipe unless it works. + if test yes = "$pipe_works"; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done + +fi + +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } +fi + +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } + +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi + + +lt_sysroot= +case $with_sysroot in #( + yes) + if test yes = "$GCC"; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; +fi + +test no = "$enable_libtool_lock" || enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE=32 + ;; + *ELF-64*) + HPUX_IA64_MODE=64 + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + if test yes = "$lt_cv_prog_gnu_ld"; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes +else + lt_cv_cc_needs_belf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } + if test yes != "$lt_cv_cc_needs_belf"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS=$SAVE_CFLAGS + fi + ;; +*-*solaris*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo 'int i;' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*|x86_64-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD=${LD-ld}_sol2 + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" + fi + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks=$enable_libtool_lock + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test yes != "$lt_cv_path_mainfest_tool"; then + MANIFEST_TOOL=: +fi + + + + + + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_NMEDIT="nmedit" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + NMEDIT=$ac_ct_NMEDIT + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. +set dummy ${ac_tool_prefix}lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LIPO="${ac_tool_prefix}lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +LIPO=$ac_cv_prog_LIPO +if test -n "$LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. +set dummy lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_LIPO="lipo" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO +if test -n "$ac_ct_LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_LIPO" = x; then + LIPO=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + LIPO=$ac_ct_LIPO + fi +else + LIPO="$ac_cv_prog_LIPO" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL="${ac_tool_prefix}otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OTOOL=$ac_cv_prog_OTOOL +if test -n "$OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. +set dummy otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL="otool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL +if test -n "$ac_ct_OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OTOOL" = x; then + OTOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL=$ac_ct_OTOOL + fi +else + OTOOL="$ac_cv_prog_OTOOL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OTOOL64=$ac_cv_prog_OTOOL64 +if test -n "$OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. +set dummy otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OTOOL64="otool64" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +if test -n "$ac_ct_OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OTOOL64" = x; then + OTOOL64=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OTOOL64=$ac_ct_OTOOL64 + fi +else + OTOOL64="$ac_cv_prog_OTOOL64" +fi + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "$LT_MULTI_MODULE"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes +else + lt_cv_ld_exported_symbols_list=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test yes = "$lt_cv_apple_cc_single_mod"; then + _lt_dar_single_mod='$single_module' + fi + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' + fi + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : + +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF + +fi + +done + + + + + +# Set options + + + + enable_dlopen=no + + + enable_win32_dll=no + + + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS=$lt_save_ifs + ;; + esac +else + enable_shared=yes +fi + + + + + + + + + + # Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS=$lt_save_ifs + ;; + esac +else + enable_static=yes +fi + + + + + + + + + + +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for lt_pkg in $withval; do + IFS=$lt_save_ifs + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS=$lt_save_ifs + ;; + esac +else + pic_mode=default +fi + + + + + + + + + # Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, + for pkg in $enableval; do + IFS=$lt_save_ifs + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS=$lt_save_ifs + ;; + esac +else + enable_fast_install=yes +fi + + + + + + + + + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + + + + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS=$ltmain + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +test -z "$LN_S" && LN_S="ln -s" + + + + + + + + + + + + + + +if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if ${lt_cv_objdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir + + + + + +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF + + + + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a '.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld=$lt_cv_prog_gnu_ld + +old_CC=$CC +old_CFLAGS=$CFLAGS + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +func_cc_basename $compiler +cc_basename=$func_cc_basename_result + + +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD + ;; +esac +fi + +MAGIC_CMD=$lt_cv_path_MAGIC_CMD +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + + +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. + ;; +*) + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + IFS=$lt_save_ifs + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" + if test -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD=$lt_cv_path_MAGIC_CMD + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 + +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org + +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD + ;; +esac +fi + +MAGIC_CMD=$lt_cv_path_MAGIC_CMD +if test -n "$MAGIC_CMD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + else + MAGIC_CMD=: + fi +fi + + fi + ;; +esac + +# Use C for the default configuration in the libtool script + +lt_save_CC=$CC +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +objext=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* + +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* + + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + +lt_prog_compiler_no_builtin_flag= + +if test yes = "$GCC"; then + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_rtti_exceptions=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } + +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +else + : +fi + +fi + + + + + + + lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= + + + if test yes = "$GCC"; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' + + case $host_os in + aix*) + # All AIX code is PIC. + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + lt_prog_compiler_pic='-fPIC' + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; + + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; + + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test ia64 = "$host_cpu"; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac + ;; + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='+Z' + ;; + esac + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='$wl-a ${wl}archive' + ;; + + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; + + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + # old Intel for x86_64, which still supported -KPIC. + ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + esac + ;; + + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + + rdos*) + lt_prog_compiler_static='-non_shared' + ;; + + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac + ;; + + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; + + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; + + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; + + *) + lt_prog_compiler_can_build_shared=no + ;; + esac + fi + +case $host_os in + # For platforms that do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic + +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if ${lt_cv_prog_compiler_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic_works=no + ac_outfile=conftest.$ac_objext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } + +if test yes = "$lt_cv_prog_compiler_pic_works"; then + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac +else + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no +fi + +fi + + + + + + + + + + + +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $lt_tmp_static_flag" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works=yes + fi + else + lt_cv_prog_compiler_static_works=yes + fi + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } + +if test yes = "$lt_cv_prog_compiler_static_works"; then + : +else + lt_prog_compiler_static= +fi + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + + + + +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then + # do not overwrite the value of need_locks provided by the user + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} + need_locks=warn + fi +else + need_locks=no +fi + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + + runpath_var= + allow_undefined_flag= + always_export_symbols=no + archive_cmds= + archive_expsym_cmds= + compiler_needs_object=no + enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + hardcode_automatic=no + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no + link_all_deplibs=unknown + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= + old_archive_from_expsyms_cmds= + thread_safe_flag_spec= + whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # included in the symbol list + include_expsyms= + # exclude_expsyms can be an extended regexp of symbols to exclude + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. + exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' + # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out + # platforms (ab)use it in PIC code, but their linkers get confused if + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test yes != "$GCC"; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd* | bitrig*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; + esac + + ld_shlibs=yes + + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test yes = "$with_gnu_ld"; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + + if test yes = "$lt_use_gnu_ld_interface"; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='$wl' + + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test ia64 != "$host_cpu"; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. + +_LT_EOF + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + allow_undefined_flag=unsupported + # Joseph Beckenbach says some releases of gcc + # support --undefined. This deserves some investigation. FIXME + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + else + ld_shlibs=no + fi + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='$wl--export-all-symbols' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + ld_shlibs=no + fi + ;; + + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' + # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. + # Instead, shared libraries are loaded at an image base (0x10000000 by + # default) and relocated if they conflict, which is a slow very memory + # consuming and fragmenting process. To avoid this, we pick a random, + # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link + # time. Moving up from 0x10000000 also allows more sbrk(2) space. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test linux-dietlibc = "$host_os"; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test no = "$tmp_diet" + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag' + ;; + pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group f77 and f90 compilers + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + compiler_needs_object=yes + ;; + esac + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + + case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + ;; + esac + else + ld_shlibs=no + fi + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 + +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. + +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + ;; + + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + *) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' + else + ld_shlibs=no + fi + ;; + esac + + if test no = "$ld_shlibs"; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + + aix[4-9]*) + if test ia64 = "$host_cpu"; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag= + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' + else + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then + aix_use_runtimelinking=yes + break + fi + done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi + ;; + esac + + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + + archive_cmds='' + hardcode_direct=yes + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac + + if test yes = "$GCC"; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`$CC -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + ;; + esac + shared_flag='-shared' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' + fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' + else + # not using gcc + if test ia64 = "$host_cpu"; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' + else + shared_flag='$wl-bM:SRE' + fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' + fi + fi + + export_dynamic_flag_spec='$wl-bexpall' + # It seems that -bexpall does not export symbols beginning with + # underscore (_), so it is better to generate a list of symbols to export. + always_export_symbols=yes + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then + # Warning - without using the other runtime loading flags (-brtl), + # -berok will link without error, but may produce a broken library. + allow_undefined_flag='-berok' + # Determine the default libpath from the value encoded in an + # empty executable. + if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=/usr/lib:/lib + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi + + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag + else + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' + allow_undefined_flag="-z nodefs" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" + else + # Determine the default libpath from the value encoded in an + # empty executable. + if test set = "${lt_cv_aix_libpath+set}"; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=/usr/lib:/lib + fi + +fi + + aix_libpath=$lt_cv_aix_libpath_ +fi + + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi + archive_cmds_need_lc=yes + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' + fi + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; + + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=.dll + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac + ;; + + darwin* | rhapsody*) + + + archive_cmds_need_lc=no + hardcode_direct=no + hardcode_automatic=yes + hardcode_shlibpath_var=unsupported + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + + else + whole_archive_flag_spec='' + fi + link_all_deplibs=yes + allow_undefined_flag=$_lt_dar_allow_undefined + case $cc_basename in + ifort*|nagfor*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test yes = "$_lt_dar_can_shared"; then + output_verbose_link_cmd=func_echo_all + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + + else + ld_shlibs=no + fi + + ;; + + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + hpux9*) + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' + fi + hardcode_libdir_flag_spec='$wl+b $wl$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + export_dynamic_flag_spec='$wl-E' + ;; + + hpux10*) + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + fi + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='$wl-E' + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + + hpux11*) + if test yes,no = "$GCC,$with_gnu_ld"; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + else + case $host_cpu in + hppa*64*) + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler__b=no + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS=$save_LDFLAGS + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } + +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +else + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' +fi + + ;; + esac + fi + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' + hardcode_libdir_separator=: + + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + hardcode_direct_absolute=yes + export_dynamic_flag_spec='$wl-E' + + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test yes = "$GCC"; then + archive_cmds='$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 -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : + $as_echo_n "(cached) " >&6 +else + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int foo (void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_irix_exported_symbol=yes +else + lt_cv_irix_exported_symbol=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$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 + link_all_deplibs=no + else + archive_cmds='$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' + archive_expsym_cmds='$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' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes + ;; + + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + newsos6) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + hardcode_libdir_separator=: + hardcode_shlibpath_var=no + ;; + + *nto* | *qnx*) + ;; + + openbsd* | bitrig*) + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + hardcode_direct_absolute=yes + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' + else + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + fi + else + ld_shlibs=no + fi + ;; + + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + + osf3*) + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_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 -o $lib' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + hardcode_libdir_separator=: + ;; + + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + else + allow_undefined_flag=' -expect_unresolved \*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; + + solaris*) + no_undefined_flag=' -z defs' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + else + case `$CC -V 2>&1` in + *"Compilers 5.0"*) + wlarc='' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + ;; + *) + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + ;; + esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands '-z linker_flag'. GCC discards it without '$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; + esac + link_all_deplibs=yes + ;; + + sunos4*) + if test sequent = "$host_vendor"; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; + + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='$wl-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' + + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + sysv5* | sco3.2v5* | sco5v6*) + # Note: We CANNOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + hardcode_libdir_flag_spec='$wl-R,$libdir' + hardcode_libdir_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='$wl-Bexport' + runpath_var='LD_RUN_PATH' + + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + else + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + fi + ;; + + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; + + *) + ld_shlibs=no + ;; + esac + + if test sni = "$host_vendor"; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='$wl-Blargedynsym' + ;; + esac + fi + fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } +test no = "$ld_shlibs" && can_build_shared=no + +with_gnu_ld=$with_gnu_ld + + + + + + + + + + + + + + + +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test yes,yes = "$GCC,$enable_shared"; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc + ;; + esac + fi + ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } + +if test yes = "$GCC"; then + case $host_os in + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary... + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo = "/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +fi +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=.so +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no + +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown + + + +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='$libname$release$shared_ext$major' + ;; + +aix[4-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test ia64 = "$host_cpu"; then + # AIX 5 supports IA64 + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; + +beos*) + library_names_spec='$libname$shared_ext' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; + +bsdi[45]*) + version_type=linux # correct to gnu/linux during the next big refactor + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; + +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no + + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + ;; + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec=$LIB + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + else + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + esac + + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; + + *) + # Assume MSVC wrapper + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH + ;; + +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' + ;; + +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + 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 + ;; + +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[23].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; + +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + 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=LIBRARY_PATH + shlibpath_overrides_runpath=no + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; + +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 + fi + ;; + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + *) + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 + ;; + +interix[3-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + 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' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test yes = "$lt_cv_prog_gnu_ld"; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; + *) + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" + hardcode_into_libs=yes + ;; + +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no + ;; + +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + 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' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + + # Some binutils ld are patched to set DT_RUNPATH + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes +fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir + +fi + + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + 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 + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +*nto* | *qnx*) + version_type=qnx + 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='ldqnx.so' + ;; + +openbsd* | bitrig*) + version_type=sunos + sys_lib_dlsearch_path_spec=/usr/lib + need_lib_prefix=no + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no + else + need_version=yes + fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; + +os2*) + libname_spec='$name' + version_type=windows + shrext_cmds=.dll + need_version=no + need_lib_prefix=no + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + ;; + +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; + +rdos*) + dynamic_linker=no + ;; + +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + 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=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; + +sunos4*) + version_type=sunos + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test yes = "$with_gnu_ld"; then + need_lib_prefix=no + fi + need_version=yes + ;; + +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + 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 + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; + +sysv4*MP*) + if test -d /usr/nec; then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=sco + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test yes = "$with_gnu_ld"; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; + +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + 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 + ;; + +*) + dynamic_linker=no + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } +test no = "$dynamic_linker" && can_build_shared=no + +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test yes = "$GCC"; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi + +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec +fi + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec +fi + +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test yes = "$hardcode_automatic"; then + + # We can hardcode non-existent directories. + if test no != "$hardcode_direct" && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate + fi +else + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } + +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then + # Fast installation is not supported + enable_fast_install=no +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then + # Fast installation is not necessary + enable_fast_install=needless +fi + + + + + + + if test yes != "$enable_dlopen"; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen=load_add_on + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32* | cegcc*) + lt_cv_dlopen=LoadLibrary + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl +else + + lt_cv_dlopen=dyld + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + +fi + + ;; + + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + + *) + ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" +if test "x$ac_cv_func_shl_load" = xyes; then : + lt_cv_dlopen=shl_load +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shl_load (); +int +main () +{ +return shl_load (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes +else + ac_cv_lib_dld_shl_load=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes; then : + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld +else + ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" +if test "x$ac_cv_func_dlopen" = xyes; then : + lt_cv_dlopen=dlopen +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if ${ac_cv_lib_svld_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes +else + ac_cv_lib_svld_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes; then : + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dld_link (); +int +main () +{ +return dld_link (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes +else + ac_cv_lib_dld_dld_link=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes; then : + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld +fi + + +fi + + +fi + + +fi + + +fi + + +fi + + ;; + esac + + if test no = "$lt_cv_dlopen"; then + enable_dlopen=no + else + enable_dlopen=yes + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS=$LDFLAGS + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS=$LIBS + LIBS="$lt_cv_dlopen_libs $LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test yes = "$cross_compiling"; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } + + if test yes = "$lt_cv_dlopen_self"; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self_static+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test yes = "$cross_compiling"; then : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + + return status; +} +_LT_EOF + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 + (eval $ac_link) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi + + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS + ;; + esac + + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi + + + + + + + + + + + + + + + + + +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP"; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + esac +fi + + + + + + + + + + + + + # Report what library types will actually be built + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } + test no = "$can_build_shared" && enable_shared=no + + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test yes = "$enable_shared" && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' + fi + ;; + + aix[4-9]*) + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } + # Make sure either enable_shared or enable_static is yes. + test yes = "$enable_shared" || enable_static=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } + + + + +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +CC=$lt_save_CC + + + + + + + + + + + + + + + + ac_config_commands="$ac_config_commands libtool" + + + + +# Only expand once: + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 +$as_echo_n "checking return type of signal handlers... " >&6; } +if ${ac_cv_type_signal+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include + +int +main () +{ +return *(signal (0, 0)) (0) == 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_signal=int +else + ac_cv_type_signal=void +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } + +cat >>confdefs.h <<_ACEOF +#define RETSIGTYPE $ac_cv_type_signal +_ACEOF + + + +for ac_header in stdarg.h sys/types.h dirent.h errno.h libgen.h malloc.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +for ac_header in stdlib.h mntent.h linux/cdrom.h inttypes.h strings.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +for ac_header in sys/time.h time.h mntent.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +ac_header_dirent=no +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 +$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } +if eval \${$as_ac_Header+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include <$ac_hdr> + +int +main () +{ +if ((DIR *) 0) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_ac_Header=yes" +else + eval "$as_ac_Header=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$as_ac_Header + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +_ACEOF + +ac_header_dirent=$ac_hdr; break +fi + +done +# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +if test $ac_header_dirent = dirent.h; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +$as_echo_n "checking for library containing opendir... " >&6; } +if ${ac_cv_search_opendir+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char opendir (); +int +main () +{ +return opendir (); + ; + return 0; +} +_ACEOF +for ac_lib in '' dir; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_opendir=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_opendir+:} false; then : + break +fi +done +if ${ac_cv_search_opendir+:} false; then : + +else + ac_cv_search_opendir=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +$as_echo "$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +$as_echo_n "checking for library containing opendir... " >&6; } +if ${ac_cv_search_opendir+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char opendir (); +int +main () +{ +return opendir (); + ; + return 0; +} +_ACEOF +for ac_lib in '' x; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_opendir=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_opendir+:} false; then : + break +fi +done +if ${ac_cv_search_opendir+:} false; then : + +else + ac_cv_search_opendir=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +$as_echo "$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + +fi + + + + ac_fn_c_check_member "$LINENO" "struct dirent" "d_type" "ac_cv_member_struct_dirent_d_type" " +#include +#ifdef HAVE_DIRENT_H +# include +#else +# define dirent direct +# ifdef HAVE_SYS_NDIR_H +# include +# endif +# ifdef HAVE_SYS_DIR_H +# include +# endif +# ifdef HAVE_NDIR_H +# include +# endif +#endif + +" +if test "x$ac_cv_member_struct_dirent_d_type" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_DIRENT_D_TYPE 1 +_ACEOF + + +fi + + + +# Check whether --enable-largefile was given. +if test "${enable_largefile+set}" = set; then : + enableval=$enable_largefile; +fi + +if test "$enable_largefile" != no; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +$as_echo_n "checking for special C compiler options needed for large files... " >&6; } +if ${ac_cv_sys_largefile_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_sys_largefile_CC=no + if test "$GCC" != yes; then + ac_save_CC=$CC + while :; do + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF + if ac_fn_c_try_compile "$LINENO"; then : + break +fi +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_largefile_CC=' -n32'; break +fi +rm -f core conftest.err conftest.$ac_objext + break + done + CC=$ac_save_CC + rm -f conftest.$ac_ext + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +$as_echo "$ac_cv_sys_largefile_CC" >&6; } + if test "$ac_cv_sys_largefile_CC" != no; then + CC=$CC$ac_cv_sys_largefile_CC + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if ${ac_cv_sys_file_offset_bits+:} false; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _FILE_OFFSET_BITS 64 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_file_offset_bits=64; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +_ACEOF +;; +esac +rm -rf conftest* + if test $ac_cv_sys_file_offset_bits = unknown; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } +if ${ac_cv_sys_large_files+:} false; then : + $as_echo_n "(cached) " >&6 +else + while :; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=no; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _LARGE_FILES 1 +#include + /* Check that off_t can represent 2**63 - 1 correctly. + We can't simply define LARGE_OFF_T to be 9223372036854775807, + since some C++ compilers masquerading as C compilers + incorrectly reject 9223372036854775807. */ +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) + int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 + && LARGE_OFF_T % 2147483647 == 1) + ? 1 : -1]; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_sys_large_files=1; break +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_large_files=unknown + break +done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +$as_echo "$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) +cat >>confdefs.h <<_ACEOF +#define _LARGE_FILES $ac_cv_sys_large_files +_ACEOF +;; +esac +rm -rf conftest* + fi + + +fi + + +ac_fn_c_check_func "$LINENO" "snprintf" "ac_cv_func_snprintf" +if test "x$ac_cv_func_snprintf" = xyes; then : + +else + as_fn_error $? "$function_not_found" "$LINENO" 5 +fi + + +if test "${SYS}" != "mingw32"; then : + + for ac_header in pthread.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" +if test "x$ac_cv_header_pthread_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PTHREAD_H 1 +_ACEOF + +else + as_fn_error $? "pthread required" "$LINENO" 5 +fi + +done + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5 +$as_echo_n "checking for library containing pthread_create... " >&6; } +if ${ac_cv_search_pthread_create+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pthread_create (); +int +main () +{ +return pthread_create (); + ; + return 0; +} +_ACEOF +for ac_lib in '' pthread; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_pthread_create=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_pthread_create+:} false; then : + break +fi +done +if ${ac_cv_search_pthread_create+:} false; then : + +else + ac_cv_search_pthread_create=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5 +$as_echo "$ac_cv_search_pthread_create" >&6; } +ac_res=$ac_cv_search_pthread_create +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +else + as_fn_error $? "pthread required" "$LINENO" 5 +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 +$as_echo_n "checking for library containing dlopen... " >&6; } +if ${ac_cv_search_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +for ac_lib in '' dl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_dlopen=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_dlopen+:} false; then : + break +fi +done +if ${ac_cv_search_dlopen+:} false; then : + +else + ac_cv_search_dlopen=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 +$as_echo "$ac_cv_search_dlopen" >&6; } +ac_res=$ac_cv_search_dlopen +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + DLOPEN_LIBS="$ac_cv_search_dlopen" + case $DLOPEN_LIBS in #( + no|none\ required) : + DLOPEN_LIBS="" ;; #( + *) : + ;; +esac + + +fi + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi +if test "x$with_libxml2" != "xno"; then : + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5 +$as_echo_n "checking for LIBXML2... " >&6; } + +if test -n "$LIBXML2_CFLAGS"; then + pkg_cv_LIBXML2_CFLAGS="$LIBXML2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.6" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBXML2_LIBS"; then + pkg_cv_LIBXML2_LIBS="$LIBXML2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.6" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= 2.6" 2>&1` + else + LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= 2.6" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBXML2_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (libxml-2.0 >= 2.6) were not met: + +$LIBXML2_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables LIBXML2_CFLAGS +and LIBXML2_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables LIBXML2_CFLAGS +and LIBXML2_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } + +else + LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS + LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + with_libxml2=yes; +$as_echo "#define HAVE_LIBXML2 1" >>confdefs.h + +fi + +fi + +if test "x$with_freetype" != "xno"; then : + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT2" >&5 +$as_echo_n "checking for FT2... " >&6; } + +if test -n "$FT2_CFLAGS"; then + pkg_cv_FT2_CFLAGS="$FT2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FT2_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$FT2_LIBS"; then + pkg_cv_FT2_LIBS="$FT2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FT2_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + FT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "freetype2" 2>&1` + else + FT2_PKG_ERRORS=`$PKG_CONFIG --print-errors "freetype2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$FT2_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (freetype2) were not met: + +$FT2_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables FT2_CFLAGS +and FT2_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables FT2_CFLAGS +and FT2_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } + +else + FT2_CFLAGS=$pkg_cv_FT2_CFLAGS + FT2_LIBS=$pkg_cv_FT2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + with_freetype=yes; +$as_echo "#define HAVE_FT2 1" >>confdefs.h + +fi + + if test "${SYS}" != "mingw32"; then : + + if test "x$with_fontconfig" != "xno"; then : + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FONTCONFIG" >&5 +$as_echo_n "checking for FONTCONFIG... " >&6; } + +if test -n "$FONTCONFIG_CFLAGS"; then + pkg_cv_FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig\""; } >&5 + ($PKG_CONFIG --exists --print-errors "fontconfig") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FONTCONFIG_CFLAGS=`$PKG_CONFIG --cflags "fontconfig" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$FONTCONFIG_LIBS"; then + pkg_cv_FONTCONFIG_LIBS="$FONTCONFIG_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig\""; } >&5 + ($PKG_CONFIG --exists --print-errors "fontconfig") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_FONTCONFIG_LIBS=`$PKG_CONFIG --libs "fontconfig" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fontconfig" 2>&1` + else + FONTCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors "fontconfig" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$FONTCONFIG_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (fontconfig) were not met: + +$FONTCONFIG_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables FONTCONFIG_CFLAGS +and FONTCONFIG_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 + +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables FONTCONFIG_CFLAGS +and FONTCONFIG_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } + +else + FONTCONFIG_CFLAGS=$pkg_cv_FONTCONFIG_CFLAGS + FONTCONFIG_LIBS=$pkg_cv_FONTCONFIG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + with_fontconfig=yes; +$as_echo "#define HAVE_FONTCONFIG 1" >>confdefs.h + +fi + +fi + +else + + FONTCONFIG_LIBS="-lgdi32" + + +fi + +fi + + + for flag in -Wall -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wcast-qual -Wwrite-strings -Wtype-limits -Wundef -Wmissing-prototypes -Wshadow; do + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag flag" >&5 +$as_echo_n "checking if $CC supports $flag flag... " >&6; } +if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + $as_echo_n "(cached) " >&6 +else + + if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main() { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='yes'" +else + eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='no'" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + +fi + + + if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then : + +fi + +fi +eval ac_res=\$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + + if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then : + CFLAGS="$CFLAGS $flag"; +fi + + done + + + + for flag in -Werror=implicit-function-declaration -Werror-implicit-function-declaration; do + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag flag" >&5 +$as_echo_n "checking if $CC supports $flag flag... " >&6; } +if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + $as_echo_n "(cached) " >&6 +else + + if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main() { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='yes'" +else + eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='no'" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + +fi + + + if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then : + +fi + +fi +eval ac_res=\$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + + if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then : + CFLAGS="$CFLAGS $flag"; break; +fi + + done + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC way to treat warnings as errors" >&5 +$as_echo_n "checking for $CC way to treat warnings as errors... " >&6; } +if ${cc_cv_werror+:} false; then : + $as_echo_n "(cached) " >&6 +else + + if ${cc_cv_cflags__Werror+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main() { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "cc_cv_cflags__Werror='yes'" +else + eval "cc_cv_cflags__Werror='no'" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + +fi + + + if eval test x$cc_cv_cflags__Werror = xyes; then : + cc_cv_werror=-Werror +else + + if ${cc_cv_cflags__errwarn__all+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -errwarn=%all" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main() { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "cc_cv_cflags__errwarn__all='yes'" +else + eval "cc_cv_cflags__errwarn__all='no'" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + +fi + + + if eval test x$cc_cv_cflags__errwarn__all = xyes; then : + cc_cv_werror=-errwarn=%all +fi + +fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cc_cv_werror" >&5 +$as_echo "$cc_cv_werror" >&6; } + +if test "x$enable_werror" = "xyes"; then : + + CFLAGS="${CFLAGS} $cc_cv_werror" + +fi + +if test "x$enable_extra_warnings" != "xno"; then : + + + for flag in -Wextra -Winline; do + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag flag" >&5 +$as_echo_n "checking if $CC supports $flag flag... " >&6; } +if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + $as_echo_n "(cached) " >&6 +else + + if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main() { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='yes'" +else + eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='no'" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + +fi + + + if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then : + +fi + +fi +eval ac_res=\$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + + if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then : + CFLAGS="$CFLAGS $flag"; +fi + + done + + +fi + +if test "x$enable_optimizations" != "xno"; then : + + + for flag in -O3 -fomit-frame-pointer; do + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports $flag flag" >&5 +$as_echo_n "checking if $CC supports $flag flag... " >&6; } +if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + $as_echo_n "(cached) " >&6 +else + + if { as_var=`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`; eval \${$as_var+:} false; }; then : + $as_echo_n "(cached) " >&6 +else + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main() { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='yes'" +else + eval "`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh`='no'" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + +fi + + + if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then : + +fi + +fi +eval ac_res=\$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + + if eval test x$`$as_echo "cc_cv_cflags_$flag" | $as_tr_sh` = xyes; then : + CFLAGS="$CFLAGS $flag"; +fi + + done + + +fi + + if test $use_examples = "yes" ; then + USING_EXAMPLES_TRUE= + USING_EXAMPLES_FALSE='#' +else + USING_EXAMPLES_TRUE='#' + USING_EXAMPLES_FALSE= +fi + + +case $host_cpu in + x86_64) java_arch=amd64 ;; + i?86) java_arch=i386 ;; + arm*) java_arch=arm ;; + *) java_arch=$host_cpu ;; +esac +case $host_os in + linux*) java_os=linux ;; + win*) java_os=win32 ;; + mingw*) java_os=win32 ;; + freebsd*) java_os=freebsd ;; + solaris*) java_os=solaris ;; + darwin*) java_os=darwin ;; + kfreebsd*) java_os=linux ;; + *) java_os=$host_os ;; +esac + +if test "x${JDK_HOME}" != "x"; then : + + BDJAVA_CFLAGS="-I${JDK_HOME}/include -I${JDK_HOME}/include/$java_os" + + temp_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$BDJAVA_CFLAGS $CPPFLAGS" + for ac_header in jni.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default" +if test "x$ac_cv_header_jni_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_JNI_H 1 +_ACEOF + +else + as_fn_error $? "could not find jni.h" "$LINENO" 5 +fi + +done + + CPPFLAGS="$temp_CPPFLAGS" + +else + + BDJAVA_CFLAGS='-I${abs_top_srcdir}/jni -I${abs_top_srcdir}/jni/'"${java_os}" + +fi + +# Extract the first word of "ant", so it can be a program name with args. +set dummy ant; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_HAVE_ANT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$HAVE_ANT"; then + ac_cv_prog_HAVE_ANT="$HAVE_ANT" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_HAVE_ANT="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_HAVE_ANT" && ac_cv_prog_HAVE_ANT="no" +fi +fi +HAVE_ANT=$ac_cv_prog_HAVE_ANT +if test -n "$HAVE_ANT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_ANT" >&5 +$as_echo "$HAVE_ANT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then + as_fn_error $? "BD-J requires ANT, but ant was not found. Please install it." "$LINENO" 5 +fi + + +cat >>confdefs.h <<_ACEOF +#define JAVA_ARCH "$java_arch" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define JDK_HOME "$JDK_HOME" +_ACEOF + + if test $use_bdjava_jar = "yes" ; then + USING_BDJAVA_BUILD_JAR_TRUE= + USING_BDJAVA_BUILD_JAR_FALSE='#' +else + USING_BDJAVA_BUILD_JAR_TRUE='#' + USING_BDJAVA_BUILD_JAR_FALSE= +fi + + +if test "$BDJ_TYPE" = "j2me"; then + +$as_echo "#define HAVE_BDJ_J2ME 1" >>confdefs.h + +else + BDJ_TYPE=j2se +fi + + + +if test ! -f "${srcdir}/contrib/libudfread/src/udfread.h"; then + as_fn_error $? "\"libudfread source tree not found\"" "$LINENO" 5 +fi +for ac_header in unistd.h fcntl.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +if test "${SYS}" != "mingw32"; then : + + ac_fn_c_check_func "$LINENO" "pread" "ac_cv_func_pread" +if test "x$ac_cv_func_pread" = xyes; then : + +else + +$as_echo "#define NEED_PREAD_IMPL 1" >>confdefs.h + +fi + + +fi + + + +# Files: +DX_PROJECT=libbluray + +DX_CONFIG=doc/doxygen-config + +DX_DOCDIR=doc/doxygen + + +# Environment variables used inside doxygen.cfg: +DX_ENV="$DX_ENV SRCDIR='$srcdir'" + +DX_ENV="$DX_ENV PROJECT='$DX_PROJECT'" + +DX_ENV="$DX_ENV DOCDIR='$DX_DOCDIR'" + +DX_ENV="$DX_ENV VERSION='$PACKAGE_VERSION'" + + +# Doxygen itself: + + + + # Check whether --enable-doxygen-doc was given. +if test "${enable_doxygen_doc+set}" = set; then : + enableval=$enable_doxygen_doc; +case "$enableval" in +#( +y|Y|yes|Yes|YES) + DX_FLAG_doc=1 + + +;; #( +n|N|no|No|NO) + DX_FLAG_doc=0 + +;; #( +*) + as_fn_error $? "invalid value '$enableval' given to doxygen-doc" "$LINENO" 5 +;; +esac + +else + +DX_FLAG_doc=1 + + + +fi + +if test "$DX_FLAG_doc" = 1; then + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}doxygen", so it can be a program name with args. +set dummy ${ac_tool_prefix}doxygen; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DX_DOXYGEN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DX_DOXYGEN in + [\\/]* | ?:[\\/]*) + ac_cv_path_DX_DOXYGEN="$DX_DOXYGEN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DX_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DX_DOXYGEN=$ac_cv_path_DX_DOXYGEN +if test -n "$DX_DOXYGEN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_DOXYGEN" >&5 +$as_echo "$DX_DOXYGEN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_DX_DOXYGEN"; then + ac_pt_DX_DOXYGEN=$DX_DOXYGEN + # Extract the first word of "doxygen", so it can be a program name with args. +set dummy doxygen; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_DX_DOXYGEN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_DX_DOXYGEN in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_DX_DOXYGEN="$ac_pt_DX_DOXYGEN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_DX_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_DX_DOXYGEN=$ac_cv_path_ac_pt_DX_DOXYGEN +if test -n "$ac_pt_DX_DOXYGEN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_DOXYGEN" >&5 +$as_echo "$ac_pt_DX_DOXYGEN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_DX_DOXYGEN" = x; then + DX_DOXYGEN="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DX_DOXYGEN=$ac_pt_DX_DOXYGEN + fi +else + DX_DOXYGEN="$ac_cv_path_DX_DOXYGEN" +fi + +if test "$DX_FLAG_doc$DX_DOXYGEN" = 1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: doxygen not found - will not generate any doxygen documentation" >&5 +$as_echo "$as_me: WARNING: doxygen not found - will not generate any doxygen documentation" >&2;} + DX_FLAG_doc=0 + +fi + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}perl", so it can be a program name with args. +set dummy ${ac_tool_prefix}perl; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DX_PERL+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DX_PERL in + [\\/]* | ?:[\\/]*) + ac_cv_path_DX_PERL="$DX_PERL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DX_PERL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DX_PERL=$ac_cv_path_DX_PERL +if test -n "$DX_PERL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_PERL" >&5 +$as_echo "$DX_PERL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_DX_PERL"; then + ac_pt_DX_PERL=$DX_PERL + # Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_DX_PERL+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_DX_PERL in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_DX_PERL="$ac_pt_DX_PERL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_DX_PERL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_DX_PERL=$ac_cv_path_ac_pt_DX_PERL +if test -n "$ac_pt_DX_PERL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_PERL" >&5 +$as_echo "$ac_pt_DX_PERL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_DX_PERL" = x; then + DX_PERL="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DX_PERL=$ac_pt_DX_PERL + fi +else + DX_PERL="$ac_cv_path_DX_PERL" +fi + +if test "$DX_FLAG_doc$DX_PERL" = 1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl not found - will not generate any doxygen documentation" >&5 +$as_echo "$as_me: WARNING: perl not found - will not generate any doxygen documentation" >&2;} + DX_FLAG_doc=0 + +fi + + : +fi +if test "$DX_FLAG_doc" = 1; then + if :; then + DX_COND_doc_TRUE= + DX_COND_doc_FALSE='#' +else + DX_COND_doc_TRUE='#' + DX_COND_doc_FALSE= +fi + + DX_ENV="$DX_ENV PERL_PATH='$DX_PERL'" + + : +else + if false; then + DX_COND_doc_TRUE= + DX_COND_doc_FALSE='#' +else + DX_COND_doc_TRUE='#' + DX_COND_doc_FALSE= +fi + + + : +fi + + +# Dot for graphics: + + + + # Check whether --enable-doxygen-dot was given. +if test "${enable_doxygen_dot+set}" = set; then : + enableval=$enable_doxygen_dot; +case "$enableval" in +#( +y|Y|yes|Yes|YES) + DX_FLAG_dot=1 + + +test "$DX_FLAG_doc" = "1" \ +|| as_fn_error $? "doxygen-dot requires doxygen-dot" "$LINENO" 5 + +;; #( +n|N|no|No|NO) + DX_FLAG_dot=0 + +;; #( +*) + as_fn_error $? "invalid value '$enableval' given to doxygen-dot" "$LINENO" 5 +;; +esac + +else + +DX_FLAG_dot=1 + + +test "$DX_FLAG_doc" = "1" || DX_FLAG_dot=0 + + + +fi + +if test "$DX_FLAG_dot" = 1; then + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dot", so it can be a program name with args. +set dummy ${ac_tool_prefix}dot; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DX_DOT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DX_DOT in + [\\/]* | ?:[\\/]*) + ac_cv_path_DX_DOT="$DX_DOT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DX_DOT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DX_DOT=$ac_cv_path_DX_DOT +if test -n "$DX_DOT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_DOT" >&5 +$as_echo "$DX_DOT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_DX_DOT"; then + ac_pt_DX_DOT=$DX_DOT + # Extract the first word of "dot", so it can be a program name with args. +set dummy dot; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_DX_DOT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_DX_DOT in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_DX_DOT="$ac_pt_DX_DOT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_DX_DOT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_DX_DOT=$ac_cv_path_ac_pt_DX_DOT +if test -n "$ac_pt_DX_DOT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_DOT" >&5 +$as_echo "$ac_pt_DX_DOT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_DX_DOT" = x; then + DX_DOT="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DX_DOT=$ac_pt_DX_DOT + fi +else + DX_DOT="$ac_cv_path_DX_DOT" +fi + +if test "$DX_FLAG_dot$DX_DOT" = 1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dot not found - will not generate graphics for doxygen documentation" >&5 +$as_echo "$as_me: WARNING: dot not found - will not generate graphics for doxygen documentation" >&2;} + DX_FLAG_dot=0 + +fi + + : +fi +if test "$DX_FLAG_dot" = 1; then + if :; then + DX_COND_dot_TRUE= + DX_COND_dot_FALSE='#' +else + DX_COND_dot_TRUE='#' + DX_COND_dot_FALSE= +fi + + DX_ENV="$DX_ENV HAVE_DOT='YES'" + + DX_ENV="$DX_ENV DOT_PATH='`expr ".$DX_DOT" : '\(\.\)[^/]*$' \| "x$DX_DOT" : 'x\(.*\)/[^/]*$'`'" + + : +else + if false; then + DX_COND_dot_TRUE= + DX_COND_dot_FALSE='#' +else + DX_COND_dot_TRUE='#' + DX_COND_dot_FALSE= +fi + + DX_ENV="$DX_ENV HAVE_DOT='NO'" + + : +fi + + +# Man pages generation: + + + + # Check whether --enable-doxygen-man was given. +if test "${enable_doxygen_man+set}" = set; then : + enableval=$enable_doxygen_man; +case "$enableval" in +#( +y|Y|yes|Yes|YES) + DX_FLAG_man=1 + + +test "$DX_FLAG_doc" = "1" \ +|| as_fn_error $? "doxygen-man requires doxygen-man" "$LINENO" 5 + +;; #( +n|N|no|No|NO) + DX_FLAG_man=0 + +;; #( +*) + as_fn_error $? "invalid value '$enableval' given to doxygen-man" "$LINENO" 5 +;; +esac + +else + +DX_FLAG_man=0 + + +test "$DX_FLAG_doc" = "1" || DX_FLAG_man=0 + + + +fi + +if test "$DX_FLAG_man" = 1; then + + : +fi +if test "$DX_FLAG_man" = 1; then + if :; then + DX_COND_man_TRUE= + DX_COND_man_FALSE='#' +else + DX_COND_man_TRUE='#' + DX_COND_man_FALSE= +fi + + DX_ENV="$DX_ENV GENERATE_MAN='YES'" + + : +else + if false; then + DX_COND_man_TRUE= + DX_COND_man_FALSE='#' +else + DX_COND_man_TRUE='#' + DX_COND_man_FALSE= +fi + + DX_ENV="$DX_ENV GENERATE_MAN='NO'" + + : +fi + + +# RTF file generation: + + + + # Check whether --enable-doxygen-rtf was given. +if test "${enable_doxygen_rtf+set}" = set; then : + enableval=$enable_doxygen_rtf; +case "$enableval" in +#( +y|Y|yes|Yes|YES) + DX_FLAG_rtf=1 + + +test "$DX_FLAG_doc" = "1" \ +|| as_fn_error $? "doxygen-rtf requires doxygen-rtf" "$LINENO" 5 + +;; #( +n|N|no|No|NO) + DX_FLAG_rtf=0 + +;; #( +*) + as_fn_error $? "invalid value '$enableval' given to doxygen-rtf" "$LINENO" 5 +;; +esac + +else + +DX_FLAG_rtf=0 + + +test "$DX_FLAG_doc" = "1" || DX_FLAG_rtf=0 + + + +fi + +if test "$DX_FLAG_rtf" = 1; then + + : +fi +if test "$DX_FLAG_rtf" = 1; then + if :; then + DX_COND_rtf_TRUE= + DX_COND_rtf_FALSE='#' +else + DX_COND_rtf_TRUE='#' + DX_COND_rtf_FALSE= +fi + + DX_ENV="$DX_ENV GENERATE_RTF='YES'" + + : +else + if false; then + DX_COND_rtf_TRUE= + DX_COND_rtf_FALSE='#' +else + DX_COND_rtf_TRUE='#' + DX_COND_rtf_FALSE= +fi + + DX_ENV="$DX_ENV GENERATE_RTF='NO'" + + : +fi + + +# XML file generation: + + + + # Check whether --enable-doxygen-xml was given. +if test "${enable_doxygen_xml+set}" = set; then : + enableval=$enable_doxygen_xml; +case "$enableval" in +#( +y|Y|yes|Yes|YES) + DX_FLAG_xml=1 + + +test "$DX_FLAG_doc" = "1" \ +|| as_fn_error $? "doxygen-xml requires doxygen-xml" "$LINENO" 5 + +;; #( +n|N|no|No|NO) + DX_FLAG_xml=0 + +;; #( +*) + as_fn_error $? "invalid value '$enableval' given to doxygen-xml" "$LINENO" 5 +;; +esac + +else + +DX_FLAG_xml=0 + + +test "$DX_FLAG_doc" = "1" || DX_FLAG_xml=0 + + + +fi + +if test "$DX_FLAG_xml" = 1; then + + : +fi +if test "$DX_FLAG_xml" = 1; then + if :; then + DX_COND_xml_TRUE= + DX_COND_xml_FALSE='#' +else + DX_COND_xml_TRUE='#' + DX_COND_xml_FALSE= +fi + + DX_ENV="$DX_ENV GENERATE_XML='YES'" + + : +else + if false; then + DX_COND_xml_TRUE= + DX_COND_xml_FALSE='#' +else + DX_COND_xml_TRUE='#' + DX_COND_xml_FALSE= +fi + + DX_ENV="$DX_ENV GENERATE_XML='NO'" + + : +fi + + +# (Compressed) HTML help generation: + + + + # Check whether --enable-doxygen-chm was given. +if test "${enable_doxygen_chm+set}" = set; then : + enableval=$enable_doxygen_chm; +case "$enableval" in +#( +y|Y|yes|Yes|YES) + DX_FLAG_chm=1 + + +test "$DX_FLAG_doc" = "1" \ +|| as_fn_error $? "doxygen-chm requires doxygen-chm" "$LINENO" 5 + +;; #( +n|N|no|No|NO) + DX_FLAG_chm=0 + +;; #( +*) + as_fn_error $? "invalid value '$enableval' given to doxygen-chm" "$LINENO" 5 +;; +esac + +else + +DX_FLAG_chm=0 + + +test "$DX_FLAG_doc" = "1" || DX_FLAG_chm=0 + + + +fi + +if test "$DX_FLAG_chm" = 1; then + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}hhc", so it can be a program name with args. +set dummy ${ac_tool_prefix}hhc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DX_HHC+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DX_HHC in + [\\/]* | ?:[\\/]*) + ac_cv_path_DX_HHC="$DX_HHC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DX_HHC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DX_HHC=$ac_cv_path_DX_HHC +if test -n "$DX_HHC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_HHC" >&5 +$as_echo "$DX_HHC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_DX_HHC"; then + ac_pt_DX_HHC=$DX_HHC + # Extract the first word of "hhc", so it can be a program name with args. +set dummy hhc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_DX_HHC+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_DX_HHC in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_DX_HHC="$ac_pt_DX_HHC" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_DX_HHC="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_DX_HHC=$ac_cv_path_ac_pt_DX_HHC +if test -n "$ac_pt_DX_HHC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_HHC" >&5 +$as_echo "$ac_pt_DX_HHC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_DX_HHC" = x; then + DX_HHC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DX_HHC=$ac_pt_DX_HHC + fi +else + DX_HHC="$ac_cv_path_DX_HHC" +fi + +if test "$DX_FLAG_chm$DX_HHC" = 1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: hhc not found - will not generate doxygen compressed HTML help documentation" >&5 +$as_echo "$as_me: WARNING: hhc not found - will not generate doxygen compressed HTML help documentation" >&2;} + DX_FLAG_chm=0 + +fi + + : +fi +if test "$DX_FLAG_chm" = 1; then + if :; then + DX_COND_chm_TRUE= + DX_COND_chm_FALSE='#' +else + DX_COND_chm_TRUE='#' + DX_COND_chm_FALSE= +fi + + DX_ENV="$DX_ENV HHC_PATH='$DX_HHC'" + + DX_ENV="$DX_ENV GENERATE_HTML='YES'" + + DX_ENV="$DX_ENV GENERATE_HTMLHELP='YES'" + + : +else + if false; then + DX_COND_chm_TRUE= + DX_COND_chm_FALSE='#' +else + DX_COND_chm_TRUE='#' + DX_COND_chm_FALSE= +fi + + DX_ENV="$DX_ENV GENERATE_HTMLHELP='NO'" + + : +fi + + +# Seperate CHI file generation. + + + + # Check whether --enable-doxygen-chi was given. +if test "${enable_doxygen_chi+set}" = set; then : + enableval=$enable_doxygen_chi; +case "$enableval" in +#( +y|Y|yes|Yes|YES) + DX_FLAG_chi=1 + + +test "$DX_FLAG_chm" = "1" \ +|| as_fn_error $? "doxygen-chi requires doxygen-chi" "$LINENO" 5 + +;; #( +n|N|no|No|NO) + DX_FLAG_chi=0 + +;; #( +*) + as_fn_error $? "invalid value '$enableval' given to doxygen-chi" "$LINENO" 5 +;; +esac + +else + +DX_FLAG_chi=0 + + +test "$DX_FLAG_chm" = "1" || DX_FLAG_chi=0 + + + +fi + +if test "$DX_FLAG_chi" = 1; then + + : +fi +if test "$DX_FLAG_chi" = 1; then + if :; then + DX_COND_chi_TRUE= + DX_COND_chi_FALSE='#' +else + DX_COND_chi_TRUE='#' + DX_COND_chi_FALSE= +fi + + DX_ENV="$DX_ENV GENERATE_CHI='YES'" + + : +else + if false; then + DX_COND_chi_TRUE= + DX_COND_chi_FALSE='#' +else + DX_COND_chi_TRUE='#' + DX_COND_chi_FALSE= +fi + + DX_ENV="$DX_ENV GENERATE_CHI='NO'" + + : +fi + + +# Plain HTML pages generation: + + + + # Check whether --enable-doxygen-html was given. +if test "${enable_doxygen_html+set}" = set; then : + enableval=$enable_doxygen_html; +case "$enableval" in +#( +y|Y|yes|Yes|YES) + DX_FLAG_html=1 + + +test "$DX_FLAG_doc" = "1" \ +|| as_fn_error $? "doxygen-html requires doxygen-html" "$LINENO" 5 + +test "$DX_FLAG_chm" = "0" \ +|| as_fn_error $? "doxygen-html contradicts doxygen-html" "$LINENO" 5 + +;; #( +n|N|no|No|NO) + DX_FLAG_html=0 + +;; #( +*) + as_fn_error $? "invalid value '$enableval' given to doxygen-html" "$LINENO" 5 +;; +esac + +else + +DX_FLAG_html=1 + + +test "$DX_FLAG_doc" = "1" || DX_FLAG_html=0 + + +test "$DX_FLAG_chm" = "0" || DX_FLAG_html=0 + + + +fi + +if test "$DX_FLAG_html" = 1; then + + : +fi +if test "$DX_FLAG_html" = 1; then + if :; then + DX_COND_html_TRUE= + DX_COND_html_FALSE='#' +else + DX_COND_html_TRUE='#' + DX_COND_html_FALSE= +fi + + DX_ENV="$DX_ENV GENERATE_HTML='YES'" + + : +else + if false; then + DX_COND_html_TRUE= + DX_COND_html_FALSE='#' +else + DX_COND_html_TRUE='#' + DX_COND_html_FALSE= +fi + + test "$DX_FLAG_chm" = 1 || DX_ENV="$DX_ENV GENERATE_HTML='NO'" + + : +fi + + +# PostScript file generation: + + + + # Check whether --enable-doxygen-ps was given. +if test "${enable_doxygen_ps+set}" = set; then : + enableval=$enable_doxygen_ps; +case "$enableval" in +#( +y|Y|yes|Yes|YES) + DX_FLAG_ps=1 + + +test "$DX_FLAG_doc" = "1" \ +|| as_fn_error $? "doxygen-ps requires doxygen-ps" "$LINENO" 5 + +;; #( +n|N|no|No|NO) + DX_FLAG_ps=0 + +;; #( +*) + as_fn_error $? "invalid value '$enableval' given to doxygen-ps" "$LINENO" 5 +;; +esac + +else + +DX_FLAG_ps=1 + + +test "$DX_FLAG_doc" = "1" || DX_FLAG_ps=0 + + + +fi + +if test "$DX_FLAG_ps" = 1; then + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}latex", so it can be a program name with args. +set dummy ${ac_tool_prefix}latex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DX_LATEX+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DX_LATEX in + [\\/]* | ?:[\\/]*) + ac_cv_path_DX_LATEX="$DX_LATEX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DX_LATEX="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DX_LATEX=$ac_cv_path_DX_LATEX +if test -n "$DX_LATEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_LATEX" >&5 +$as_echo "$DX_LATEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_DX_LATEX"; then + ac_pt_DX_LATEX=$DX_LATEX + # Extract the first word of "latex", so it can be a program name with args. +set dummy latex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_DX_LATEX+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_DX_LATEX in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_DX_LATEX="$ac_pt_DX_LATEX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_DX_LATEX="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_DX_LATEX=$ac_cv_path_ac_pt_DX_LATEX +if test -n "$ac_pt_DX_LATEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_LATEX" >&5 +$as_echo "$ac_pt_DX_LATEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_DX_LATEX" = x; then + DX_LATEX="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DX_LATEX=$ac_pt_DX_LATEX + fi +else + DX_LATEX="$ac_cv_path_DX_LATEX" +fi + +if test "$DX_FLAG_ps$DX_LATEX" = 1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: latex not found - will not generate doxygen PostScript documentation" >&5 +$as_echo "$as_me: WARNING: latex not found - will not generate doxygen PostScript documentation" >&2;} + DX_FLAG_ps=0 + +fi + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}makeindex", so it can be a program name with args. +set dummy ${ac_tool_prefix}makeindex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DX_MAKEINDEX+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DX_MAKEINDEX in + [\\/]* | ?:[\\/]*) + ac_cv_path_DX_MAKEINDEX="$DX_MAKEINDEX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DX_MAKEINDEX=$ac_cv_path_DX_MAKEINDEX +if test -n "$DX_MAKEINDEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_MAKEINDEX" >&5 +$as_echo "$DX_MAKEINDEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_DX_MAKEINDEX"; then + ac_pt_DX_MAKEINDEX=$DX_MAKEINDEX + # Extract the first word of "makeindex", so it can be a program name with args. +set dummy makeindex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_DX_MAKEINDEX+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_DX_MAKEINDEX in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_DX_MAKEINDEX="$ac_pt_DX_MAKEINDEX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_DX_MAKEINDEX=$ac_cv_path_ac_pt_DX_MAKEINDEX +if test -n "$ac_pt_DX_MAKEINDEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_MAKEINDEX" >&5 +$as_echo "$ac_pt_DX_MAKEINDEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_DX_MAKEINDEX" = x; then + DX_MAKEINDEX="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DX_MAKEINDEX=$ac_pt_DX_MAKEINDEX + fi +else + DX_MAKEINDEX="$ac_cv_path_DX_MAKEINDEX" +fi + +if test "$DX_FLAG_ps$DX_MAKEINDEX" = 1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: makeindex not found - will not generate doxygen PostScript documentation" >&5 +$as_echo "$as_me: WARNING: makeindex not found - will not generate doxygen PostScript documentation" >&2;} + DX_FLAG_ps=0 + +fi + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dvips", so it can be a program name with args. +set dummy ${ac_tool_prefix}dvips; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DX_DVIPS+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DX_DVIPS in + [\\/]* | ?:[\\/]*) + ac_cv_path_DX_DVIPS="$DX_DVIPS" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DX_DVIPS="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DX_DVIPS=$ac_cv_path_DX_DVIPS +if test -n "$DX_DVIPS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_DVIPS" >&5 +$as_echo "$DX_DVIPS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_DX_DVIPS"; then + ac_pt_DX_DVIPS=$DX_DVIPS + # Extract the first word of "dvips", so it can be a program name with args. +set dummy dvips; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_DX_DVIPS+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_DX_DVIPS in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_DX_DVIPS="$ac_pt_DX_DVIPS" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_DX_DVIPS="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_DX_DVIPS=$ac_cv_path_ac_pt_DX_DVIPS +if test -n "$ac_pt_DX_DVIPS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_DVIPS" >&5 +$as_echo "$ac_pt_DX_DVIPS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_DX_DVIPS" = x; then + DX_DVIPS="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DX_DVIPS=$ac_pt_DX_DVIPS + fi +else + DX_DVIPS="$ac_cv_path_DX_DVIPS" +fi + +if test "$DX_FLAG_ps$DX_DVIPS" = 1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dvips not found - will not generate doxygen PostScript documentation" >&5 +$as_echo "$as_me: WARNING: dvips not found - will not generate doxygen PostScript documentation" >&2;} + DX_FLAG_ps=0 + +fi + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}egrep", so it can be a program name with args. +set dummy ${ac_tool_prefix}egrep; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DX_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DX_EGREP in + [\\/]* | ?:[\\/]*) + ac_cv_path_DX_EGREP="$DX_EGREP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DX_EGREP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DX_EGREP=$ac_cv_path_DX_EGREP +if test -n "$DX_EGREP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_EGREP" >&5 +$as_echo "$DX_EGREP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_DX_EGREP"; then + ac_pt_DX_EGREP=$DX_EGREP + # Extract the first word of "egrep", so it can be a program name with args. +set dummy egrep; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_DX_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_DX_EGREP in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_DX_EGREP="$ac_pt_DX_EGREP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_DX_EGREP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_DX_EGREP=$ac_cv_path_ac_pt_DX_EGREP +if test -n "$ac_pt_DX_EGREP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_EGREP" >&5 +$as_echo "$ac_pt_DX_EGREP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_DX_EGREP" = x; then + DX_EGREP="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DX_EGREP=$ac_pt_DX_EGREP + fi +else + DX_EGREP="$ac_cv_path_DX_EGREP" +fi + +if test "$DX_FLAG_ps$DX_EGREP" = 1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: egrep not found - will not generate doxygen PostScript documentation" >&5 +$as_echo "$as_me: WARNING: egrep not found - will not generate doxygen PostScript documentation" >&2;} + DX_FLAG_ps=0 + +fi + + : +fi +if test "$DX_FLAG_ps" = 1; then + if :; then + DX_COND_ps_TRUE= + DX_COND_ps_FALSE='#' +else + DX_COND_ps_TRUE='#' + DX_COND_ps_FALSE= +fi + + + : +else + if false; then + DX_COND_ps_TRUE= + DX_COND_ps_FALSE='#' +else + DX_COND_ps_TRUE='#' + DX_COND_ps_FALSE= +fi + + + : +fi + + +# PDF file generation: + + + + # Check whether --enable-doxygen-pdf was given. +if test "${enable_doxygen_pdf+set}" = set; then : + enableval=$enable_doxygen_pdf; +case "$enableval" in +#( +y|Y|yes|Yes|YES) + DX_FLAG_pdf=1 + + +test "$DX_FLAG_doc" = "1" \ +|| as_fn_error $? "doxygen-pdf requires doxygen-pdf" "$LINENO" 5 + +;; #( +n|N|no|No|NO) + DX_FLAG_pdf=0 + +;; #( +*) + as_fn_error $? "invalid value '$enableval' given to doxygen-pdf" "$LINENO" 5 +;; +esac + +else + +DX_FLAG_pdf=1 + + +test "$DX_FLAG_doc" = "1" || DX_FLAG_pdf=0 + + + +fi + +if test "$DX_FLAG_pdf" = 1; then + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pdflatex", so it can be a program name with args. +set dummy ${ac_tool_prefix}pdflatex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DX_PDFLATEX+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DX_PDFLATEX in + [\\/]* | ?:[\\/]*) + ac_cv_path_DX_PDFLATEX="$DX_PDFLATEX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DX_PDFLATEX="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DX_PDFLATEX=$ac_cv_path_DX_PDFLATEX +if test -n "$DX_PDFLATEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_PDFLATEX" >&5 +$as_echo "$DX_PDFLATEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_DX_PDFLATEX"; then + ac_pt_DX_PDFLATEX=$DX_PDFLATEX + # Extract the first word of "pdflatex", so it can be a program name with args. +set dummy pdflatex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_DX_PDFLATEX+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_DX_PDFLATEX in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_DX_PDFLATEX="$ac_pt_DX_PDFLATEX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_DX_PDFLATEX="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_DX_PDFLATEX=$ac_cv_path_ac_pt_DX_PDFLATEX +if test -n "$ac_pt_DX_PDFLATEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_PDFLATEX" >&5 +$as_echo "$ac_pt_DX_PDFLATEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_DX_PDFLATEX" = x; then + DX_PDFLATEX="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DX_PDFLATEX=$ac_pt_DX_PDFLATEX + fi +else + DX_PDFLATEX="$ac_cv_path_DX_PDFLATEX" +fi + +if test "$DX_FLAG_pdf$DX_PDFLATEX" = 1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pdflatex not found - will not generate doxygen PDF documentation" >&5 +$as_echo "$as_me: WARNING: pdflatex not found - will not generate doxygen PDF documentation" >&2;} + DX_FLAG_pdf=0 + +fi + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}makeindex", so it can be a program name with args. +set dummy ${ac_tool_prefix}makeindex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DX_MAKEINDEX+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DX_MAKEINDEX in + [\\/]* | ?:[\\/]*) + ac_cv_path_DX_MAKEINDEX="$DX_MAKEINDEX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DX_MAKEINDEX=$ac_cv_path_DX_MAKEINDEX +if test -n "$DX_MAKEINDEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_MAKEINDEX" >&5 +$as_echo "$DX_MAKEINDEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_DX_MAKEINDEX"; then + ac_pt_DX_MAKEINDEX=$DX_MAKEINDEX + # Extract the first word of "makeindex", so it can be a program name with args. +set dummy makeindex; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_DX_MAKEINDEX+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_DX_MAKEINDEX in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_DX_MAKEINDEX="$ac_pt_DX_MAKEINDEX" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_DX_MAKEINDEX="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_DX_MAKEINDEX=$ac_cv_path_ac_pt_DX_MAKEINDEX +if test -n "$ac_pt_DX_MAKEINDEX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_MAKEINDEX" >&5 +$as_echo "$ac_pt_DX_MAKEINDEX" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_DX_MAKEINDEX" = x; then + DX_MAKEINDEX="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DX_MAKEINDEX=$ac_pt_DX_MAKEINDEX + fi +else + DX_MAKEINDEX="$ac_cv_path_DX_MAKEINDEX" +fi + +if test "$DX_FLAG_pdf$DX_MAKEINDEX" = 1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: makeindex not found - will not generate doxygen PDF documentation" >&5 +$as_echo "$as_me: WARNING: makeindex not found - will not generate doxygen PDF documentation" >&2;} + DX_FLAG_pdf=0 + +fi + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}egrep", so it can be a program name with args. +set dummy ${ac_tool_prefix}egrep; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_DX_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $DX_EGREP in + [\\/]* | ?:[\\/]*) + ac_cv_path_DX_EGREP="$DX_EGREP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_DX_EGREP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +DX_EGREP=$ac_cv_path_DX_EGREP +if test -n "$DX_EGREP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DX_EGREP" >&5 +$as_echo "$DX_EGREP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_DX_EGREP"; then + ac_pt_DX_EGREP=$DX_EGREP + # Extract the first word of "egrep", so it can be a program name with args. +set dummy egrep; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_DX_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_DX_EGREP in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_DX_EGREP="$ac_pt_DX_EGREP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_DX_EGREP="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_DX_EGREP=$ac_cv_path_ac_pt_DX_EGREP +if test -n "$ac_pt_DX_EGREP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_DX_EGREP" >&5 +$as_echo "$ac_pt_DX_EGREP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_DX_EGREP" = x; then + DX_EGREP="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DX_EGREP=$ac_pt_DX_EGREP + fi +else + DX_EGREP="$ac_cv_path_DX_EGREP" +fi + +if test "$DX_FLAG_pdf$DX_EGREP" = 1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: egrep not found - will not generate doxygen PDF documentation" >&5 +$as_echo "$as_me: WARNING: egrep not found - will not generate doxygen PDF documentation" >&2;} + DX_FLAG_pdf=0 + +fi + + : +fi +if test "$DX_FLAG_pdf" = 1; then + if :; then + DX_COND_pdf_TRUE= + DX_COND_pdf_FALSE='#' +else + DX_COND_pdf_TRUE='#' + DX_COND_pdf_FALSE= +fi + + + : +else + if false; then + DX_COND_pdf_TRUE= + DX_COND_pdf_FALSE='#' +else + DX_COND_pdf_TRUE='#' + DX_COND_pdf_FALSE= +fi + + + : +fi + + +# LaTeX generation for PS and/or PDF: +if test "$DX_FLAG_ps" = 1 || test "$DX_FLAG_pdf" = 1; then + if :; then + DX_COND_latex_TRUE= + DX_COND_latex_FALSE='#' +else + DX_COND_latex_TRUE='#' + DX_COND_latex_FALSE= +fi + + DX_ENV="$DX_ENV GENERATE_LATEX='YES'" + +else + if false; then + DX_COND_latex_TRUE= + DX_COND_latex_FALSE='#' +else + DX_COND_latex_TRUE='#' + DX_COND_latex_FALSE= +fi + + DX_ENV="$DX_ENV GENERATE_LATEX='NO'" + +fi + +# Paper size for PS and/or PDF: + +case "$DOXYGEN_PAPER_SIZE" in +#( +"") + DOXYGEN_PAPER_SIZE="" + +;; #( +a4wide|a4|letter|legal|executive) + DX_ENV="$DX_ENV PAPER_SIZE='$DOXYGEN_PAPER_SIZE'" + +;; #( +*) + as_fn_error $? "unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE'" "$LINENO" 5 +;; +esac + +#For debugging: +#echo DX_FLAG_doc=$DX_FLAG_doc +#echo DX_FLAG_dot=$DX_FLAG_dot +#echo DX_FLAG_man=$DX_FLAG_man +#echo DX_FLAG_html=$DX_FLAG_html +#echo DX_FLAG_chm=$DX_FLAG_chm +#echo DX_FLAG_chi=$DX_FLAG_chi +#echo DX_FLAG_rtf=$DX_FLAG_rtf +#echo DX_FLAG_xml=$DX_FLAG_xml +#echo DX_FLAG_pdf=$DX_FLAG_pdf +#echo DX_FLAG_ps=$DX_FLAG_ps +#echo DX_ENV=$DX_ENV + + +BLURAY_VERSION_MAJOR=1 + +BLURAY_VERSION_MINOR=0 + +BLURAY_VERSION_MICRO=1 + + +LT_VERSION_INFO="2:1:0" + + + +ac_config_files="$ac_config_files Makefile src/libbluray.pc src/libbluray/bluray-version.h" + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( + *) { eval $ac_var=; unset $ac_var;} ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + if test "x$cache_file" != "x/dev/null"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +DEFS=-DHAVE_CONFIG_H + +ac_libobjs= +ac_ltlibobjs= +U= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + +if test -z "${HAVE_WIN32_TRUE}" && test -z "${HAVE_WIN32_FALSE}"; then + as_fn_error $? "conditional \"HAVE_WIN32\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_DARWIN_TRUE}" && test -z "${HAVE_DARWIN_FALSE}"; then + as_fn_error $? "conditional \"HAVE_DARWIN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then + as_fn_error $? "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${USING_EXAMPLES_TRUE}" && test -z "${USING_EXAMPLES_FALSE}"; then + as_fn_error $? "conditional \"USING_EXAMPLES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${USING_BDJAVA_BUILD_JAR_TRUE}" && test -z "${USING_BDJAVA_BUILD_JAR_FALSE}"; then + as_fn_error $? "conditional \"USING_BDJAVA_BUILD_JAR\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_doc_TRUE}" && test -z "${DX_COND_doc_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_doc\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_doc_TRUE}" && test -z "${DX_COND_doc_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_doc\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_dot_TRUE}" && test -z "${DX_COND_dot_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_dot\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_dot_TRUE}" && test -z "${DX_COND_dot_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_dot\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_man_TRUE}" && test -z "${DX_COND_man_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_man\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_man_TRUE}" && test -z "${DX_COND_man_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_man\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_rtf_TRUE}" && test -z "${DX_COND_rtf_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_rtf\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_rtf_TRUE}" && test -z "${DX_COND_rtf_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_rtf\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_xml_TRUE}" && test -z "${DX_COND_xml_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_xml\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_xml_TRUE}" && test -z "${DX_COND_xml_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_xml\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_chm_TRUE}" && test -z "${DX_COND_chm_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_chm\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_chm_TRUE}" && test -z "${DX_COND_chm_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_chm\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_chi_TRUE}" && test -z "${DX_COND_chi_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_chi\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_chi_TRUE}" && test -z "${DX_COND_chi_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_chi\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_html_TRUE}" && test -z "${DX_COND_html_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_html\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_html_TRUE}" && test -z "${DX_COND_html_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_html\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_ps_TRUE}" && test -z "${DX_COND_ps_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_ps\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_ps_TRUE}" && test -z "${DX_COND_ps_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_ps\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_pdf_TRUE}" && test -z "${DX_COND_pdf_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_pdf\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_pdf_TRUE}" && test -z "${DX_COND_pdf_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_pdf\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_latex_TRUE}" && test -z "${DX_COND_latex_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_latex\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${DX_COND_latex_TRUE}" && test -z "${DX_COND_latex_FALSE}"; then + as_fn_error $? "conditional \"DX_COND_latex\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi + +: "${CONFIG_STATUS=./config.status}" +ac_write_fail=0 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false + +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac +fi + + +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +as_myself= +case $0 in #(( + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + exit 1 +fi + +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with STATUS, using 1 if that was 0. +as_fn_error () +{ + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in #((((( +-n*) + case `echo 'xy\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; + esac;; +*) + ECHO_N='-n';; +esac + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -pR'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -pR' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else + as_ln_s='cp -pR' + fi +else + as_ln_s='cp -pR' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + + +} # as_fn_mkdir_p +if mkdir -p . 2>/dev/null; then + as_mkdir_p='mkdir -p "$as_dir"' +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by libbluray $as_me 1.0.1, which was +generated by GNU Autoconf 2.69. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +ac_cs_usage="\ +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. + +Usage: $0 [OPTION]... [TAG]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + --config print configuration, then exit + -q, --quiet, --silent + do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Configuration commands: +$config_commands + +Report bugs to ." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_version="\\ +libbluray config.status 1.0.1 +configured by $0, generated by GNU Autoconf 2.69, + with options \\"\$ac_cs_config\\" + +Copyright (C) 2012 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=?*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; + esac + as_fn_append CONFIG_FILES " '$ac_optarg'" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) + $as_echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) as_fn_error $? "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; + + *) as_fn_append ac_config_targets " $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +if \$ac_cs_recheck; then + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' + export CONFIG_SHELL + exec "\$@" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + $as_echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +# +# INIT-COMMANDS +# +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" + + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +sed_quote_subst='$sed_quote_subst' +double_quote_subst='$double_quote_subst' +delay_variable_subst='$delay_variable_subst' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' +SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' +ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' +host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' +host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' +host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' +build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' +build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' +build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' +SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' +Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' +GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' +EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' +FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' +LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' +NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' +LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' +ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' +exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' +lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' +reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' +AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' +STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' +RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' +lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' +CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' +compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' +GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' +objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' +need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' +LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' +OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' +libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' +module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' +need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' +version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' +runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' +libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' +soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' +install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' +finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' +old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' +striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' + +LTCC='$LTCC' +LTCFLAGS='$LTCFLAGS' +compiler='$compiler_DEFAULT' + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + +# Quote evaled strings. +for var in SHELL \ +ECHO \ +PATH_SEPARATOR \ +SED \ +GREP \ +EGREP \ +FGREP \ +LD \ +NM \ +LN_S \ +lt_SP2NL \ +lt_NL2SP \ +reload_flag \ +OBJDUMP \ +deplibs_check_method \ +file_magic_cmd \ +file_magic_glob \ +want_nocaseglob \ +DLLTOOL \ +sharedlib_from_linklib_cmd \ +AR \ +AR_FLAGS \ +archiver_list_spec \ +STRIP \ +RANLIB \ +CC \ +CFLAGS \ +compiler \ +lt_cv_sys_global_symbol_pipe \ +lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ +lt_cv_sys_global_symbol_to_c_name_address \ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ +nm_file_list_spec \ +lt_cv_truncate_bin \ +lt_prog_compiler_no_builtin_flag \ +lt_prog_compiler_pic \ +lt_prog_compiler_wl \ +lt_prog_compiler_static \ +lt_cv_prog_compiler_c_o \ +need_locks \ +MANIFEST_TOOL \ +DSYMUTIL \ +NMEDIT \ +LIPO \ +OTOOL \ +OTOOL64 \ +shrext_cmds \ +export_dynamic_flag_spec \ +whole_archive_flag_spec \ +compiler_needs_object \ +with_gnu_ld \ +allow_undefined_flag \ +no_undefined_flag \ +hardcode_libdir_flag_spec \ +hardcode_libdir_separator \ +exclude_expsyms \ +include_expsyms \ +file_list_spec \ +variables_saved_for_relink \ +libname_spec \ +library_names_spec \ +soname_spec \ +install_override_mode \ +finish_eval \ +old_striplib \ +striplib; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +# Double-quote double-evaled strings. +for var in reload_cmds \ +old_postinstall_cmds \ +old_postuninstall_cmds \ +old_archive_cmds \ +extract_expsyms_cmds \ +old_archive_from_new_cmds \ +old_archive_from_expsyms_cmds \ +archive_cmds \ +archive_expsym_cmds \ +module_cmds \ +module_expsym_cmds \ +export_symbols_cmds \ +prelink_cmds \ +postlink_cmds \ +postinstall_cmds \ +postuninstall_cmds \ +finish_cmds \ +sys_lib_search_path_spec \ +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path; do + case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + *[\\\\\\\`\\"\\\$]*) + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes + ;; + *) + eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" + ;; + esac +done + +ac_aux_dir='$ac_aux_dir' + +# See if we are running on zsh, and set the options that allow our +# commands through without removal of \ escapes INIT. +if test -n "\${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST +fi + + + PACKAGE='$PACKAGE' + VERSION='$VERSION' + RM='$RM' + ofile='$ofile' + + + + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "src/libbluray.pc") CONFIG_FILES="$CONFIG_FILES src/libbluray.pc" ;; + "src/libbluray/bluray-version.h") CONFIG_FILES="$CONFIG_FILES src/libbluray/bluray-version.h" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= ac_tmp= + trap 'exit_status=$? + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status +' 0 + trap 'as_fn_exit 1' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp + +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. +if test -n "$CONFIG_FILES"; then + + +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr +fi + +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && +_ACEOF + + +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + . ./conf$$subs.sh || + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +rm -f conf$$subs.sh + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\)..*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\)..*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} + +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// +s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +fi # test -n "$CONFIG_FILES" + +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then + break + elif $ac_last_try; then + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + + +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$ac_tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + as_fn_append ac_file_inputs " '$ac_f'" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} + fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac + + case $ac_tag in + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir="$ac_dir"; as_fn_mkdir_p + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= +ac_sed_dataroot=' +/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s|@configure_input@|$ac_sed_conf_input|;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&5 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined" >&2;} + + rm -f "$ac_tmp/stdin" + case $ac_file in + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; + esac \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + ;; + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f "$ac_file" + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + fi + else + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; + + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac + + + case $ac_file$ac_mode in + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} + ;; + "libtool":C) + + # See if we are running on zsh, and set the options that allow our + # commands through without removal of \ escapes. + if test -n "${ZSH_VERSION+set}"; then + setopt NO_GLOB_SUBST + fi + + cfgfile=${ofile}T + trap "$RM \"$cfgfile\"; exit 1" 1 2 15 + $RM "$cfgfile" + + cat <<_LT_EOF >> "$cfgfile" +#! $SHELL +# Generated automatically by $as_me ($PACKAGE) $VERSION +# NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +# The names of the tagged configurations supported by this script. +available_tags='' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + +# ### BEGIN LIBTOOL CONFIG + +# Which release of libtool.m4 was used? +macro_version=$macro_version +macro_revision=$macro_revision + +# Whether or not to build shared libraries. +build_libtool_libs=$enable_shared + +# Whether or not to build static libraries. +build_old_libs=$enable_static + +# What type of objects to build. +pic_mode=$pic_mode + +# Whether or not to optimize for fast installation. +fast_install=$enable_fast_install + +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that protects backslashes. +ECHO=$lt_ECHO + +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + +# The host system. +host_alias=$host_alias +host=$host +host_os=$host_os + +# The build system. +build_alias=$build_alias +build=$build +build_os=$build_os + +# A sed program that does not truncate output. +SED=$lt_SED + +# Sed that helps us avoid accidentally triggering echo(1) options like -n. +Xsed="\$SED -e 1s/^X//" + +# A grep program that handles long lines. +GREP=$lt_GREP + +# An ERE matcher. +EGREP=$lt_EGREP + +# A literal string matcher. +FGREP=$lt_FGREP + +# A BSD- or MS-compatible name lister. +NM=$lt_NM + +# Whether we need soft or hard links. +LN_S=$lt_LN_S + +# What is the maximum length of a command? +max_cmd_len=$max_cmd_len + +# Object file suffix (normally "o"). +objext=$ac_objext + +# Executable file suffix (normally ""). +exeext=$exeext + +# whether the shell understands "unset". +lt_unset=$lt_unset + +# turn spaces into newlines. +SP2NL=$lt_lt_SP2NL + +# turn newlines into spaces. +NL2SP=$lt_lt_NL2SP + +# convert \$build file names to \$host format. +to_host_file_cmd=$lt_cv_to_host_file_cmd + +# convert \$build files to toolchain format. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd + +# An object symbol dumper. +OBJDUMP=$lt_OBJDUMP + +# Method to check whether dependent libraries are shared objects. +deplibs_check_method=$lt_deplibs_check_method + +# Command to use when deplibs_check_method = "file_magic". +file_magic_cmd=$lt_file_magic_cmd + +# How to find potential files when deplibs_check_method = "file_magic". +file_magic_glob=$lt_file_magic_glob + +# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +want_nocaseglob=$lt_want_nocaseglob + +# DLL creation program. +DLLTOOL=$lt_DLLTOOL + +# Command to associate shared and link libraries. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd + +# The archiver. +AR=$lt_AR + +# Flags to create an archive. +AR_FLAGS=$lt_AR_FLAGS + +# How to feed a file listing to the archiver. +archiver_list_spec=$lt_archiver_list_spec + +# A symbol stripping program. +STRIP=$lt_STRIP + +# Commands used to install an old-style archive. +RANLIB=$lt_RANLIB +old_postinstall_cmds=$lt_old_postinstall_cmds +old_postuninstall_cmds=$lt_old_postuninstall_cmds + +# Whether to use a lock for old archive extraction. +lock_old_archive_extraction=$lock_old_archive_extraction + +# A C compiler. +LTCC=$lt_CC + +# LTCC compiler flags. +LTCFLAGS=$lt_CFLAGS + +# Take the output of nm and produce a listing of raw symbols and C names. +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe + +# Transform the output of nm in a proper C declaration. +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl + +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + +# Transform the output of nm in a C name address pair. +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address + +# Transform the output of nm in a C name address pair when lib prefix is needed. +global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix + +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + +# Specify filename containing input files for \$NM. +nm_file_list_spec=$lt_nm_file_list_spec + +# The root where to search for dependent libraries,and where our libraries should be installed. +lt_sysroot=$lt_sysroot + +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + +# The name of the directory that contains temporary libtool files. +objdir=$objdir + +# Used to examine libraries when file_magic_cmd begins with "file". +MAGIC_CMD=$MAGIC_CMD + +# Must we lock files when doing compilation? +need_locks=$lt_need_locks + +# Manifest tool. +MANIFEST_TOOL=$lt_MANIFEST_TOOL + +# Tool to manipulate archived DWARF debug symbol files on Mac OS X. +DSYMUTIL=$lt_DSYMUTIL + +# Tool to change global to local symbols on Mac OS X. +NMEDIT=$lt_NMEDIT + +# Tool to manipulate fat objects and archives on Mac OS X. +LIPO=$lt_LIPO + +# ldd/readelf like tool for Mach-O binaries on Mac OS X. +OTOOL=$lt_OTOOL + +# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. +OTOOL64=$lt_OTOOL64 + +# Old archive suffix (normally "a"). +libext=$libext + +# Shared library suffix (normally ".so"). +shrext_cmds=$lt_shrext_cmds + +# The commands to extract the exported symbol list from a shared archive. +extract_expsyms_cmds=$lt_extract_expsyms_cmds + +# Variables whose values should be saved in libtool wrapper scripts and +# restored at link time. +variables_saved_for_relink=$lt_variables_saved_for_relink + +# Do we need the "lib" prefix for modules? +need_lib_prefix=$need_lib_prefix + +# Do we need a version for libraries? +need_version=$need_version + +# Library versioning type. +version_type=$version_type + +# Shared library runtime path variable. +runpath_var=$runpath_var + +# Shared library path variable. +shlibpath_var=$shlibpath_var + +# Is shlibpath searched before the hard-coded library search path? +shlibpath_overrides_runpath=$shlibpath_overrides_runpath + +# Format of library name prefix. +libname_spec=$lt_libname_spec + +# List of archive names. First name is the real one, the rest are links. +# The last name is the one that the linker finds with -lNAME +library_names_spec=$lt_library_names_spec + +# The coded name of the library, if different from the real name. +soname_spec=$lt_soname_spec + +# Permission mode override for installation of shared libraries. +install_override_mode=$lt_install_override_mode + +# Command to use after installation of a shared archive. +postinstall_cmds=$lt_postinstall_cmds + +# Command to use after uninstallation of a shared archive. +postuninstall_cmds=$lt_postuninstall_cmds + +# Commands used to finish a libtool library installation in a directory. +finish_cmds=$lt_finish_cmds + +# As "finish_cmds", except a single script fragment to be evaled but +# not shown. +finish_eval=$lt_finish_eval + +# Whether we should hardcode library paths into libraries. +hardcode_into_libs=$hardcode_into_libs + +# Compile-time system search path for libraries. +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec + +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path + +# Whether dlopen is supported. +dlopen_support=$enable_dlopen + +# Whether dlopen of programs is supported. +dlopen_self=$enable_dlopen_self + +# Whether dlopen of statically linked programs is supported. +dlopen_self_static=$enable_dlopen_self_static + +# Commands to strip libraries. +old_striplib=$lt_old_striplib +striplib=$lt_striplib + + +# The linker used to build libraries. +LD=$lt_LD + +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds + +# Commands used to build an old-style archive. +old_archive_cmds=$lt_old_archive_cmds + +# A language specific compiler. +CC=$lt_compiler + +# Is the compiler the GNU compiler? +with_gcc=$GCC + +# Compiler flag to turn off builtin functions. +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag + +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic + +# How to pass a linker flag through the compiler. +wl=$lt_lt_prog_compiler_wl + +# Compiler flag to prevent dynamic linking. +link_static_flag=$lt_lt_prog_compiler_static + +# Does compiler simultaneously support -c and -o options? +compiler_c_o=$lt_lt_cv_prog_compiler_c_o + +# Whether or not to add -lc for building shared libraries. +build_libtool_need_lc=$archive_cmds_need_lc + +# Whether or not to disallow shared libs when runtime libs are static. +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes + +# Compiler flag to allow reflexive dlopens. +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec + +# Compiler flag to generate shared objects directly from archives. +whole_archive_flag_spec=$lt_whole_archive_flag_spec + +# Whether the compiler copes with passing no objects directly. +compiler_needs_object=$lt_compiler_needs_object + +# Create an old-style archive from a shared archive. +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds + +# Create a temporary old-style archive to link instead of a shared archive. +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds + +# Commands used to build a shared archive. +archive_cmds=$lt_archive_cmds +archive_expsym_cmds=$lt_archive_expsym_cmds + +# Commands used to build a loadable module if different from building +# a shared archive. +module_cmds=$lt_module_cmds +module_expsym_cmds=$lt_module_expsym_cmds + +# Whether we are building with GNU ld or not. +with_gnu_ld=$lt_with_gnu_ld + +# Flag that allows shared libraries with undefined symbols to be built. +allow_undefined_flag=$lt_allow_undefined_flag + +# Flag that enforces no undefined symbols. +no_undefined_flag=$lt_no_undefined_flag + +# Flag to hardcode \$libdir into a binary during linking. +# This must work even if \$libdir does not exist +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec + +# Whether we need a single "-rpath" flag with a separated argument. +hardcode_libdir_separator=$lt_hardcode_libdir_separator + +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes +# DIR into the resulting binary. +hardcode_direct=$hardcode_direct + +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes +# DIR into the resulting binary and the resulting library dependency is +# "absolute",i.e impossible to change by setting \$shlibpath_var if the +# library is relocated. +hardcode_direct_absolute=$hardcode_direct_absolute + +# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +# into the resulting binary. +hardcode_minus_L=$hardcode_minus_L + +# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +# into the resulting binary. +hardcode_shlibpath_var=$hardcode_shlibpath_var + +# Set to "yes" if building a shared library automatically hardcodes DIR +# into the library and all subsequent libraries and executables linked +# against it. +hardcode_automatic=$hardcode_automatic + +# Set to yes if linker adds runtime paths of dependent libraries +# to runtime path list. +inherit_rpath=$inherit_rpath + +# Whether libtool must link a program against all its dependency libraries. +link_all_deplibs=$link_all_deplibs + +# Set to "yes" if exported symbols are required. +always_export_symbols=$always_export_symbols + +# The commands to list exported symbols. +export_symbols_cmds=$lt_export_symbols_cmds + +# Symbols that should not be listed in the preloaded symbols. +exclude_expsyms=$lt_exclude_expsyms + +# Symbols that must always be exported. +include_expsyms=$lt_include_expsyms + +# Commands necessary for linking programs (against libraries) with templates. +prelink_cmds=$lt_prelink_cmds + +# Commands necessary for finishing linking programs. +postlink_cmds=$lt_postlink_cmds + +# Specify filename containing input files. +file_list_spec=$lt_file_list_spec + +# How to hardcode a shared library path into an executable. +hardcode_action=$hardcode_action + +# ### END LIBTOOL CONFIG + +_LT_EOF + + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + + case $host_os in + aix3*) + cat <<\_LT_EOF >> "$cfgfile" +# AIX sometimes has problems with the GCC collect2 program. For some +# reason, if we set the COLLECT_NAMES environment variable, the problems +# vanish in a puff of smoke. +if test set != "${COLLECT_NAMES+set}"; then + COLLECT_NAMES= + export COLLECT_NAMES +fi +_LT_EOF + ;; + esac + + +ltmain=$ac_aux_dir/ltmain.sh + + + # We use sed instead of cat because bash on DJGPP gets confused if + # if finds mixed CR/LF and LF-only lines. Since sed operates in + # text mode, it properly converts lines to CR/LF. This bash problem + # is reportedly fixed, but why not run on old versions too? + sed '$q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || + (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") + chmod +x "$ofile" + + ;; + + esac +done # for ac_tag + + +as_fn_exit 0 +_ACEOF +ac_clean_files=$ac_clean_files_save + +test $ac_write_fail = 0 || + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || as_fn_exit 1 +fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi + + + + +echo " Summary:" +echo " --------" +echo " BD-J type: $BDJ_TYPE" +echo " build JAR: $use_bdjava_jar" +if test x"$BDJ_BOOTCLASSPATH" != x""; then +echo " BD-J bootclasspath: $BDJ_BOOTCLASSPATH" +fi +echo " Font support (freetype2): $with_freetype" +if [ $with_freetype = "yes" ]; then +if test "${SYS}" != "mingw32"; then +echo " Use system fonts (fontconfig): $with_fontconfig" +else +echo " Use system fonts: yes" +fi +fi +echo " Metadata support (libxml2): $with_libxml2" +echo " Build examples: $use_examples" + diff -Nru libbluray-0.8.1/configure.ac libbluray-1.0.1/configure.ac --- libbluray-0.8.1/configure.ac 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/configure.ac 2017-06-23 13:39:37.000000000 +0000 @@ -1,6 +1,6 @@ dnl library version number -m4_define([bluray_major], 0) -m4_define([bluray_minor], 8) +m4_define([bluray_major], 1) +m4_define([bluray_minor], 0) m4_define([bluray_micro], 1) m4_define([bluray_version],[bluray_major.bluray_minor.bluray_micro]) @@ -12,9 +12,9 @@ dnl dnl Library file name will be libbluray.so.(current-age).age.revision dnl -m4_define([lt_current], 9) +m4_define([lt_current], 2) m4_define([lt_revision], 1) -m4_define([lt_age], 8) +m4_define([lt_age], 0) dnl initilization AC_INIT([libbluray], bluray_version, [http://www.videolan.org/developers/libbluray.html]) @@ -81,13 +81,11 @@ [use_examples=$enableval], [use_examples=yes]) -AC_ARG_ENABLE([bdjava], - [AS_HELP_STRING([--disable-bdjava], [disable BD-Java support @<:@default=enabled@:>@])], - [use_bdjava=$enableval], - [use_bdjava=yes]) - -AC_ARG_ENABLE([udf], - [AS_HELP_STRING([--enable-udf], [enable UDF support @<:@default=disabled@:>@])]) +AC_ARG_ENABLE([bdjava-jar], + [AS_HELP_STRING([--disable-bdjava-jar], + [disable building of BD-Java JAR file @<:@default=enabled@:>@])], + [use_bdjava_jar=$enableval], + [use_bdjava_jar=yes]) AC_ARG_WITH([libxml2], [AS_HELP_STRING([--without-libxml2], [build without libxml2 support @<:@default=with@:>@])]) @@ -195,44 +193,42 @@ AM_CONDITIONAL([USING_EXAMPLES], [ test $use_examples = "yes" ]) dnl use bdjava -if [[ $use_bdjava = "yes" ]]; then - case $host_cpu in - x86_64) java_arch=amd64 ;; - i?86) java_arch=i386 ;; - arm*) java_arch=arm ;; - *) java_arch=$host_cpu ;; - esac - case $host_os in - linux*) java_os=linux ;; - win*) java_os=win32 ;; - mingw*) java_os=win32 ;; - freebsd*) java_os=freebsd ;; - solaris*) java_os=solaris ;; - darwin*) java_os=darwin ;; - *) java_os=$host_os ;; - esac +case $host_cpu in + x86_64) java_arch=amd64 ;; + i?86) java_arch=i386 ;; + arm*) java_arch=arm ;; + *) java_arch=$host_cpu ;; +esac +case $host_os in + linux*) java_os=linux ;; + win*) java_os=win32 ;; + mingw*) java_os=win32 ;; + freebsd*) java_os=freebsd ;; + solaris*) java_os=solaris ;; + darwin*) java_os=darwin ;; + kfreebsd*) java_os=linux ;; + *) java_os=$host_os ;; +esac - AS_IF([test "x${JDK_HOME}" != "x"], [ +AS_IF([test "x${JDK_HOME}" != "x"], [ BDJAVA_CFLAGS="-I${JDK_HOME}/include -I${JDK_HOME}/include/$java_os" temp_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$BDJAVA_CFLAGS $CPPFLAGS" AC_CHECK_HEADERS([jni.h], [], [AC_MSG_ERROR(could not find jni.h)]) CPPFLAGS="$temp_CPPFLAGS" - ], [ +], [ BDJAVA_CFLAGS='-I${abs_top_srcdir}/jni -I${abs_top_srcdir}/jni/'"${java_os}" - ]) +]) - AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) - if test "x$HAVE_ANT" = "xno"; then - AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.]) - fi - - AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"]) - AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."]) - AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""]) +AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) +if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then + AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.]) fi -AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ]) + +AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."]) +AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""]) +AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ]) dnl BD-J type if test "$BDJ_TYPE" = "j2me"; then @@ -245,22 +241,13 @@ AC_SUBST(BDJ_BOOTCLASSPATH) dnl udf support (using git submodule) -AS_IF([test "x$enable_udf" = "xyes"], [ - if test ! -f "${srcdir}/contrib/libudfread/src/udfread.h"; then - AC_MSG_ERROR("libudfread source tree not found") - fi - AC_CHECK_HEADERS([unistd.h fcntl.h]) - AS_IF([test "${SYS}" != "mingw32"], [ - AC_CHECK_FUNC([pread],, [AC_MSG_ERROR("Function pread not found. Try with --disable-udf.")]) - ]) - - AC_DEFINE([ENABLE_UDF], [1], [Define to 1 if libudfread is to be used for disc image access]) - UDF_CFLAGS='-I${srcdir}/contrib/libudfread/src/' - AC_SUBST(UDF_CFLAGS) - ], - [enable_udf=no]) - -AM_CONDITIONAL([ENABLE_UDF], [test $enable_udf = "yes" ]) +if test ! -f "${srcdir}/contrib/libudfread/src/udfread.h"; then + AC_MSG_ERROR("libudfread source tree not found") +fi +AC_CHECK_HEADERS([unistd.h fcntl.h]) +AS_IF([test "${SYS}" != "mingw32"], [ + AC_CHECK_FUNC([pread],, [AC_DEFINE([NEED_PREAD_IMPL], [1], [Define to 1 to use inefficient pread() replacement])]) +]) dnl generate documentation DX_INIT_DOXYGEN(libbluray, doc/doxygen-config, [doc/doxygen]) @@ -289,24 +276,19 @@ echo " Summary:" echo " --------" -echo " BD-J support: $use_bdjava" -if [[ $use_bdjava = "yes" ]]; then echo " BD-J type: $BDJ_TYPE" +echo " build JAR: $use_bdjava_jar" if test x"$BDJ_BOOTCLASSPATH" != x""; then echo " BD-J bootclasspath: $BDJ_BOOTCLASSPATH" fi -fi echo " Font support (freetype2): $with_freetype" if [[ $with_freetype = "yes" ]]; then -if [[ $use_bdjava = "yes" ]]; then if test "${SYS}" != "mingw32"; then echo " Use system fonts (fontconfig): $with_fontconfig" else echo " Use system fonts: yes" fi fi -fi echo " Metadata support (libxml2): $with_libxml2" -echo " UDF filesystem support: $enable_udf" echo " Build examples: $use_examples" diff -Nru libbluray-0.8.1/contrib/asm/LICENSE.txt libbluray-1.0.1/contrib/asm/LICENSE.txt --- libbluray-0.8.1/contrib/asm/LICENSE.txt 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/LICENSE.txt 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,28 @@ + + ASM: a very small and fast Java bytecode manipulation framework + Copyright (c) 2000-2011 INRIA, France Telecom + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + THE POSSIBILITY OF SUCH DAMAGE. diff -Nru libbluray-0.8.1/contrib/asm/SOURCE libbluray-1.0.1/contrib/asm/SOURCE --- libbluray-0.8.1/contrib/asm/SOURCE 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/SOURCE 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,9 @@ +Core functionality from asm 5.0.4 + +http://asm.ow2.org/ + +ASM is an all purpose Java bytecode manipulation and analysis framework. It can be used to modify +existing classes or dynamically generate classes, directly in binary form. Provided common +transformations and analysis algorithms allow to easily assemble custom complex transformations +and code analysis tools. + diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/AnnotationVisitor.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/AnnotationVisitor.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/AnnotationVisitor.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/AnnotationVisitor.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,169 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * A visitor to visit a Java annotation. The methods of this class must be + * called in the following order: ( visit | visitEnum | + * visitAnnotation | visitArray )* visitEnd. + * + * @author Eric Bruneton + * @author Eugene Kuleshov + */ +public abstract class AnnotationVisitor { + + /** + * The ASM API version implemented by this visitor. The value of this field + * must be one of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + */ + protected final int api; + + /** + * The annotation visitor to which this visitor must delegate method calls. + * May be null. + */ + protected AnnotationVisitor av; + + /** + * Constructs a new {@link AnnotationVisitor}. + * + * @param api + * the ASM API version implemented by this visitor. Must be one + * of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + */ + public AnnotationVisitor(final int api) { + this(api, null); + } + + /** + * Constructs a new {@link AnnotationVisitor}. + * + * @param api + * the ASM API version implemented by this visitor. Must be one + * of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + * @param av + * the annotation visitor to which this visitor must delegate + * method calls. May be null. + */ + public AnnotationVisitor(final int api, final AnnotationVisitor av) { + if (api != Opcodes.ASM4 && api != Opcodes.ASM5) { + throw new IllegalArgumentException(); + } + this.api = api; + this.av = av; + } + + /** + * Visits a primitive value of the annotation. + * + * @param name + * the value name. + * @param value + * the actual value, whose type must be {@link Byte}, + * {@link Boolean}, {@link Character}, {@link Short}, + * {@link Integer} , {@link Long}, {@link Float}, {@link Double}, + * {@link String} or {@link Type} or OBJECT or ARRAY sort. This + * value can also be an array of byte, boolean, short, char, int, + * long, float or double values (this is equivalent to using + * {@link #visitArray visitArray} and visiting each array element + * in turn, but is more convenient). + */ + public void visit(String name, Object value) { + if (av != null) { + av.visit(name, value); + } + } + + /** + * Visits an enumeration value of the annotation. + * + * @param name + * the value name. + * @param desc + * the class descriptor of the enumeration class. + * @param value + * the actual enumeration value. + */ + public void visitEnum(String name, String desc, String value) { + if (av != null) { + av.visitEnum(name, desc, value); + } + } + + /** + * Visits a nested annotation value of the annotation. + * + * @param name + * the value name. + * @param desc + * the class descriptor of the nested annotation class. + * @return a visitor to visit the actual nested annotation value, or + * null if this visitor is not interested in visiting this + * nested annotation. The nested annotation value must be fully + * visited before calling other methods on this annotation + * visitor. + */ + public AnnotationVisitor visitAnnotation(String name, String desc) { + if (av != null) { + return av.visitAnnotation(name, desc); + } + return null; + } + + /** + * Visits an array value of the annotation. Note that arrays of primitive + * types (such as byte, boolean, short, char, int, long, float or double) + * can be passed as value to {@link #visit visit}. This is what + * {@link ClassReader} does. + * + * @param name + * the value name. + * @return a visitor to visit the actual array value elements, or + * null if this visitor is not interested in visiting these + * values. The 'name' parameters passed to the methods of this + * visitor are ignored. All the array values must be visited + * before calling other methods on this annotation visitor. + */ + public AnnotationVisitor visitArray(String name) { + if (av != null) { + return av.visitArray(name); + } + return null; + } + + /** + * Visits the end of the annotation. + */ + public void visitEnd() { + if (av != null) { + av.visitEnd(); + } + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/AnnotationWriter.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/AnnotationWriter.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/AnnotationWriter.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/AnnotationWriter.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,371 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * An {@link AnnotationVisitor} that generates annotations in bytecode form. + * + * @author Eric Bruneton + * @author Eugene Kuleshov + */ +final class AnnotationWriter extends AnnotationVisitor { + + /** + * The class writer to which this annotation must be added. + */ + private final ClassWriter cw; + + /** + * The number of values in this annotation. + */ + private int size; + + /** + * true if values are named, false otherwise. Annotation + * writers used for annotation default and annotation arrays use unnamed + * values. + */ + private final boolean named; + + /** + * The annotation values in bytecode form. This byte vector only contains + * the values themselves, i.e. the number of values must be stored as a + * unsigned short just before these bytes. + */ + private final ByteVector bv; + + /** + * The byte vector to be used to store the number of values of this + * annotation. See {@link #bv}. + */ + private final ByteVector parent; + + /** + * Where the number of values of this annotation must be stored in + * {@link #parent}. + */ + private final int offset; + + /** + * Next annotation writer. This field is used to store annotation lists. + */ + AnnotationWriter next; + + /** + * Previous annotation writer. This field is used to store annotation lists. + */ + AnnotationWriter prev; + + // ------------------------------------------------------------------------ + // Constructor + // ------------------------------------------------------------------------ + + /** + * Constructs a new {@link AnnotationWriter}. + * + * @param cw + * the class writer to which this annotation must be added. + * @param named + * true if values are named, false otherwise. + * @param bv + * where the annotation values must be stored. + * @param parent + * where the number of annotation values must be stored. + * @param offset + * where in parent the number of annotation values must + * be stored. + */ + AnnotationWriter(final ClassWriter cw, final boolean named, + final ByteVector bv, final ByteVector parent, final int offset) { + super(Opcodes.ASM5); + this.cw = cw; + this.named = named; + this.bv = bv; + this.parent = parent; + this.offset = offset; + } + + // ------------------------------------------------------------------------ + // Implementation of the AnnotationVisitor abstract class + // ------------------------------------------------------------------------ + + @Override + public void visit(final String name, final Object value) { + ++size; + if (named) { + bv.putShort(cw.newUTF8(name)); + } + if (value instanceof String) { + bv.put12('s', cw.newUTF8((String) value)); + } else if (value instanceof Byte) { + bv.put12('B', cw.newInteger(((Byte) value).byteValue()).index); + } else if (value instanceof Boolean) { + int v = ((Boolean) value).booleanValue() ? 1 : 0; + bv.put12('Z', cw.newInteger(v).index); + } else if (value instanceof Character) { + bv.put12('C', cw.newInteger(((Character) value).charValue()).index); + } else if (value instanceof Short) { + bv.put12('S', cw.newInteger(((Short) value).shortValue()).index); + } else if (value instanceof Type) { + bv.put12('c', cw.newUTF8(((Type) value).getDescriptor())); + } else if (value instanceof byte[]) { + byte[] v = (byte[]) value; + bv.put12('[', v.length); + for (int i = 0; i < v.length; i++) { + bv.put12('B', cw.newInteger(v[i]).index); + } + } else if (value instanceof boolean[]) { + boolean[] v = (boolean[]) value; + bv.put12('[', v.length); + for (int i = 0; i < v.length; i++) { + bv.put12('Z', cw.newInteger(v[i] ? 1 : 0).index); + } + } else if (value instanceof short[]) { + short[] v = (short[]) value; + bv.put12('[', v.length); + for (int i = 0; i < v.length; i++) { + bv.put12('S', cw.newInteger(v[i]).index); + } + } else if (value instanceof char[]) { + char[] v = (char[]) value; + bv.put12('[', v.length); + for (int i = 0; i < v.length; i++) { + bv.put12('C', cw.newInteger(v[i]).index); + } + } else if (value instanceof int[]) { + int[] v = (int[]) value; + bv.put12('[', v.length); + for (int i = 0; i < v.length; i++) { + bv.put12('I', cw.newInteger(v[i]).index); + } + } else if (value instanceof long[]) { + long[] v = (long[]) value; + bv.put12('[', v.length); + for (int i = 0; i < v.length; i++) { + bv.put12('J', cw.newLong(v[i]).index); + } + } else if (value instanceof float[]) { + float[] v = (float[]) value; + bv.put12('[', v.length); + for (int i = 0; i < v.length; i++) { + bv.put12('F', cw.newFloat(v[i]).index); + } + } else if (value instanceof double[]) { + double[] v = (double[]) value; + bv.put12('[', v.length); + for (int i = 0; i < v.length; i++) { + bv.put12('D', cw.newDouble(v[i]).index); + } + } else { + Item i = cw.newConstItem(value); + bv.put12(".s.IFJDCS".charAt(i.type), i.index); + } + } + + @Override + public void visitEnum(final String name, final String desc, + final String value) { + ++size; + if (named) { + bv.putShort(cw.newUTF8(name)); + } + bv.put12('e', cw.newUTF8(desc)).putShort(cw.newUTF8(value)); + } + + @Override + public AnnotationVisitor visitAnnotation(final String name, + final String desc) { + ++size; + if (named) { + bv.putShort(cw.newUTF8(name)); + } + // write tag and type, and reserve space for values count + bv.put12('@', cw.newUTF8(desc)).putShort(0); + return new AnnotationWriter(cw, true, bv, bv, bv.length - 2); + } + + @Override + public AnnotationVisitor visitArray(final String name) { + ++size; + if (named) { + bv.putShort(cw.newUTF8(name)); + } + // write tag, and reserve space for array size + bv.put12('[', 0); + return new AnnotationWriter(cw, false, bv, bv, bv.length - 2); + } + + @Override + public void visitEnd() { + if (parent != null) { + byte[] data = parent.data; + data[offset] = (byte) (size >>> 8); + data[offset + 1] = (byte) size; + } + } + + // ------------------------------------------------------------------------ + // Utility methods + // ------------------------------------------------------------------------ + + /** + * Returns the size of this annotation writer list. + * + * @return the size of this annotation writer list. + */ + int getSize() { + int size = 0; + AnnotationWriter aw = this; + while (aw != null) { + size += aw.bv.length; + aw = aw.next; + } + return size; + } + + /** + * Puts the annotations of this annotation writer list into the given byte + * vector. + * + * @param out + * where the annotations must be put. + */ + void put(final ByteVector out) { + int n = 0; + int size = 2; + AnnotationWriter aw = this; + AnnotationWriter last = null; + while (aw != null) { + ++n; + size += aw.bv.length; + aw.visitEnd(); // in case user forgot to call visitEnd + aw.prev = last; + last = aw; + aw = aw.next; + } + out.putInt(size); + out.putShort(n); + aw = last; + while (aw != null) { + out.putByteArray(aw.bv.data, 0, aw.bv.length); + aw = aw.prev; + } + } + + /** + * Puts the given annotation lists into the given byte vector. + * + * @param panns + * an array of annotation writer lists. + * @param off + * index of the first annotation to be written. + * @param out + * where the annotations must be put. + */ + static void put(final AnnotationWriter[] panns, final int off, + final ByteVector out) { + int size = 1 + 2 * (panns.length - off); + for (int i = off; i < panns.length; ++i) { + size += panns[i] == null ? 0 : panns[i].getSize(); + } + out.putInt(size).putByte(panns.length - off); + for (int i = off; i < panns.length; ++i) { + AnnotationWriter aw = panns[i]; + AnnotationWriter last = null; + int n = 0; + while (aw != null) { + ++n; + aw.visitEnd(); // in case user forgot to call visitEnd + aw.prev = last; + last = aw; + aw = aw.next; + } + out.putShort(n); + aw = last; + while (aw != null) { + out.putByteArray(aw.bv.data, 0, aw.bv.length); + aw = aw.prev; + } + } + } + + /** + * Puts the given type reference and type path into the given bytevector. + * LOCAL_VARIABLE and RESOURCE_VARIABLE target types are not supported. + * + * @param typeRef + * a reference to the annotated type. See {@link TypeReference}. + * @param typePath + * the path to the annotated type argument, wildcard bound, array + * element type, or static inner type within 'typeRef'. May be + * null if the annotation targets 'typeRef' as a whole. + * @param out + * where the type reference and type path must be put. + */ + static void putTarget(int typeRef, TypePath typePath, ByteVector out) { + switch (typeRef >>> 24) { + case 0x00: // CLASS_TYPE_PARAMETER + case 0x01: // METHOD_TYPE_PARAMETER + case 0x16: // METHOD_FORMAL_PARAMETER + out.putShort(typeRef >>> 16); + break; + case 0x13: // FIELD + case 0x14: // METHOD_RETURN + case 0x15: // METHOD_RECEIVER + out.putByte(typeRef >>> 24); + break; + case 0x47: // CAST + case 0x48: // CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT + case 0x49: // METHOD_INVOCATION_TYPE_ARGUMENT + case 0x4A: // CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT + case 0x4B: // METHOD_REFERENCE_TYPE_ARGUMENT + out.putInt(typeRef); + break; + // case 0x10: // CLASS_EXTENDS + // case 0x11: // CLASS_TYPE_PARAMETER_BOUND + // case 0x12: // METHOD_TYPE_PARAMETER_BOUND + // case 0x17: // THROWS + // case 0x42: // EXCEPTION_PARAMETER + // case 0x43: // INSTANCEOF + // case 0x44: // NEW + // case 0x45: // CONSTRUCTOR_REFERENCE + // case 0x46: // METHOD_REFERENCE + default: + out.put12(typeRef >>> 24, (typeRef & 0xFFFF00) >> 8); + break; + } + if (typePath == null) { + out.putByte(0); + } else { + int length = typePath.b[typePath.offset] * 2 + 1; + out.putByteArray(typePath.b, typePath.offset, length); + } + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Attribute.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Attribute.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Attribute.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Attribute.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,255 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * A non standard class, field, method or code attribute. + * + * @author Eric Bruneton + * @author Eugene Kuleshov + */ +public class Attribute { + + /** + * The type of this attribute. + */ + public final String type; + + /** + * The raw value of this attribute, used only for unknown attributes. + */ + byte[] value; + + /** + * The next attribute in this attribute list. May be null. + */ + Attribute next; + + /** + * Constructs a new empty attribute. + * + * @param type + * the type of the attribute. + */ + protected Attribute(final String type) { + this.type = type; + } + + /** + * Returns true if this type of attribute is unknown. The default + * implementation of this method always returns true. + * + * @return true if this type of attribute is unknown. + */ + public boolean isUnknown() { + return true; + } + + /** + * Returns true if this type of attribute is a code attribute. + * + * @return true if this type of attribute is a code attribute. + */ + public boolean isCodeAttribute() { + return false; + } + + /** + * Returns the labels corresponding to this attribute. + * + * @return the labels corresponding to this attribute, or null if + * this attribute is not a code attribute that contains labels. + */ + protected Label[] getLabels() { + return null; + } + + /** + * Reads a {@link #type type} attribute. This method must return a + * new {@link Attribute} object, of type {@link #type type}, + * corresponding to the len bytes starting at the given offset, in + * the given class reader. + * + * @param cr + * the class that contains the attribute to be read. + * @param off + * index of the first byte of the attribute's content in + * {@link ClassReader#b cr.b}. The 6 attribute header bytes, + * containing the type and the length of the attribute, are not + * taken into account here. + * @param len + * the length of the attribute's content. + * @param buf + * buffer to be used to call {@link ClassReader#readUTF8 + * readUTF8}, {@link ClassReader#readClass(int,char[]) readClass} + * or {@link ClassReader#readConst readConst}. + * @param codeOff + * index of the first byte of code's attribute content in + * {@link ClassReader#b cr.b}, or -1 if the attribute to be read + * is not a code attribute. The 6 attribute header bytes, + * containing the type and the length of the attribute, are not + * taken into account here. + * @param labels + * the labels of the method's code, or null if the + * attribute to be read is not a code attribute. + * @return a new {@link Attribute} object corresponding to the given + * bytes. + */ + protected Attribute read(final ClassReader cr, final int off, + final int len, final char[] buf, final int codeOff, + final Label[] labels) { + Attribute attr = new Attribute(type); + attr.value = new byte[len]; + System.arraycopy(cr.b, off, attr.value, 0, len); + return attr; + } + + /** + * Returns the byte array form of this attribute. + * + * @param cw + * the class to which this attribute must be added. This + * parameter can be used to add to the constant pool of this + * class the items that corresponds to this attribute. + * @param code + * the bytecode of the method corresponding to this code + * attribute, or null if this attribute is not a code + * attributes. + * @param len + * the length of the bytecode of the method corresponding to this + * code attribute, or null if this attribute is not a + * code attribute. + * @param maxStack + * the maximum stack size of the method corresponding to this + * code attribute, or -1 if this attribute is not a code + * attribute. + * @param maxLocals + * the maximum number of local variables of the method + * corresponding to this code attribute, or -1 if this attribute + * is not a code attribute. + * @return the byte array form of this attribute. + */ + protected ByteVector write(final ClassWriter cw, final byte[] code, + final int len, final int maxStack, final int maxLocals) { + ByteVector v = new ByteVector(); + v.data = value; + v.length = value.length; + return v; + } + + /** + * Returns the length of the attribute list that begins with this attribute. + * + * @return the length of the attribute list that begins with this attribute. + */ + final int getCount() { + int count = 0; + Attribute attr = this; + while (attr != null) { + count += 1; + attr = attr.next; + } + return count; + } + + /** + * Returns the size of all the attributes in this attribute list. + * + * @param cw + * the class writer to be used to convert the attributes into + * byte arrays, with the {@link #write write} method. + * @param code + * the bytecode of the method corresponding to these code + * attributes, or null if these attributes are not code + * attributes. + * @param len + * the length of the bytecode of the method corresponding to + * these code attributes, or null if these attributes + * are not code attributes. + * @param maxStack + * the maximum stack size of the method corresponding to these + * code attributes, or -1 if these attributes are not code + * attributes. + * @param maxLocals + * the maximum number of local variables of the method + * corresponding to these code attributes, or -1 if these + * attributes are not code attributes. + * @return the size of all the attributes in this attribute list. This size + * includes the size of the attribute headers. + */ + final int getSize(final ClassWriter cw, final byte[] code, final int len, + final int maxStack, final int maxLocals) { + Attribute attr = this; + int size = 0; + while (attr != null) { + cw.newUTF8(attr.type); + size += attr.write(cw, code, len, maxStack, maxLocals).length + 6; + attr = attr.next; + } + return size; + } + + /** + * Writes all the attributes of this attribute list in the given byte + * vector. + * + * @param cw + * the class writer to be used to convert the attributes into + * byte arrays, with the {@link #write write} method. + * @param code + * the bytecode of the method corresponding to these code + * attributes, or null if these attributes are not code + * attributes. + * @param len + * the length of the bytecode of the method corresponding to + * these code attributes, or null if these attributes + * are not code attributes. + * @param maxStack + * the maximum stack size of the method corresponding to these + * code attributes, or -1 if these attributes are not code + * attributes. + * @param maxLocals + * the maximum number of local variables of the method + * corresponding to these code attributes, or -1 if these + * attributes are not code attributes. + * @param out + * where the attributes must be written. + */ + final void put(final ClassWriter cw, final byte[] code, final int len, + final int maxStack, final int maxLocals, final ByteVector out) { + Attribute attr = this; + while (attr != null) { + ByteVector b = attr.write(cw, code, len, maxStack, maxLocals); + out.putShort(cw.newUTF8(attr.type)).putInt(b.length); + out.putByteArray(b.data, 0, b.length); + attr = attr.next; + } + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/ByteVector.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/ByteVector.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/ByteVector.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/ByteVector.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,339 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * A dynamically extensible vector of bytes. This class is roughly equivalent to + * a DataOutputStream on top of a ByteArrayOutputStream, but is more efficient. + * + * @author Eric Bruneton + */ +public class ByteVector { + + /** + * The content of this vector. + */ + byte[] data; + + /** + * Actual number of bytes in this vector. + */ + int length; + + /** + * Constructs a new {@link ByteVector ByteVector} with a default initial + * size. + */ + public ByteVector() { + data = new byte[64]; + } + + /** + * Constructs a new {@link ByteVector ByteVector} with the given initial + * size. + * + * @param initialSize + * the initial size of the byte vector to be constructed. + */ + public ByteVector(final int initialSize) { + data = new byte[initialSize]; + } + + /** + * Puts a byte into this byte vector. The byte vector is automatically + * enlarged if necessary. + * + * @param b + * a byte. + * @return this byte vector. + */ + public ByteVector putByte(final int b) { + int length = this.length; + if (length + 1 > data.length) { + enlarge(1); + } + data[length++] = (byte) b; + this.length = length; + return this; + } + + /** + * Puts two bytes into this byte vector. The byte vector is automatically + * enlarged if necessary. + * + * @param b1 + * a byte. + * @param b2 + * another byte. + * @return this byte vector. + */ + ByteVector put11(final int b1, final int b2) { + int length = this.length; + if (length + 2 > data.length) { + enlarge(2); + } + byte[] data = this.data; + data[length++] = (byte) b1; + data[length++] = (byte) b2; + this.length = length; + return this; + } + + /** + * Puts a short into this byte vector. The byte vector is automatically + * enlarged if necessary. + * + * @param s + * a short. + * @return this byte vector. + */ + public ByteVector putShort(final int s) { + int length = this.length; + if (length + 2 > data.length) { + enlarge(2); + } + byte[] data = this.data; + data[length++] = (byte) (s >>> 8); + data[length++] = (byte) s; + this.length = length; + return this; + } + + /** + * Puts a byte and a short into this byte vector. The byte vector is + * automatically enlarged if necessary. + * + * @param b + * a byte. + * @param s + * a short. + * @return this byte vector. + */ + ByteVector put12(final int b, final int s) { + int length = this.length; + if (length + 3 > data.length) { + enlarge(3); + } + byte[] data = this.data; + data[length++] = (byte) b; + data[length++] = (byte) (s >>> 8); + data[length++] = (byte) s; + this.length = length; + return this; + } + + /** + * Puts an int into this byte vector. The byte vector is automatically + * enlarged if necessary. + * + * @param i + * an int. + * @return this byte vector. + */ + public ByteVector putInt(final int i) { + int length = this.length; + if (length + 4 > data.length) { + enlarge(4); + } + byte[] data = this.data; + data[length++] = (byte) (i >>> 24); + data[length++] = (byte) (i >>> 16); + data[length++] = (byte) (i >>> 8); + data[length++] = (byte) i; + this.length = length; + return this; + } + + /** + * Puts a long into this byte vector. The byte vector is automatically + * enlarged if necessary. + * + * @param l + * a long. + * @return this byte vector. + */ + public ByteVector putLong(final long l) { + int length = this.length; + if (length + 8 > data.length) { + enlarge(8); + } + byte[] data = this.data; + int i = (int) (l >>> 32); + data[length++] = (byte) (i >>> 24); + data[length++] = (byte) (i >>> 16); + data[length++] = (byte) (i >>> 8); + data[length++] = (byte) i; + i = (int) l; + data[length++] = (byte) (i >>> 24); + data[length++] = (byte) (i >>> 16); + data[length++] = (byte) (i >>> 8); + data[length++] = (byte) i; + this.length = length; + return this; + } + + /** + * Puts an UTF8 string into this byte vector. The byte vector is + * automatically enlarged if necessary. + * + * @param s + * a String whose UTF8 encoded length must be less than 65536. + * @return this byte vector. + */ + public ByteVector putUTF8(final String s) { + int charLength = s.length(); + if (charLength > 65535) { + throw new IllegalArgumentException(); + } + int len = length; + if (len + 2 + charLength > data.length) { + enlarge(2 + charLength); + } + byte[] data = this.data; + // optimistic algorithm: instead of computing the byte length and then + // serializing the string (which requires two loops), we assume the byte + // length is equal to char length (which is the most frequent case), and + // we start serializing the string right away. During the serialization, + // if we find that this assumption is wrong, we continue with the + // general method. + data[len++] = (byte) (charLength >>> 8); + data[len++] = (byte) charLength; + for (int i = 0; i < charLength; ++i) { + char c = s.charAt(i); + if (c >= '\001' && c <= '\177') { + data[len++] = (byte) c; + } else { + length = len; + return encodeUTF8(s, i, 65535); + } + } + length = len; + return this; + } + + /** + * Puts an UTF8 string into this byte vector. The byte vector is + * automatically enlarged if necessary. The string length is encoded in two + * bytes before the encoded characters, if there is space for that (i.e. if + * this.length - i - 2 >= 0). + * + * @param s + * the String to encode. + * @param i + * the index of the first character to encode. The previous + * characters are supposed to have already been encoded, using + * only one byte per character. + * @param maxByteLength + * the maximum byte length of the encoded string, including the + * already encoded characters. + * @return this byte vector. + */ + ByteVector encodeUTF8(final String s, int i, int maxByteLength) { + int charLength = s.length(); + int byteLength = i; + char c; + for (int j = i; j < charLength; ++j) { + c = s.charAt(j); + if (c >= '\001' && c <= '\177') { + byteLength++; + } else if (c > '\u07FF') { + byteLength += 3; + } else { + byteLength += 2; + } + } + if (byteLength > maxByteLength) { + throw new IllegalArgumentException(); + } + int start = length - i - 2; + if (start >= 0) { + data[start] = (byte) (byteLength >>> 8); + data[start + 1] = (byte) byteLength; + } + if (length + byteLength - i > data.length) { + enlarge(byteLength - i); + } + int len = length; + for (int j = i; j < charLength; ++j) { + c = s.charAt(j); + if (c >= '\001' && c <= '\177') { + data[len++] = (byte) c; + } else if (c > '\u07FF') { + data[len++] = (byte) (0xE0 | c >> 12 & 0xF); + data[len++] = (byte) (0x80 | c >> 6 & 0x3F); + data[len++] = (byte) (0x80 | c & 0x3F); + } else { + data[len++] = (byte) (0xC0 | c >> 6 & 0x1F); + data[len++] = (byte) (0x80 | c & 0x3F); + } + } + length = len; + return this; + } + + /** + * Puts an array of bytes into this byte vector. The byte vector is + * automatically enlarged if necessary. + * + * @param b + * an array of bytes. May be null to put len + * null bytes into this byte vector. + * @param off + * index of the fist byte of b that must be copied. + * @param len + * number of bytes of b that must be copied. + * @return this byte vector. + */ + public ByteVector putByteArray(final byte[] b, final int off, final int len) { + if (length + len > data.length) { + enlarge(len); + } + if (b != null) { + System.arraycopy(b, off, data, length, len); + } + length += len; + return this; + } + + /** + * Enlarge this byte vector so that it can receive n more bytes. + * + * @param size + * number of additional bytes that this byte vector should be + * able to receive. + */ + private void enlarge(final int size) { + int length1 = 2 * data.length; + int length2 = length + size; + byte[] newData = new byte[length1 > length2 ? length1 : length2]; + System.arraycopy(data, 0, newData, 0, length); + data = newData; + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/ClassReader.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/ClassReader.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/ClassReader.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/ClassReader.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,2506 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +import java.io.IOException; +import java.io.InputStream; + +/** + * A Java class parser to make a {@link ClassVisitor} visit an existing class. + * This class parses a byte array conforming to the Java class file format and + * calls the appropriate visit methods of a given class visitor for each field, + * method and bytecode instruction encountered. + * + * @author Eric Bruneton + * @author Eugene Kuleshov + */ +public class ClassReader { + + /** + * True to enable signatures support. + */ + static final boolean SIGNATURES = true; + + /** + * True to enable annotations support. + */ + static final boolean ANNOTATIONS = true; + + /** + * True to enable stack map frames support. + */ + static final boolean FRAMES = true; + + /** + * True to enable bytecode writing support. + */ + static final boolean WRITER = true; + + /** + * True to enable JSR_W and GOTO_W support. + */ + static final boolean RESIZE = true; + + /** + * Flag to skip method code. If this class is set CODE + * attribute won't be visited. This can be used, for example, to retrieve + * annotations for methods and method parameters. + */ + public static final int SKIP_CODE = 1; + + /** + * Flag to skip the debug information in the class. If this flag is set the + * debug information of the class is not visited, i.e. the + * {@link MethodVisitor#visitLocalVariable visitLocalVariable} and + * {@link MethodVisitor#visitLineNumber visitLineNumber} methods will not be + * called. + */ + public static final int SKIP_DEBUG = 2; + + /** + * Flag to skip the stack map frames in the class. If this flag is set the + * stack map frames of the class is not visited, i.e. the + * {@link MethodVisitor#visitFrame visitFrame} method will not be called. + * This flag is useful when the {@link ClassWriter#COMPUTE_FRAMES} option is + * used: it avoids visiting frames that will be ignored and recomputed from + * scratch in the class writer. + */ + public static final int SKIP_FRAMES = 4; + + /** + * Flag to expand the stack map frames. By default stack map frames are + * visited in their original format (i.e. "expanded" for classes whose + * version is less than V1_6, and "compressed" for the other classes). If + * this flag is set, stack map frames are always visited in expanded format + * (this option adds a decompression/recompression step in ClassReader and + * ClassWriter which degrades performances quite a lot). + */ + public static final int EXPAND_FRAMES = 8; + + /** + * The class to be parsed. The content of this array must not be + * modified. This field is intended for {@link Attribute} sub classes, and + * is normally not needed by class generators or adapters. + */ + public final byte[] b; + + /** + * The start index of each constant pool item in {@link #b b}, plus one. The + * one byte offset skips the constant pool item tag that indicates its type. + */ + private final int[] items; + + /** + * The String objects corresponding to the CONSTANT_Utf8 items. This cache + * avoids multiple parsing of a given CONSTANT_Utf8 constant pool item, + * which GREATLY improves performances (by a factor 2 to 3). This caching + * strategy could be extended to all constant pool items, but its benefit + * would not be so great for these items (because they are much less + * expensive to parse than CONSTANT_Utf8 items). + */ + private final String[] strings; + + /** + * Maximum length of the strings contained in the constant pool of the + * class. + */ + private final int maxStringLength; + + /** + * Start index of the class header information (access, name...) in + * {@link #b b}. + */ + public final int header; + + // ------------------------------------------------------------------------ + // Constructors + // ------------------------------------------------------------------------ + + /** + * Constructs a new {@link ClassReader} object. + * + * @param b + * the bytecode of the class to be read. + */ + public ClassReader(final byte[] b) { + this(b, 0, b.length); + } + + /** + * Constructs a new {@link ClassReader} object. + * + * @param b + * the bytecode of the class to be read. + * @param off + * the start offset of the class data. + * @param len + * the length of the class data. + */ + public ClassReader(final byte[] b, final int off, final int len) { + this.b = b; + // checks the class version + if (readShort(off + 6) > Opcodes.V1_8) { + throw new IllegalArgumentException(); + } + // parses the constant pool + items = new int[readUnsignedShort(off + 8)]; + int n = items.length; + strings = new String[n]; + int max = 0; + int index = off + 10; + for (int i = 1; i < n; ++i) { + items[i] = index + 1; + int size; + switch (b[index]) { + case ClassWriter.FIELD: + case ClassWriter.METH: + case ClassWriter.IMETH: + case ClassWriter.INT: + case ClassWriter.FLOAT: + case ClassWriter.NAME_TYPE: + case ClassWriter.INDY: + size = 5; + break; + case ClassWriter.LONG: + case ClassWriter.DOUBLE: + size = 9; + ++i; + break; + case ClassWriter.UTF8: + size = 3 + readUnsignedShort(index + 1); + if (size > max) { + max = size; + } + break; + case ClassWriter.HANDLE: + size = 4; + break; + // case ClassWriter.CLASS: + // case ClassWriter.STR: + // case ClassWriter.MTYPE + default: + size = 3; + break; + } + index += size; + } + maxStringLength = max; + // the class header information starts just after the constant pool + header = index; + } + + /** + * Returns the class's access flags (see {@link Opcodes}). This value may + * not reflect Deprecated and Synthetic flags when bytecode is before 1.5 + * and those flags are represented by attributes. + * + * @return the class access flags + * + * @see ClassVisitor#visit(int, int, String, String, String, String[]) + */ + public int getAccess() { + return readUnsignedShort(header); + } + + /** + * Returns the internal name of the class (see + * {@link Type#getInternalName() getInternalName}). + * + * @return the internal class name + * + * @see ClassVisitor#visit(int, int, String, String, String, String[]) + */ + public String getClassName() { + return readClass(header + 2, new char[maxStringLength]); + } + + /** + * Returns the internal of name of the super class (see + * {@link Type#getInternalName() getInternalName}). For interfaces, the + * super class is {@link Object}. + * + * @return the internal name of super class, or null for + * {@link Object} class. + * + * @see ClassVisitor#visit(int, int, String, String, String, String[]) + */ + public String getSuperName() { + return readClass(header + 4, new char[maxStringLength]); + } + + /** + * Returns the internal names of the class's interfaces (see + * {@link Type#getInternalName() getInternalName}). + * + * @return the array of internal names for all implemented interfaces or + * null. + * + * @see ClassVisitor#visit(int, int, String, String, String, String[]) + */ + public String[] getInterfaces() { + int index = header + 6; + int n = readUnsignedShort(index); + String[] interfaces = new String[n]; + if (n > 0) { + char[] buf = new char[maxStringLength]; + for (int i = 0; i < n; ++i) { + index += 2; + interfaces[i] = readClass(index, buf); + } + } + return interfaces; + } + + /** + * Copies the constant pool data into the given {@link ClassWriter}. Should + * be called before the {@link #accept(ClassVisitor,int)} method. + * + * @param classWriter + * the {@link ClassWriter} to copy constant pool into. + */ + void copyPool(final ClassWriter classWriter) { + char[] buf = new char[maxStringLength]; + int ll = items.length; + Item[] items2 = new Item[ll]; + for (int i = 1; i < ll; i++) { + int index = items[i]; + int tag = b[index - 1]; + Item item = new Item(i); + int nameType; + switch (tag) { + case ClassWriter.FIELD: + case ClassWriter.METH: + case ClassWriter.IMETH: + nameType = items[readUnsignedShort(index + 2)]; + item.set(tag, readClass(index, buf), readUTF8(nameType, buf), + readUTF8(nameType + 2, buf)); + break; + case ClassWriter.INT: + item.set(readInt(index)); + break; + case ClassWriter.FLOAT: + item.set(Float.intBitsToFloat(readInt(index))); + break; + case ClassWriter.NAME_TYPE: + item.set(tag, readUTF8(index, buf), readUTF8(index + 2, buf), + null); + break; + case ClassWriter.LONG: + item.set(readLong(index)); + ++i; + break; + case ClassWriter.DOUBLE: + item.set(Double.longBitsToDouble(readLong(index))); + ++i; + break; + case ClassWriter.UTF8: { + String s = strings[i]; + if (s == null) { + index = items[i]; + s = strings[i] = readUTF(index + 2, + readUnsignedShort(index), buf); + } + item.set(tag, s, null, null); + break; + } + case ClassWriter.HANDLE: { + int fieldOrMethodRef = items[readUnsignedShort(index + 1)]; + nameType = items[readUnsignedShort(fieldOrMethodRef + 2)]; + item.set(ClassWriter.HANDLE_BASE + readByte(index), + readClass(fieldOrMethodRef, buf), + readUTF8(nameType, buf), readUTF8(nameType + 2, buf)); + break; + } + case ClassWriter.INDY: + if (classWriter.bootstrapMethods == null) { + copyBootstrapMethods(classWriter, items2, buf); + } + nameType = items[readUnsignedShort(index + 2)]; + item.set(readUTF8(nameType, buf), readUTF8(nameType + 2, buf), + readUnsignedShort(index)); + break; + // case ClassWriter.STR: + // case ClassWriter.CLASS: + // case ClassWriter.MTYPE + default: + item.set(tag, readUTF8(index, buf), null, null); + break; + } + + int index2 = item.hashCode % items2.length; + item.next = items2[index2]; + items2[index2] = item; + } + + int off = items[1] - 1; + classWriter.pool.putByteArray(b, off, header - off); + classWriter.items = items2; + classWriter.threshold = (int) (0.75d * ll); + classWriter.index = ll; + } + + /** + * Copies the bootstrap method data into the given {@link ClassWriter}. + * Should be called before the {@link #accept(ClassVisitor,int)} method. + * + * @param classWriter + * the {@link ClassWriter} to copy bootstrap methods into. + */ + private void copyBootstrapMethods(final ClassWriter classWriter, + final Item[] items, final char[] c) { + // finds the "BootstrapMethods" attribute + int u = getAttributes(); + boolean found = false; + for (int i = readUnsignedShort(u); i > 0; --i) { + String attrName = readUTF8(u + 2, c); + if ("BootstrapMethods".equals(attrName)) { + found = true; + break; + } + u += 6 + readInt(u + 4); + } + if (!found) { + return; + } + // copies the bootstrap methods in the class writer + int boostrapMethodCount = readUnsignedShort(u + 8); + for (int j = 0, v = u + 10; j < boostrapMethodCount; j++) { + int position = v - u - 10; + int hashCode = readConst(readUnsignedShort(v), c).hashCode(); + for (int k = readUnsignedShort(v + 2); k > 0; --k) { + hashCode ^= readConst(readUnsignedShort(v + 4), c).hashCode(); + v += 2; + } + v += 4; + Item item = new Item(j); + item.set(position, hashCode & 0x7FFFFFFF); + int index = item.hashCode % items.length; + item.next = items[index]; + items[index] = item; + } + int attrSize = readInt(u + 4); + ByteVector bootstrapMethods = new ByteVector(attrSize + 62); + bootstrapMethods.putByteArray(b, u + 10, attrSize - 2); + classWriter.bootstrapMethodsCount = boostrapMethodCount; + classWriter.bootstrapMethods = bootstrapMethods; + } + + /** + * Constructs a new {@link ClassReader} object. + * + * @param is + * an input stream from which to read the class. + * @throws IOException + * if a problem occurs during reading. + */ + public ClassReader(final InputStream is) throws IOException { + this(readClass(is, false)); + } + + /** + * Constructs a new {@link ClassReader} object. + * + * @param name + * the binary qualified name of the class to be read. + * @throws IOException + * if an exception occurs during reading. + */ + public ClassReader(final String name) throws IOException { + this(readClass( + ClassLoader.getSystemResourceAsStream(name.replace('.', '/') + + ".class"), true)); + } + + /** + * Reads the bytecode of a class. + * + * @param is + * an input stream from which to read the class. + * @param close + * true to close the input stream after reading. + * @return the bytecode read from the given input stream. + * @throws IOException + * if a problem occurs during reading. + */ + private static byte[] readClass(final InputStream is, boolean close) + throws IOException { + if (is == null) { + throw new IOException("Class not found"); + } + try { + byte[] b = new byte[is.available()]; + int len = 0; + while (true) { + int n = is.read(b, len, b.length - len); + if (n == -1) { + if (len < b.length) { + byte[] c = new byte[len]; + System.arraycopy(b, 0, c, 0, len); + b = c; + } + return b; + } + len += n; + if (len == b.length) { + int last = is.read(); + if (last < 0) { + return b; + } + byte[] c = new byte[b.length + 1000]; + System.arraycopy(b, 0, c, 0, len); + c[len++] = (byte) last; + b = c; + } + } + } finally { + if (close) { + is.close(); + } + } + } + + // ------------------------------------------------------------------------ + // Public methods + // ------------------------------------------------------------------------ + + /** + * Makes the given visitor visit the Java class of this {@link ClassReader} + * . This class is the one specified in the constructor (see + * {@link #ClassReader(byte[]) ClassReader}). + * + * @param classVisitor + * the visitor that must visit this class. + * @param flags + * option flags that can be used to modify the default behavior + * of this class. See {@link #SKIP_DEBUG}, {@link #EXPAND_FRAMES} + * , {@link #SKIP_FRAMES}, {@link #SKIP_CODE}. + */ + public void accept(final ClassVisitor classVisitor, final int flags) { + accept(classVisitor, new Attribute[0], flags); + } + + /** + * Makes the given visitor visit the Java class of this {@link ClassReader}. + * This class is the one specified in the constructor (see + * {@link #ClassReader(byte[]) ClassReader}). + * + * @param classVisitor + * the visitor that must visit this class. + * @param attrs + * prototypes of the attributes that must be parsed during the + * visit of the class. Any attribute whose type is not equal to + * the type of one the prototypes will not be parsed: its byte + * array value will be passed unchanged to the ClassWriter. + * This may corrupt it if this value contains references to + * the constant pool, or has syntactic or semantic links with a + * class element that has been transformed by a class adapter + * between the reader and the writer. + * @param flags + * option flags that can be used to modify the default behavior + * of this class. See {@link #SKIP_DEBUG}, {@link #EXPAND_FRAMES} + * , {@link #SKIP_FRAMES}, {@link #SKIP_CODE}. + */ + public void accept(final ClassVisitor classVisitor, + final Attribute[] attrs, final int flags) { + int u = header; // current offset in the class file + char[] c = new char[maxStringLength]; // buffer used to read strings + + Context context = new Context(); + context.attrs = attrs; + context.flags = flags; + context.buffer = c; + + // reads the class declaration + int access = readUnsignedShort(u); + String name = readClass(u + 2, c); + String superClass = readClass(u + 4, c); + String[] interfaces = new String[readUnsignedShort(u + 6)]; + u += 8; + for (int i = 0; i < interfaces.length; ++i) { + interfaces[i] = readClass(u, c); + u += 2; + } + + // reads the class attributes + String signature = null; + String sourceFile = null; + String sourceDebug = null; + String enclosingOwner = null; + String enclosingName = null; + String enclosingDesc = null; + int anns = 0; + int ianns = 0; + int tanns = 0; + int itanns = 0; + int innerClasses = 0; + Attribute attributes = null; + + u = getAttributes(); + for (int i = readUnsignedShort(u); i > 0; --i) { + String attrName = readUTF8(u + 2, c); + // tests are sorted in decreasing frequency order + // (based on frequencies observed on typical classes) + if ("SourceFile".equals(attrName)) { + sourceFile = readUTF8(u + 8, c); + } else if ("InnerClasses".equals(attrName)) { + innerClasses = u + 8; + } else if ("EnclosingMethod".equals(attrName)) { + enclosingOwner = readClass(u + 8, c); + int item = readUnsignedShort(u + 10); + if (item != 0) { + enclosingName = readUTF8(items[item], c); + enclosingDesc = readUTF8(items[item] + 2, c); + } + } else if (SIGNATURES && "Signature".equals(attrName)) { + signature = readUTF8(u + 8, c); + } else if (ANNOTATIONS + && "RuntimeVisibleAnnotations".equals(attrName)) { + anns = u + 8; + } else if (ANNOTATIONS + && "RuntimeVisibleTypeAnnotations".equals(attrName)) { + tanns = u + 8; + } else if ("Deprecated".equals(attrName)) { + access |= Opcodes.ACC_DEPRECATED; + } else if ("Synthetic".equals(attrName)) { + access |= Opcodes.ACC_SYNTHETIC + | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE; + } else if ("SourceDebugExtension".equals(attrName)) { + int len = readInt(u + 4); + sourceDebug = readUTF(u + 8, len, new char[len]); + } else if (ANNOTATIONS + && "RuntimeInvisibleAnnotations".equals(attrName)) { + ianns = u + 8; + } else if (ANNOTATIONS + && "RuntimeInvisibleTypeAnnotations".equals(attrName)) { + itanns = u + 8; + } else if ("BootstrapMethods".equals(attrName)) { + int[] bootstrapMethods = new int[readUnsignedShort(u + 8)]; + for (int j = 0, v = u + 10; j < bootstrapMethods.length; j++) { + bootstrapMethods[j] = v; + v += 2 + readUnsignedShort(v + 2) << 1; + } + context.bootstrapMethods = bootstrapMethods; + } else { + Attribute attr = readAttribute(attrs, attrName, u + 8, + readInt(u + 4), c, -1, null); + if (attr != null) { + attr.next = attributes; + attributes = attr; + } + } + u += 6 + readInt(u + 4); + } + + // visits the class declaration + classVisitor.visit(readInt(items[1] - 7), access, name, signature, + superClass, interfaces); + + // visits the source and debug info + if ((flags & SKIP_DEBUG) == 0 + && (sourceFile != null || sourceDebug != null)) { + classVisitor.visitSource(sourceFile, sourceDebug); + } + + // visits the outer class + if (enclosingOwner != null) { + classVisitor.visitOuterClass(enclosingOwner, enclosingName, + enclosingDesc); + } + + // visits the class annotations and type annotations + if (ANNOTATIONS && anns != 0) { + for (int i = readUnsignedShort(anns), v = anns + 2; i > 0; --i) { + v = readAnnotationValues(v + 2, c, true, + classVisitor.visitAnnotation(readUTF8(v, c), true)); + } + } + if (ANNOTATIONS && ianns != 0) { + for (int i = readUnsignedShort(ianns), v = ianns + 2; i > 0; --i) { + v = readAnnotationValues(v + 2, c, true, + classVisitor.visitAnnotation(readUTF8(v, c), false)); + } + } + if (ANNOTATIONS && tanns != 0) { + for (int i = readUnsignedShort(tanns), v = tanns + 2; i > 0; --i) { + v = readAnnotationTarget(context, v); + v = readAnnotationValues(v + 2, c, true, + classVisitor.visitTypeAnnotation(context.typeRef, + context.typePath, readUTF8(v, c), true)); + } + } + if (ANNOTATIONS && itanns != 0) { + for (int i = readUnsignedShort(itanns), v = itanns + 2; i > 0; --i) { + v = readAnnotationTarget(context, v); + v = readAnnotationValues(v + 2, c, true, + classVisitor.visitTypeAnnotation(context.typeRef, + context.typePath, readUTF8(v, c), false)); + } + } + + // visits the attributes + while (attributes != null) { + Attribute attr = attributes.next; + attributes.next = null; + classVisitor.visitAttribute(attributes); + attributes = attr; + } + + // visits the inner classes + if (innerClasses != 0) { + int v = innerClasses + 2; + for (int i = readUnsignedShort(innerClasses); i > 0; --i) { + classVisitor.visitInnerClass(readClass(v, c), + readClass(v + 2, c), readUTF8(v + 4, c), + readUnsignedShort(v + 6)); + v += 8; + } + } + + // visits the fields and methods + u = header + 10 + 2 * interfaces.length; + for (int i = readUnsignedShort(u - 2); i > 0; --i) { + u = readField(classVisitor, context, u); + } + u += 2; + for (int i = readUnsignedShort(u - 2); i > 0; --i) { + u = readMethod(classVisitor, context, u); + } + + // visits the end of the class + classVisitor.visitEnd(); + } + + /** + * Reads a field and makes the given visitor visit it. + * + * @param classVisitor + * the visitor that must visit the field. + * @param context + * information about the class being parsed. + * @param u + * the start offset of the field in the class file. + * @return the offset of the first byte following the field in the class. + */ + private int readField(final ClassVisitor classVisitor, + final Context context, int u) { + // reads the field declaration + char[] c = context.buffer; + int access = readUnsignedShort(u); + String name = readUTF8(u + 2, c); + String desc = readUTF8(u + 4, c); + u += 6; + + // reads the field attributes + String signature = null; + int anns = 0; + int ianns = 0; + int tanns = 0; + int itanns = 0; + Object value = null; + Attribute attributes = null; + + for (int i = readUnsignedShort(u); i > 0; --i) { + String attrName = readUTF8(u + 2, c); + // tests are sorted in decreasing frequency order + // (based on frequencies observed on typical classes) + if ("ConstantValue".equals(attrName)) { + int item = readUnsignedShort(u + 8); + value = item == 0 ? null : readConst(item, c); + } else if (SIGNATURES && "Signature".equals(attrName)) { + signature = readUTF8(u + 8, c); + } else if ("Deprecated".equals(attrName)) { + access |= Opcodes.ACC_DEPRECATED; + } else if ("Synthetic".equals(attrName)) { + access |= Opcodes.ACC_SYNTHETIC + | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE; + } else if (ANNOTATIONS + && "RuntimeVisibleAnnotations".equals(attrName)) { + anns = u + 8; + } else if (ANNOTATIONS + && "RuntimeVisibleTypeAnnotations".equals(attrName)) { + tanns = u + 8; + } else if (ANNOTATIONS + && "RuntimeInvisibleAnnotations".equals(attrName)) { + ianns = u + 8; + } else if (ANNOTATIONS + && "RuntimeInvisibleTypeAnnotations".equals(attrName)) { + itanns = u + 8; + } else { + Attribute attr = readAttribute(context.attrs, attrName, u + 8, + readInt(u + 4), c, -1, null); + if (attr != null) { + attr.next = attributes; + attributes = attr; + } + } + u += 6 + readInt(u + 4); + } + u += 2; + + // visits the field declaration + FieldVisitor fv = classVisitor.visitField(access, name, desc, + signature, value); + if (fv == null) { + return u; + } + + // visits the field annotations and type annotations + if (ANNOTATIONS && anns != 0) { + for (int i = readUnsignedShort(anns), v = anns + 2; i > 0; --i) { + v = readAnnotationValues(v + 2, c, true, + fv.visitAnnotation(readUTF8(v, c), true)); + } + } + if (ANNOTATIONS && ianns != 0) { + for (int i = readUnsignedShort(ianns), v = ianns + 2; i > 0; --i) { + v = readAnnotationValues(v + 2, c, true, + fv.visitAnnotation(readUTF8(v, c), false)); + } + } + if (ANNOTATIONS && tanns != 0) { + for (int i = readUnsignedShort(tanns), v = tanns + 2; i > 0; --i) { + v = readAnnotationTarget(context, v); + v = readAnnotationValues(v + 2, c, true, + fv.visitTypeAnnotation(context.typeRef, + context.typePath, readUTF8(v, c), true)); + } + } + if (ANNOTATIONS && itanns != 0) { + for (int i = readUnsignedShort(itanns), v = itanns + 2; i > 0; --i) { + v = readAnnotationTarget(context, v); + v = readAnnotationValues(v + 2, c, true, + fv.visitTypeAnnotation(context.typeRef, + context.typePath, readUTF8(v, c), false)); + } + } + + // visits the field attributes + while (attributes != null) { + Attribute attr = attributes.next; + attributes.next = null; + fv.visitAttribute(attributes); + attributes = attr; + } + + // visits the end of the field + fv.visitEnd(); + + return u; + } + + /** + * Reads a method and makes the given visitor visit it. + * + * @param classVisitor + * the visitor that must visit the method. + * @param context + * information about the class being parsed. + * @param u + * the start offset of the method in the class file. + * @return the offset of the first byte following the method in the class. + */ + private int readMethod(final ClassVisitor classVisitor, + final Context context, int u) { + // reads the method declaration + char[] c = context.buffer; + context.access = readUnsignedShort(u); + context.name = readUTF8(u + 2, c); + context.desc = readUTF8(u + 4, c); + u += 6; + + // reads the method attributes + int code = 0; + int exception = 0; + String[] exceptions = null; + String signature = null; + int methodParameters = 0; + int anns = 0; + int ianns = 0; + int tanns = 0; + int itanns = 0; + int dann = 0; + int mpanns = 0; + int impanns = 0; + int firstAttribute = u; + Attribute attributes = null; + + for (int i = readUnsignedShort(u); i > 0; --i) { + String attrName = readUTF8(u + 2, c); + // tests are sorted in decreasing frequency order + // (based on frequencies observed on typical classes) + if ("Code".equals(attrName)) { + if ((context.flags & SKIP_CODE) == 0) { + code = u + 8; + } + } else if ("Exceptions".equals(attrName)) { + exceptions = new String[readUnsignedShort(u + 8)]; + exception = u + 10; + for (int j = 0; j < exceptions.length; ++j) { + exceptions[j] = readClass(exception, c); + exception += 2; + } + } else if (SIGNATURES && "Signature".equals(attrName)) { + signature = readUTF8(u + 8, c); + } else if ("Deprecated".equals(attrName)) { + context.access |= Opcodes.ACC_DEPRECATED; + } else if (ANNOTATIONS + && "RuntimeVisibleAnnotations".equals(attrName)) { + anns = u + 8; + } else if (ANNOTATIONS + && "RuntimeVisibleTypeAnnotations".equals(attrName)) { + tanns = u + 8; + } else if (ANNOTATIONS && "AnnotationDefault".equals(attrName)) { + dann = u + 8; + } else if ("Synthetic".equals(attrName)) { + context.access |= Opcodes.ACC_SYNTHETIC + | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE; + } else if (ANNOTATIONS + && "RuntimeInvisibleAnnotations".equals(attrName)) { + ianns = u + 8; + } else if (ANNOTATIONS + && "RuntimeInvisibleTypeAnnotations".equals(attrName)) { + itanns = u + 8; + } else if (ANNOTATIONS + && "RuntimeVisibleParameterAnnotations".equals(attrName)) { + mpanns = u + 8; + } else if (ANNOTATIONS + && "RuntimeInvisibleParameterAnnotations".equals(attrName)) { + impanns = u + 8; + } else if ("MethodParameters".equals(attrName)) { + methodParameters = u + 8; + } else { + Attribute attr = readAttribute(context.attrs, attrName, u + 8, + readInt(u + 4), c, -1, null); + if (attr != null) { + attr.next = attributes; + attributes = attr; + } + } + u += 6 + readInt(u + 4); + } + u += 2; + + // visits the method declaration + MethodVisitor mv = classVisitor.visitMethod(context.access, + context.name, context.desc, signature, exceptions); + if (mv == null) { + return u; + } + + /* + * if the returned MethodVisitor is in fact a MethodWriter, it means + * there is no method adapter between the reader and the writer. If, in + * addition, the writer's constant pool was copied from this reader + * (mw.cw.cr == this), and the signature and exceptions of the method + * have not been changed, then it is possible to skip all visit events + * and just copy the original code of the method to the writer (the + * access, name and descriptor can have been changed, this is not + * important since they are not copied as is from the reader). + */ + if (WRITER && mv instanceof MethodWriter) { + MethodWriter mw = (MethodWriter) mv; + if (mw.cw.cr == this && signature == mw.signature) { + boolean sameExceptions = false; + if (exceptions == null) { + sameExceptions = mw.exceptionCount == 0; + } else if (exceptions.length == mw.exceptionCount) { + sameExceptions = true; + for (int j = exceptions.length - 1; j >= 0; --j) { + exception -= 2; + if (mw.exceptions[j] != readUnsignedShort(exception)) { + sameExceptions = false; + break; + } + } + } + if (sameExceptions) { + /* + * we do not copy directly the code into MethodWriter to + * save a byte array copy operation. The real copy will be + * done in ClassWriter.toByteArray(). + */ + mw.classReaderOffset = firstAttribute; + mw.classReaderLength = u - firstAttribute; + return u; + } + } + } + + // visit the method parameters + if (methodParameters != 0) { + for (int i = b[methodParameters] & 0xFF, v = methodParameters + 1; i > 0; --i, v = v + 4) { + mv.visitParameter(readUTF8(v, c), readUnsignedShort(v + 2)); + } + } + + // visits the method annotations + if (ANNOTATIONS && dann != 0) { + AnnotationVisitor dv = mv.visitAnnotationDefault(); + readAnnotationValue(dann, c, null, dv); + if (dv != null) { + dv.visitEnd(); + } + } + if (ANNOTATIONS && anns != 0) { + for (int i = readUnsignedShort(anns), v = anns + 2; i > 0; --i) { + v = readAnnotationValues(v + 2, c, true, + mv.visitAnnotation(readUTF8(v, c), true)); + } + } + if (ANNOTATIONS && ianns != 0) { + for (int i = readUnsignedShort(ianns), v = ianns + 2; i > 0; --i) { + v = readAnnotationValues(v + 2, c, true, + mv.visitAnnotation(readUTF8(v, c), false)); + } + } + if (ANNOTATIONS && tanns != 0) { + for (int i = readUnsignedShort(tanns), v = tanns + 2; i > 0; --i) { + v = readAnnotationTarget(context, v); + v = readAnnotationValues(v + 2, c, true, + mv.visitTypeAnnotation(context.typeRef, + context.typePath, readUTF8(v, c), true)); + } + } + if (ANNOTATIONS && itanns != 0) { + for (int i = readUnsignedShort(itanns), v = itanns + 2; i > 0; --i) { + v = readAnnotationTarget(context, v); + v = readAnnotationValues(v + 2, c, true, + mv.visitTypeAnnotation(context.typeRef, + context.typePath, readUTF8(v, c), false)); + } + } + if (ANNOTATIONS && mpanns != 0) { + readParameterAnnotations(mv, context, mpanns, true); + } + if (ANNOTATIONS && impanns != 0) { + readParameterAnnotations(mv, context, impanns, false); + } + + // visits the method attributes + while (attributes != null) { + Attribute attr = attributes.next; + attributes.next = null; + mv.visitAttribute(attributes); + attributes = attr; + } + + // visits the method code + if (code != 0) { + mv.visitCode(); + readCode(mv, context, code); + } + + // visits the end of the method + mv.visitEnd(); + + return u; + } + + /** + * Reads the bytecode of a method and makes the given visitor visit it. + * + * @param mv + * the visitor that must visit the method's code. + * @param context + * information about the class being parsed. + * @param u + * the start offset of the code attribute in the class file. + */ + private void readCode(final MethodVisitor mv, final Context context, int u) { + // reads the header + byte[] b = this.b; + char[] c = context.buffer; + int maxStack = readUnsignedShort(u); + int maxLocals = readUnsignedShort(u + 2); + int codeLength = readInt(u + 4); + u += 8; + + // reads the bytecode to find the labels + int codeStart = u; + int codeEnd = u + codeLength; + Label[] labels = context.labels = new Label[codeLength + 2]; + readLabel(codeLength + 1, labels); + while (u < codeEnd) { + int offset = u - codeStart; + int opcode = b[u] & 0xFF; + switch (ClassWriter.TYPE[opcode]) { + case ClassWriter.NOARG_INSN: + case ClassWriter.IMPLVAR_INSN: + u += 1; + break; + case ClassWriter.LABEL_INSN: + readLabel(offset + readShort(u + 1), labels); + u += 3; + break; + case ClassWriter.LABELW_INSN: + readLabel(offset + readInt(u + 1), labels); + u += 5; + break; + case ClassWriter.WIDE_INSN: + opcode = b[u + 1] & 0xFF; + if (opcode == Opcodes.IINC) { + u += 6; + } else { + u += 4; + } + break; + case ClassWriter.TABL_INSN: + // skips 0 to 3 padding bytes + u = u + 4 - (offset & 3); + // reads instruction + readLabel(offset + readInt(u), labels); + for (int i = readInt(u + 8) - readInt(u + 4) + 1; i > 0; --i) { + readLabel(offset + readInt(u + 12), labels); + u += 4; + } + u += 12; + break; + case ClassWriter.LOOK_INSN: + // skips 0 to 3 padding bytes + u = u + 4 - (offset & 3); + // reads instruction + readLabel(offset + readInt(u), labels); + for (int i = readInt(u + 4); i > 0; --i) { + readLabel(offset + readInt(u + 12), labels); + u += 8; + } + u += 8; + break; + case ClassWriter.VAR_INSN: + case ClassWriter.SBYTE_INSN: + case ClassWriter.LDC_INSN: + u += 2; + break; + case ClassWriter.SHORT_INSN: + case ClassWriter.LDCW_INSN: + case ClassWriter.FIELDORMETH_INSN: + case ClassWriter.TYPE_INSN: + case ClassWriter.IINC_INSN: + u += 3; + break; + case ClassWriter.ITFMETH_INSN: + case ClassWriter.INDYMETH_INSN: + u += 5; + break; + // case MANA_INSN: + default: + u += 4; + break; + } + } + + // reads the try catch entries to find the labels, and also visits them + for (int i = readUnsignedShort(u); i > 0; --i) { + Label start = readLabel(readUnsignedShort(u + 2), labels); + Label end = readLabel(readUnsignedShort(u + 4), labels); + Label handler = readLabel(readUnsignedShort(u + 6), labels); + String type = readUTF8(items[readUnsignedShort(u + 8)], c); + mv.visitTryCatchBlock(start, end, handler, type); + u += 8; + } + u += 2; + + // reads the code attributes + int[] tanns = null; // start index of each visible type annotation + int[] itanns = null; // start index of each invisible type annotation + int tann = 0; // current index in tanns array + int itann = 0; // current index in itanns array + int ntoff = -1; // next visible type annotation code offset + int nitoff = -1; // next invisible type annotation code offset + int varTable = 0; + int varTypeTable = 0; + boolean zip = true; + boolean unzip = (context.flags & EXPAND_FRAMES) != 0; + int stackMap = 0; + int stackMapSize = 0; + int frameCount = 0; + Context frame = null; + Attribute attributes = null; + + for (int i = readUnsignedShort(u); i > 0; --i) { + String attrName = readUTF8(u + 2, c); + if ("LocalVariableTable".equals(attrName)) { + if ((context.flags & SKIP_DEBUG) == 0) { + varTable = u + 8; + for (int j = readUnsignedShort(u + 8), v = u; j > 0; --j) { + int label = readUnsignedShort(v + 10); + if (labels[label] == null) { + readLabel(label, labels).status |= Label.DEBUG; + } + label += readUnsignedShort(v + 12); + if (labels[label] == null) { + readLabel(label, labels).status |= Label.DEBUG; + } + v += 10; + } + } + } else if ("LocalVariableTypeTable".equals(attrName)) { + varTypeTable = u + 8; + } else if ("LineNumberTable".equals(attrName)) { + if ((context.flags & SKIP_DEBUG) == 0) { + for (int j = readUnsignedShort(u + 8), v = u; j > 0; --j) { + int label = readUnsignedShort(v + 10); + if (labels[label] == null) { + readLabel(label, labels).status |= Label.DEBUG; + } + Label l = labels[label]; + while (l.line > 0) { + if (l.next == null) { + l.next = new Label(); + } + l = l.next; + } + l.line = readUnsignedShort(v + 12); + v += 4; + } + } + } else if (ANNOTATIONS + && "RuntimeVisibleTypeAnnotations".equals(attrName)) { + tanns = readTypeAnnotations(mv, context, u + 8, true); + ntoff = tanns.length == 0 || readByte(tanns[0]) < 0x43 ? -1 + : readUnsignedShort(tanns[0] + 1); + } else if (ANNOTATIONS + && "RuntimeInvisibleTypeAnnotations".equals(attrName)) { + itanns = readTypeAnnotations(mv, context, u + 8, false); + nitoff = itanns.length == 0 || readByte(itanns[0]) < 0x43 ? -1 + : readUnsignedShort(itanns[0] + 1); + } else if (FRAMES && "StackMapTable".equals(attrName)) { + if ((context.flags & SKIP_FRAMES) == 0) { + stackMap = u + 10; + stackMapSize = readInt(u + 4); + frameCount = readUnsignedShort(u + 8); + } + /* + * here we do not extract the labels corresponding to the + * attribute content. This would require a full parsing of the + * attribute, which would need to be repeated in the second + * phase (see below). Instead the content of the attribute is + * read one frame at a time (i.e. after a frame has been + * visited, the next frame is read), and the labels it contains + * are also extracted one frame at a time. Thanks to the + * ordering of frames, having only a "one frame lookahead" is + * not a problem, i.e. it is not possible to see an offset + * smaller than the offset of the current insn and for which no + * Label exist. + */ + /* + * This is not true for UNINITIALIZED type offsets. We solve + * this by parsing the stack map table without a full decoding + * (see below). + */ + } else if (FRAMES && "StackMap".equals(attrName)) { + if ((context.flags & SKIP_FRAMES) == 0) { + zip = false; + stackMap = u + 10; + stackMapSize = readInt(u + 4); + frameCount = readUnsignedShort(u + 8); + } + /* + * IMPORTANT! here we assume that the frames are ordered, as in + * the StackMapTable attribute, although this is not guaranteed + * by the attribute format. + */ + } else { + for (int j = 0; j < context.attrs.length; ++j) { + if (context.attrs[j].type.equals(attrName)) { + Attribute attr = context.attrs[j].read(this, u + 8, + readInt(u + 4), c, codeStart - 8, labels); + if (attr != null) { + attr.next = attributes; + attributes = attr; + } + } + } + } + u += 6 + readInt(u + 4); + } + u += 2; + + // generates the first (implicit) stack map frame + if (FRAMES && stackMap != 0) { + /* + * for the first explicit frame the offset is not offset_delta + 1 + * but only offset_delta; setting the implicit frame offset to -1 + * allow the use of the "offset_delta + 1" rule in all cases + */ + frame = context; + frame.offset = -1; + frame.mode = 0; + frame.localCount = 0; + frame.localDiff = 0; + frame.stackCount = 0; + frame.local = new Object[maxLocals]; + frame.stack = new Object[maxStack]; + if (unzip) { + getImplicitFrame(context); + } + /* + * Finds labels for UNINITIALIZED frame types. Instead of decoding + * each element of the stack map table, we look for 3 consecutive + * bytes that "look like" an UNINITIALIZED type (tag 8, offset + * within code bounds, NEW instruction at this offset). We may find + * false positives (i.e. not real UNINITIALIZED types), but this + * should be rare, and the only consequence will be the creation of + * an unneeded label. This is better than creating a label for each + * NEW instruction, and faster than fully decoding the whole stack + * map table. + */ + for (int i = stackMap; i < stackMap + stackMapSize - 2; ++i) { + if (b[i] == 8) { // UNINITIALIZED FRAME TYPE + int v = readUnsignedShort(i + 1); + if (v >= 0 && v < codeLength) { + if ((b[codeStart + v] & 0xFF) == Opcodes.NEW) { + readLabel(v, labels); + } + } + } + } + } + + // visits the instructions + u = codeStart; + while (u < codeEnd) { + int offset = u - codeStart; + + // visits the label and line number for this offset, if any + Label l = labels[offset]; + if (l != null) { + Label next = l.next; + l.next = null; + mv.visitLabel(l); + if ((context.flags & SKIP_DEBUG) == 0 && l.line > 0) { + mv.visitLineNumber(l.line, l); + while (next != null) { + mv.visitLineNumber(next.line, l); + next = next.next; + } + } + } + + // visits the frame for this offset, if any + while (FRAMES && frame != null + && (frame.offset == offset || frame.offset == -1)) { + // if there is a frame for this offset, makes the visitor visit + // it, and reads the next frame if there is one. + if (frame.offset != -1) { + if (!zip || unzip) { + mv.visitFrame(Opcodes.F_NEW, frame.localCount, + frame.local, frame.stackCount, frame.stack); + } else { + mv.visitFrame(frame.mode, frame.localDiff, frame.local, + frame.stackCount, frame.stack); + } + } + if (frameCount > 0) { + stackMap = readFrame(stackMap, zip, unzip, frame); + --frameCount; + } else { + frame = null; + } + } + + // visits the instruction at this offset + int opcode = b[u] & 0xFF; + switch (ClassWriter.TYPE[opcode]) { + case ClassWriter.NOARG_INSN: + mv.visitInsn(opcode); + u += 1; + break; + case ClassWriter.IMPLVAR_INSN: + if (opcode > Opcodes.ISTORE) { + opcode -= 59; // ISTORE_0 + mv.visitVarInsn(Opcodes.ISTORE + (opcode >> 2), + opcode & 0x3); + } else { + opcode -= 26; // ILOAD_0 + mv.visitVarInsn(Opcodes.ILOAD + (opcode >> 2), opcode & 0x3); + } + u += 1; + break; + case ClassWriter.LABEL_INSN: + mv.visitJumpInsn(opcode, labels[offset + readShort(u + 1)]); + u += 3; + break; + case ClassWriter.LABELW_INSN: + mv.visitJumpInsn(opcode - 33, labels[offset + readInt(u + 1)]); + u += 5; + break; + case ClassWriter.WIDE_INSN: + opcode = b[u + 1] & 0xFF; + if (opcode == Opcodes.IINC) { + mv.visitIincInsn(readUnsignedShort(u + 2), readShort(u + 4)); + u += 6; + } else { + mv.visitVarInsn(opcode, readUnsignedShort(u + 2)); + u += 4; + } + break; + case ClassWriter.TABL_INSN: { + // skips 0 to 3 padding bytes + u = u + 4 - (offset & 3); + // reads instruction + int label = offset + readInt(u); + int min = readInt(u + 4); + int max = readInt(u + 8); + Label[] table = new Label[max - min + 1]; + u += 12; + for (int i = 0; i < table.length; ++i) { + table[i] = labels[offset + readInt(u)]; + u += 4; + } + mv.visitTableSwitchInsn(min, max, labels[label], table); + break; + } + case ClassWriter.LOOK_INSN: { + // skips 0 to 3 padding bytes + u = u + 4 - (offset & 3); + // reads instruction + int label = offset + readInt(u); + int len = readInt(u + 4); + int[] keys = new int[len]; + Label[] values = new Label[len]; + u += 8; + for (int i = 0; i < len; ++i) { + keys[i] = readInt(u); + values[i] = labels[offset + readInt(u + 4)]; + u += 8; + } + mv.visitLookupSwitchInsn(labels[label], keys, values); + break; + } + case ClassWriter.VAR_INSN: + mv.visitVarInsn(opcode, b[u + 1] & 0xFF); + u += 2; + break; + case ClassWriter.SBYTE_INSN: + mv.visitIntInsn(opcode, b[u + 1]); + u += 2; + break; + case ClassWriter.SHORT_INSN: + mv.visitIntInsn(opcode, readShort(u + 1)); + u += 3; + break; + case ClassWriter.LDC_INSN: + mv.visitLdcInsn(readConst(b[u + 1] & 0xFF, c)); + u += 2; + break; + case ClassWriter.LDCW_INSN: + mv.visitLdcInsn(readConst(readUnsignedShort(u + 1), c)); + u += 3; + break; + case ClassWriter.FIELDORMETH_INSN: + case ClassWriter.ITFMETH_INSN: { + int cpIndex = items[readUnsignedShort(u + 1)]; + boolean itf = b[cpIndex - 1] == ClassWriter.IMETH; + String iowner = readClass(cpIndex, c); + cpIndex = items[readUnsignedShort(cpIndex + 2)]; + String iname = readUTF8(cpIndex, c); + String idesc = readUTF8(cpIndex + 2, c); + if (opcode < Opcodes.INVOKEVIRTUAL) { + mv.visitFieldInsn(opcode, iowner, iname, idesc); + } else { + mv.visitMethodInsn(opcode, iowner, iname, idesc, itf); + } + if (opcode == Opcodes.INVOKEINTERFACE) { + u += 5; + } else { + u += 3; + } + break; + } + case ClassWriter.INDYMETH_INSN: { + int cpIndex = items[readUnsignedShort(u + 1)]; + int bsmIndex = context.bootstrapMethods[readUnsignedShort(cpIndex)]; + Handle bsm = (Handle) readConst(readUnsignedShort(bsmIndex), c); + int bsmArgCount = readUnsignedShort(bsmIndex + 2); + Object[] bsmArgs = new Object[bsmArgCount]; + bsmIndex += 4; + for (int i = 0; i < bsmArgCount; i++) { + bsmArgs[i] = readConst(readUnsignedShort(bsmIndex), c); + bsmIndex += 2; + } + cpIndex = items[readUnsignedShort(cpIndex + 2)]; + String iname = readUTF8(cpIndex, c); + String idesc = readUTF8(cpIndex + 2, c); + mv.visitInvokeDynamicInsn(iname, idesc, bsm, bsmArgs); + u += 5; + break; + } + case ClassWriter.TYPE_INSN: + mv.visitTypeInsn(opcode, readClass(u + 1, c)); + u += 3; + break; + case ClassWriter.IINC_INSN: + mv.visitIincInsn(b[u + 1] & 0xFF, b[u + 2]); + u += 3; + break; + // case MANA_INSN: + default: + mv.visitMultiANewArrayInsn(readClass(u + 1, c), b[u + 3] & 0xFF); + u += 4; + break; + } + + // visit the instruction annotations, if any + while (tanns != null && tann < tanns.length && ntoff <= offset) { + if (ntoff == offset) { + int v = readAnnotationTarget(context, tanns[tann]); + readAnnotationValues(v + 2, c, true, + mv.visitInsnAnnotation(context.typeRef, + context.typePath, readUTF8(v, c), true)); + } + ntoff = ++tann >= tanns.length || readByte(tanns[tann]) < 0x43 ? -1 + : readUnsignedShort(tanns[tann] + 1); + } + while (itanns != null && itann < itanns.length && nitoff <= offset) { + if (nitoff == offset) { + int v = readAnnotationTarget(context, itanns[itann]); + readAnnotationValues(v + 2, c, true, + mv.visitInsnAnnotation(context.typeRef, + context.typePath, readUTF8(v, c), false)); + } + nitoff = ++itann >= itanns.length + || readByte(itanns[itann]) < 0x43 ? -1 + : readUnsignedShort(itanns[itann] + 1); + } + } + if (labels[codeLength] != null) { + mv.visitLabel(labels[codeLength]); + } + + // visits the local variable tables + if ((context.flags & SKIP_DEBUG) == 0 && varTable != 0) { + int[] typeTable = null; + if (varTypeTable != 0) { + u = varTypeTable + 2; + typeTable = new int[readUnsignedShort(varTypeTable) * 3]; + for (int i = typeTable.length; i > 0;) { + typeTable[--i] = u + 6; // signature + typeTable[--i] = readUnsignedShort(u + 8); // index + typeTable[--i] = readUnsignedShort(u); // start + u += 10; + } + } + u = varTable + 2; + for (int i = readUnsignedShort(varTable); i > 0; --i) { + int start = readUnsignedShort(u); + int length = readUnsignedShort(u + 2); + int index = readUnsignedShort(u + 8); + String vsignature = null; + if (typeTable != null) { + for (int j = 0; j < typeTable.length; j += 3) { + if (typeTable[j] == start && typeTable[j + 1] == index) { + vsignature = readUTF8(typeTable[j + 2], c); + break; + } + } + } + mv.visitLocalVariable(readUTF8(u + 4, c), readUTF8(u + 6, c), + vsignature, labels[start], labels[start + length], + index); + u += 10; + } + } + + // visits the local variables type annotations + if (tanns != null) { + for (int i = 0; i < tanns.length; ++i) { + if ((readByte(tanns[i]) >> 1) == (0x40 >> 1)) { + int v = readAnnotationTarget(context, tanns[i]); + v = readAnnotationValues(v + 2, c, true, + mv.visitLocalVariableAnnotation(context.typeRef, + context.typePath, context.start, + context.end, context.index, readUTF8(v, c), + true)); + } + } + } + if (itanns != null) { + for (int i = 0; i < itanns.length; ++i) { + if ((readByte(itanns[i]) >> 1) == (0x40 >> 1)) { + int v = readAnnotationTarget(context, itanns[i]); + v = readAnnotationValues(v + 2, c, true, + mv.visitLocalVariableAnnotation(context.typeRef, + context.typePath, context.start, + context.end, context.index, readUTF8(v, c), + false)); + } + } + } + + // visits the code attributes + while (attributes != null) { + Attribute attr = attributes.next; + attributes.next = null; + mv.visitAttribute(attributes); + attributes = attr; + } + + // visits the max stack and max locals values + mv.visitMaxs(maxStack, maxLocals); + } + + /** + * Parses a type annotation table to find the labels, and to visit the try + * catch block annotations. + * + * @param u + * the start offset of a type annotation table. + * @param mv + * the method visitor to be used to visit the try catch block + * annotations. + * @param context + * information about the class being parsed. + * @param visible + * if the type annotation table to parse contains runtime visible + * annotations. + * @return the start offset of each type annotation in the parsed table. + */ + private int[] readTypeAnnotations(final MethodVisitor mv, + final Context context, int u, boolean visible) { + char[] c = context.buffer; + int[] offsets = new int[readUnsignedShort(u)]; + u += 2; + for (int i = 0; i < offsets.length; ++i) { + offsets[i] = u; + int target = readInt(u); + switch (target >>> 24) { + case 0x00: // CLASS_TYPE_PARAMETER + case 0x01: // METHOD_TYPE_PARAMETER + case 0x16: // METHOD_FORMAL_PARAMETER + u += 2; + break; + case 0x13: // FIELD + case 0x14: // METHOD_RETURN + case 0x15: // METHOD_RECEIVER + u += 1; + break; + case 0x40: // LOCAL_VARIABLE + case 0x41: // RESOURCE_VARIABLE + for (int j = readUnsignedShort(u + 1); j > 0; --j) { + int start = readUnsignedShort(u + 3); + int length = readUnsignedShort(u + 5); + readLabel(start, context.labels); + readLabel(start + length, context.labels); + u += 6; + } + u += 3; + break; + case 0x47: // CAST + case 0x48: // CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT + case 0x49: // METHOD_INVOCATION_TYPE_ARGUMENT + case 0x4A: // CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT + case 0x4B: // METHOD_REFERENCE_TYPE_ARGUMENT + u += 4; + break; + // case 0x10: // CLASS_EXTENDS + // case 0x11: // CLASS_TYPE_PARAMETER_BOUND + // case 0x12: // METHOD_TYPE_PARAMETER_BOUND + // case 0x17: // THROWS + // case 0x42: // EXCEPTION_PARAMETER + // case 0x43: // INSTANCEOF + // case 0x44: // NEW + // case 0x45: // CONSTRUCTOR_REFERENCE + // case 0x46: // METHOD_REFERENCE + default: + u += 3; + break; + } + int pathLength = readByte(u); + if ((target >>> 24) == 0x42) { + TypePath path = pathLength == 0 ? null : new TypePath(b, u); + u += 1 + 2 * pathLength; + u = readAnnotationValues(u + 2, c, true, + mv.visitTryCatchAnnotation(target, path, + readUTF8(u, c), visible)); + } else { + u = readAnnotationValues(u + 3 + 2 * pathLength, c, true, null); + } + } + return offsets; + } + + /** + * Parses the header of a type annotation to extract its target_type and + * target_path (the result is stored in the given context), and returns the + * start offset of the rest of the type_annotation structure (i.e. the + * offset to the type_index field, which is followed by + * num_element_value_pairs and then the name,value pairs). + * + * @param context + * information about the class being parsed. This is where the + * extracted target_type and target_path must be stored. + * @param u + * the start offset of a type_annotation structure. + * @return the start offset of the rest of the type_annotation structure. + */ + private int readAnnotationTarget(final Context context, int u) { + int target = readInt(u); + switch (target >>> 24) { + case 0x00: // CLASS_TYPE_PARAMETER + case 0x01: // METHOD_TYPE_PARAMETER + case 0x16: // METHOD_FORMAL_PARAMETER + target &= 0xFFFF0000; + u += 2; + break; + case 0x13: // FIELD + case 0x14: // METHOD_RETURN + case 0x15: // METHOD_RECEIVER + target &= 0xFF000000; + u += 1; + break; + case 0x40: // LOCAL_VARIABLE + case 0x41: { // RESOURCE_VARIABLE + target &= 0xFF000000; + int n = readUnsignedShort(u + 1); + context.start = new Label[n]; + context.end = new Label[n]; + context.index = new int[n]; + u += 3; + for (int i = 0; i < n; ++i) { + int start = readUnsignedShort(u); + int length = readUnsignedShort(u + 2); + context.start[i] = readLabel(start, context.labels); + context.end[i] = readLabel(start + length, context.labels); + context.index[i] = readUnsignedShort(u + 4); + u += 6; + } + break; + } + case 0x47: // CAST + case 0x48: // CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT + case 0x49: // METHOD_INVOCATION_TYPE_ARGUMENT + case 0x4A: // CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT + case 0x4B: // METHOD_REFERENCE_TYPE_ARGUMENT + target &= 0xFF0000FF; + u += 4; + break; + // case 0x10: // CLASS_EXTENDS + // case 0x11: // CLASS_TYPE_PARAMETER_BOUND + // case 0x12: // METHOD_TYPE_PARAMETER_BOUND + // case 0x17: // THROWS + // case 0x42: // EXCEPTION_PARAMETER + // case 0x43: // INSTANCEOF + // case 0x44: // NEW + // case 0x45: // CONSTRUCTOR_REFERENCE + // case 0x46: // METHOD_REFERENCE + default: + target &= (target >>> 24) < 0x43 ? 0xFFFFFF00 : 0xFF000000; + u += 3; + break; + } + int pathLength = readByte(u); + context.typeRef = target; + context.typePath = pathLength == 0 ? null : new TypePath(b, u); + return u + 1 + 2 * pathLength; + } + + /** + * Reads parameter annotations and makes the given visitor visit them. + * + * @param mv + * the visitor that must visit the annotations. + * @param context + * information about the class being parsed. + * @param v + * start offset in {@link #b b} of the annotations to be read. + * @param visible + * true if the annotations to be read are visible at + * runtime. + */ + private void readParameterAnnotations(final MethodVisitor mv, + final Context context, int v, final boolean visible) { + int i; + int n = b[v++] & 0xFF; + // workaround for a bug in javac (javac compiler generates a parameter + // annotation array whose size is equal to the number of parameters in + // the Java source file, while it should generate an array whose size is + // equal to the number of parameters in the method descriptor - which + // includes the synthetic parameters added by the compiler). This work- + // around supposes that the synthetic parameters are the first ones. + int synthetics = Type.getArgumentTypes(context.desc).length - n; + AnnotationVisitor av; + for (i = 0; i < synthetics; ++i) { + // virtual annotation to detect synthetic parameters in MethodWriter + av = mv.visitParameterAnnotation(i, "Ljava/lang/Synthetic;", false); + if (av != null) { + av.visitEnd(); + } + } + char[] c = context.buffer; + for (; i < n + synthetics; ++i) { + int j = readUnsignedShort(v); + v += 2; + for (; j > 0; --j) { + av = mv.visitParameterAnnotation(i, readUTF8(v, c), visible); + v = readAnnotationValues(v + 2, c, true, av); + } + } + } + + /** + * Reads the values of an annotation and makes the given visitor visit them. + * + * @param v + * the start offset in {@link #b b} of the values to be read + * (including the unsigned short that gives the number of + * values). + * @param buf + * buffer to be used to call {@link #readUTF8 readUTF8}, + * {@link #readClass(int,char[]) readClass} or {@link #readConst + * readConst}. + * @param named + * if the annotation values are named or not. + * @param av + * the visitor that must visit the values. + * @return the end offset of the annotation values. + */ + private int readAnnotationValues(int v, final char[] buf, + final boolean named, final AnnotationVisitor av) { + int i = readUnsignedShort(v); + v += 2; + if (named) { + for (; i > 0; --i) { + v = readAnnotationValue(v + 2, buf, readUTF8(v, buf), av); + } + } else { + for (; i > 0; --i) { + v = readAnnotationValue(v, buf, null, av); + } + } + if (av != null) { + av.visitEnd(); + } + return v; + } + + /** + * Reads a value of an annotation and makes the given visitor visit it. + * + * @param v + * the start offset in {@link #b b} of the value to be read + * (not including the value name constant pool index). + * @param buf + * buffer to be used to call {@link #readUTF8 readUTF8}, + * {@link #readClass(int,char[]) readClass} or {@link #readConst + * readConst}. + * @param name + * the name of the value to be read. + * @param av + * the visitor that must visit the value. + * @return the end offset of the annotation value. + */ + private int readAnnotationValue(int v, final char[] buf, final String name, + final AnnotationVisitor av) { + int i; + if (av == null) { + switch (b[v] & 0xFF) { + case 'e': // enum_const_value + return v + 5; + case '@': // annotation_value + return readAnnotationValues(v + 3, buf, true, null); + case '[': // array_value + return readAnnotationValues(v + 1, buf, false, null); + default: + return v + 3; + } + } + switch (b[v++] & 0xFF) { + case 'I': // pointer to CONSTANT_Integer + case 'J': // pointer to CONSTANT_Long + case 'F': // pointer to CONSTANT_Float + case 'D': // pointer to CONSTANT_Double + av.visit(name, readConst(readUnsignedShort(v), buf)); + v += 2; + break; + case 'B': // pointer to CONSTANT_Byte + av.visit(name, (byte) readInt(items[readUnsignedShort(v)])); + v += 2; + break; + case 'Z': // pointer to CONSTANT_Boolean + av.visit(name, + readInt(items[readUnsignedShort(v)]) == 0 ? Boolean.FALSE + : Boolean.TRUE); + v += 2; + break; + case 'S': // pointer to CONSTANT_Short + av.visit(name, (short) readInt(items[readUnsignedShort(v)])); + v += 2; + break; + case 'C': // pointer to CONSTANT_Char + av.visit(name, (char) readInt(items[readUnsignedShort(v)])); + v += 2; + break; + case 's': // pointer to CONSTANT_Utf8 + av.visit(name, readUTF8(v, buf)); + v += 2; + break; + case 'e': // enum_const_value + av.visitEnum(name, readUTF8(v, buf), readUTF8(v + 2, buf)); + v += 4; + break; + case 'c': // class_info + av.visit(name, Type.getType(readUTF8(v, buf))); + v += 2; + break; + case '@': // annotation_value + v = readAnnotationValues(v + 2, buf, true, + av.visitAnnotation(name, readUTF8(v, buf))); + break; + case '[': // array_value + int size = readUnsignedShort(v); + v += 2; + if (size == 0) { + return readAnnotationValues(v - 2, buf, false, + av.visitArray(name)); + } + switch (this.b[v++] & 0xFF) { + case 'B': + byte[] bv = new byte[size]; + for (i = 0; i < size; i++) { + bv[i] = (byte) readInt(items[readUnsignedShort(v)]); + v += 3; + } + av.visit(name, bv); + --v; + break; + case 'Z': + boolean[] zv = new boolean[size]; + for (i = 0; i < size; i++) { + zv[i] = readInt(items[readUnsignedShort(v)]) != 0; + v += 3; + } + av.visit(name, zv); + --v; + break; + case 'S': + short[] sv = new short[size]; + for (i = 0; i < size; i++) { + sv[i] = (short) readInt(items[readUnsignedShort(v)]); + v += 3; + } + av.visit(name, sv); + --v; + break; + case 'C': + char[] cv = new char[size]; + for (i = 0; i < size; i++) { + cv[i] = (char) readInt(items[readUnsignedShort(v)]); + v += 3; + } + av.visit(name, cv); + --v; + break; + case 'I': + int[] iv = new int[size]; + for (i = 0; i < size; i++) { + iv[i] = readInt(items[readUnsignedShort(v)]); + v += 3; + } + av.visit(name, iv); + --v; + break; + case 'J': + long[] lv = new long[size]; + for (i = 0; i < size; i++) { + lv[i] = readLong(items[readUnsignedShort(v)]); + v += 3; + } + av.visit(name, lv); + --v; + break; + case 'F': + float[] fv = new float[size]; + for (i = 0; i < size; i++) { + fv[i] = Float + .intBitsToFloat(readInt(items[readUnsignedShort(v)])); + v += 3; + } + av.visit(name, fv); + --v; + break; + case 'D': + double[] dv = new double[size]; + for (i = 0; i < size; i++) { + dv[i] = Double + .longBitsToDouble(readLong(items[readUnsignedShort(v)])); + v += 3; + } + av.visit(name, dv); + --v; + break; + default: + v = readAnnotationValues(v - 3, buf, false, av.visitArray(name)); + } + } + return v; + } + + /** + * Computes the implicit frame of the method currently being parsed (as + * defined in the given {@link Context}) and stores it in the given context. + * + * @param frame + * information about the class being parsed. + */ + private void getImplicitFrame(final Context frame) { + String desc = frame.desc; + Object[] locals = frame.local; + int local = 0; + if ((frame.access & Opcodes.ACC_STATIC) == 0) { + if ("".equals(frame.name)) { + locals[local++] = Opcodes.UNINITIALIZED_THIS; + } else { + locals[local++] = readClass(header + 2, frame.buffer); + } + } + int i = 1; + loop: while (true) { + int j = i; + switch (desc.charAt(i++)) { + case 'Z': + case 'C': + case 'B': + case 'S': + case 'I': + locals[local++] = Opcodes.INTEGER; + break; + case 'F': + locals[local++] = Opcodes.FLOAT; + break; + case 'J': + locals[local++] = Opcodes.LONG; + break; + case 'D': + locals[local++] = Opcodes.DOUBLE; + break; + case '[': + while (desc.charAt(i) == '[') { + ++i; + } + if (desc.charAt(i) == 'L') { + ++i; + while (desc.charAt(i) != ';') { + ++i; + } + } + locals[local++] = desc.substring(j, ++i); + break; + case 'L': + while (desc.charAt(i) != ';') { + ++i; + } + locals[local++] = desc.substring(j + 1, i++); + break; + default: + break loop; + } + } + frame.localCount = local; + } + + /** + * Reads a stack map frame and stores the result in the given + * {@link Context} object. + * + * @param stackMap + * the start offset of a stack map frame in the class file. + * @param zip + * if the stack map frame at stackMap is compressed or not. + * @param unzip + * if the stack map frame must be uncompressed. + * @param frame + * where the parsed stack map frame must be stored. + * @return the offset of the first byte following the parsed frame. + */ + private int readFrame(int stackMap, boolean zip, boolean unzip, + Context frame) { + char[] c = frame.buffer; + Label[] labels = frame.labels; + int tag; + int delta; + if (zip) { + tag = b[stackMap++] & 0xFF; + } else { + tag = MethodWriter.FULL_FRAME; + frame.offset = -1; + } + frame.localDiff = 0; + if (tag < MethodWriter.SAME_LOCALS_1_STACK_ITEM_FRAME) { + delta = tag; + frame.mode = Opcodes.F_SAME; + frame.stackCount = 0; + } else if (tag < MethodWriter.RESERVED) { + delta = tag - MethodWriter.SAME_LOCALS_1_STACK_ITEM_FRAME; + stackMap = readFrameType(frame.stack, 0, stackMap, c, labels); + frame.mode = Opcodes.F_SAME1; + frame.stackCount = 1; + } else { + delta = readUnsignedShort(stackMap); + stackMap += 2; + if (tag == MethodWriter.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) { + stackMap = readFrameType(frame.stack, 0, stackMap, c, labels); + frame.mode = Opcodes.F_SAME1; + frame.stackCount = 1; + } else if (tag >= MethodWriter.CHOP_FRAME + && tag < MethodWriter.SAME_FRAME_EXTENDED) { + frame.mode = Opcodes.F_CHOP; + frame.localDiff = MethodWriter.SAME_FRAME_EXTENDED - tag; + frame.localCount -= frame.localDiff; + frame.stackCount = 0; + } else if (tag == MethodWriter.SAME_FRAME_EXTENDED) { + frame.mode = Opcodes.F_SAME; + frame.stackCount = 0; + } else if (tag < MethodWriter.FULL_FRAME) { + int local = unzip ? frame.localCount : 0; + for (int i = tag - MethodWriter.SAME_FRAME_EXTENDED; i > 0; i--) { + stackMap = readFrameType(frame.local, local++, stackMap, c, + labels); + } + frame.mode = Opcodes.F_APPEND; + frame.localDiff = tag - MethodWriter.SAME_FRAME_EXTENDED; + frame.localCount += frame.localDiff; + frame.stackCount = 0; + } else { // if (tag == FULL_FRAME) { + frame.mode = Opcodes.F_FULL; + int n = readUnsignedShort(stackMap); + stackMap += 2; + frame.localDiff = n; + frame.localCount = n; + for (int local = 0; n > 0; n--) { + stackMap = readFrameType(frame.local, local++, stackMap, c, + labels); + } + n = readUnsignedShort(stackMap); + stackMap += 2; + frame.stackCount = n; + for (int stack = 0; n > 0; n--) { + stackMap = readFrameType(frame.stack, stack++, stackMap, c, + labels); + } + } + } + frame.offset += delta + 1; + readLabel(frame.offset, labels); + return stackMap; + } + + /** + * Reads a stack map frame type and stores it at the given index in the + * given array. + * + * @param frame + * the array where the parsed type must be stored. + * @param index + * the index in 'frame' where the parsed type must be stored. + * @param v + * the start offset of the stack map frame type to read. + * @param buf + * a buffer to read strings. + * @param labels + * the labels of the method currently being parsed, indexed by + * their offset. If the parsed type is an Uninitialized type, a + * new label for the corresponding NEW instruction is stored in + * this array if it does not already exist. + * @return the offset of the first byte after the parsed type. + */ + private int readFrameType(final Object[] frame, final int index, int v, + final char[] buf, final Label[] labels) { + int type = b[v++] & 0xFF; + switch (type) { + case 0: + frame[index] = Opcodes.TOP; + break; + case 1: + frame[index] = Opcodes.INTEGER; + break; + case 2: + frame[index] = Opcodes.FLOAT; + break; + case 3: + frame[index] = Opcodes.DOUBLE; + break; + case 4: + frame[index] = Opcodes.LONG; + break; + case 5: + frame[index] = Opcodes.NULL; + break; + case 6: + frame[index] = Opcodes.UNINITIALIZED_THIS; + break; + case 7: // Object + frame[index] = readClass(v, buf); + v += 2; + break; + default: // Uninitialized + frame[index] = readLabel(readUnsignedShort(v), labels); + v += 2; + } + return v; + } + + /** + * Returns the label corresponding to the given offset. The default + * implementation of this method creates a label for the given offset if it + * has not been already created. + * + * @param offset + * a bytecode offset in a method. + * @param labels + * the already created labels, indexed by their offset. If a + * label already exists for offset this method must not create a + * new one. Otherwise it must store the new label in this array. + * @return a non null Label, which must be equal to labels[offset]. + */ + protected Label readLabel(int offset, Label[] labels) { + if (labels[offset] == null) { + labels[offset] = new Label(); + } + return labels[offset]; + } + + /** + * Returns the start index of the attribute_info structure of this class. + * + * @return the start index of the attribute_info structure of this class. + */ + private int getAttributes() { + // skips the header + int u = header + 8 + readUnsignedShort(header + 6) * 2; + // skips fields and methods + for (int i = readUnsignedShort(u); i > 0; --i) { + for (int j = readUnsignedShort(u + 8); j > 0; --j) { + u += 6 + readInt(u + 12); + } + u += 8; + } + u += 2; + for (int i = readUnsignedShort(u); i > 0; --i) { + for (int j = readUnsignedShort(u + 8); j > 0; --j) { + u += 6 + readInt(u + 12); + } + u += 8; + } + // the attribute_info structure starts just after the methods + return u + 2; + } + + /** + * Reads an attribute in {@link #b b}. + * + * @param attrs + * prototypes of the attributes that must be parsed during the + * visit of the class. Any attribute whose type is not equal to + * the type of one the prototypes is ignored (i.e. an empty + * {@link Attribute} instance is returned). + * @param type + * the type of the attribute. + * @param off + * index of the first byte of the attribute's content in + * {@link #b b}. The 6 attribute header bytes, containing the + * type and the length of the attribute, are not taken into + * account here (they have already been read). + * @param len + * the length of the attribute's content. + * @param buf + * buffer to be used to call {@link #readUTF8 readUTF8}, + * {@link #readClass(int,char[]) readClass} or {@link #readConst + * readConst}. + * @param codeOff + * index of the first byte of code's attribute content in + * {@link #b b}, or -1 if the attribute to be read is not a code + * attribute. The 6 attribute header bytes, containing the type + * and the length of the attribute, are not taken into account + * here. + * @param labels + * the labels of the method's code, or null if the + * attribute to be read is not a code attribute. + * @return the attribute that has been read, or null to skip this + * attribute. + */ + private Attribute readAttribute(final Attribute[] attrs, final String type, + final int off, final int len, final char[] buf, final int codeOff, + final Label[] labels) { + for (int i = 0; i < attrs.length; ++i) { + if (attrs[i].type.equals(type)) { + return attrs[i].read(this, off, len, buf, codeOff, labels); + } + } + return new Attribute(type).read(this, off, len, null, -1, null); + } + + // ------------------------------------------------------------------------ + // Utility methods: low level parsing + // ------------------------------------------------------------------------ + + /** + * Returns the number of constant pool items in {@link #b b}. + * + * @return the number of constant pool items in {@link #b b}. + */ + public int getItemCount() { + return items.length; + } + + /** + * Returns the start index of the constant pool item in {@link #b b}, plus + * one. This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param item + * the index a constant pool item. + * @return the start index of the constant pool item in {@link #b b}, plus + * one. + */ + public int getItem(final int item) { + return items[item]; + } + + /** + * Returns the maximum length of the strings contained in the constant pool + * of the class. + * + * @return the maximum length of the strings contained in the constant pool + * of the class. + */ + public int getMaxStringLength() { + return maxStringLength; + } + + /** + * Reads a byte value in {@link #b b}. This method is intended for + * {@link Attribute} sub classes, and is normally not needed by class + * generators or adapters. + * + * @param index + * the start index of the value to be read in {@link #b b}. + * @return the read value. + */ + public int readByte(final int index) { + return b[index] & 0xFF; + } + + /** + * Reads an unsigned short value in {@link #b b}. This method is intended + * for {@link Attribute} sub classes, and is normally not needed by class + * generators or adapters. + * + * @param index + * the start index of the value to be read in {@link #b b}. + * @return the read value. + */ + public int readUnsignedShort(final int index) { + byte[] b = this.b; + return ((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF); + } + + /** + * Reads a signed short value in {@link #b b}. This method is intended + * for {@link Attribute} sub classes, and is normally not needed by class + * generators or adapters. + * + * @param index + * the start index of the value to be read in {@link #b b}. + * @return the read value. + */ + public short readShort(final int index) { + byte[] b = this.b; + return (short) (((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF)); + } + + /** + * Reads a signed int value in {@link #b b}. This method is intended for + * {@link Attribute} sub classes, and is normally not needed by class + * generators or adapters. + * + * @param index + * the start index of the value to be read in {@link #b b}. + * @return the read value. + */ + public int readInt(final int index) { + byte[] b = this.b; + return ((b[index] & 0xFF) << 24) | ((b[index + 1] & 0xFF) << 16) + | ((b[index + 2] & 0xFF) << 8) | (b[index + 3] & 0xFF); + } + + /** + * Reads a signed long value in {@link #b b}. This method is intended for + * {@link Attribute} sub classes, and is normally not needed by class + * generators or adapters. + * + * @param index + * the start index of the value to be read in {@link #b b}. + * @return the read value. + */ + public long readLong(final int index) { + long l1 = readInt(index); + long l0 = readInt(index + 4) & 0xFFFFFFFFL; + return (l1 << 32) | l0; + } + + /** + * Reads an UTF8 string constant pool item in {@link #b b}. This method + * is intended for {@link Attribute} sub classes, and is normally not needed + * by class generators or adapters. + * + * @param index + * the start index of an unsigned short value in {@link #b b}, + * whose value is the index of an UTF8 constant pool item. + * @param buf + * buffer to be used to read the item. This buffer must be + * sufficiently large. It is not automatically resized. + * @return the String corresponding to the specified UTF8 item. + */ + public String readUTF8(int index, final char[] buf) { + int item = readUnsignedShort(index); + if (index == 0 || item == 0) { + return null; + } + String s = strings[item]; + if (s != null) { + return s; + } + index = items[item]; + return strings[item] = readUTF(index + 2, readUnsignedShort(index), buf); + } + + /** + * Reads UTF8 string in {@link #b b}. + * + * @param index + * start offset of the UTF8 string to be read. + * @param utfLen + * length of the UTF8 string to be read. + * @param buf + * buffer to be used to read the string. This buffer must be + * sufficiently large. It is not automatically resized. + * @return the String corresponding to the specified UTF8 string. + */ + private String readUTF(int index, final int utfLen, final char[] buf) { + int endIndex = index + utfLen; + byte[] b = this.b; + int strLen = 0; + int c; + int st = 0; + char cc = 0; + while (index < endIndex) { + c = b[index++]; + switch (st) { + case 0: + c = c & 0xFF; + if (c < 0x80) { // 0xxxxxxx + buf[strLen++] = (char) c; + } else if (c < 0xE0 && c > 0xBF) { // 110x xxxx 10xx xxxx + cc = (char) (c & 0x1F); + st = 1; + } else { // 1110 xxxx 10xx xxxx 10xx xxxx + cc = (char) (c & 0x0F); + st = 2; + } + break; + + case 1: // byte 2 of 2-byte char or byte 3 of 3-byte char + buf[strLen++] = (char) ((cc << 6) | (c & 0x3F)); + st = 0; + break; + + case 2: // byte 2 of 3-byte char + cc = (char) ((cc << 6) | (c & 0x3F)); + st = 1; + break; + } + } + return new String(buf, 0, strLen); + } + + /** + * Reads a class constant pool item in {@link #b b}. This method is + * intended for {@link Attribute} sub classes, and is normally not needed by + * class generators or adapters. + * + * @param index + * the start index of an unsigned short value in {@link #b b}, + * whose value is the index of a class constant pool item. + * @param buf + * buffer to be used to read the item. This buffer must be + * sufficiently large. It is not automatically resized. + * @return the String corresponding to the specified class item. + */ + public String readClass(final int index, final char[] buf) { + // computes the start index of the CONSTANT_Class item in b + // and reads the CONSTANT_Utf8 item designated by + // the first two bytes of this CONSTANT_Class item + return readUTF8(items[readUnsignedShort(index)], buf); + } + + /** + * Reads a numeric or string constant pool item in {@link #b b}. This + * method is intended for {@link Attribute} sub classes, and is normally not + * needed by class generators or adapters. + * + * @param item + * the index of a constant pool item. + * @param buf + * buffer to be used to read the item. This buffer must be + * sufficiently large. It is not automatically resized. + * @return the {@link Integer}, {@link Float}, {@link Long}, {@link Double}, + * {@link String}, {@link Type} or {@link Handle} corresponding to + * the given constant pool item. + */ + public Object readConst(final int item, final char[] buf) { + int index = items[item]; + switch (b[index - 1]) { + case ClassWriter.INT: + return readInt(index); + case ClassWriter.FLOAT: + return Float.intBitsToFloat(readInt(index)); + case ClassWriter.LONG: + return readLong(index); + case ClassWriter.DOUBLE: + return Double.longBitsToDouble(readLong(index)); + case ClassWriter.CLASS: + return Type.getObjectType(readUTF8(index, buf)); + case ClassWriter.STR: + return readUTF8(index, buf); + case ClassWriter.MTYPE: + return Type.getMethodType(readUTF8(index, buf)); + default: // case ClassWriter.HANDLE_BASE + [1..9]: + int tag = readByte(index); + int[] items = this.items; + int cpIndex = items[readUnsignedShort(index + 1)]; + String owner = readClass(cpIndex, buf); + cpIndex = items[readUnsignedShort(cpIndex + 2)]; + String name = readUTF8(cpIndex, buf); + String desc = readUTF8(cpIndex + 2, buf); + return new Handle(tag, owner, name, desc); + } + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/ClassVisitor.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/ClassVisitor.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/ClassVisitor.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/ClassVisitor.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,320 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * A visitor to visit a Java class. The methods of this class must be called in + * the following order: visit [ visitSource ] [ + * visitOuterClass ] ( visitAnnotation | + * visitTypeAnnotation | visitAttribute )* ( + * visitInnerClass | visitField | visitMethod )* + * visitEnd. + * + * @author Eric Bruneton + */ +public abstract class ClassVisitor { + + /** + * The ASM API version implemented by this visitor. The value of this field + * must be one of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + */ + protected final int api; + + /** + * The class visitor to which this visitor must delegate method calls. May + * be null. + */ + protected ClassVisitor cv; + + /** + * Constructs a new {@link ClassVisitor}. + * + * @param api + * the ASM API version implemented by this visitor. Must be one + * of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + */ + public ClassVisitor(final int api) { + this(api, null); + } + + /** + * Constructs a new {@link ClassVisitor}. + * + * @param api + * the ASM API version implemented by this visitor. Must be one + * of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + * @param cv + * the class visitor to which this visitor must delegate method + * calls. May be null. + */ + public ClassVisitor(final int api, final ClassVisitor cv) { + if (api != Opcodes.ASM4 && api != Opcodes.ASM5) { + throw new IllegalArgumentException(); + } + this.api = api; + this.cv = cv; + } + + /** + * Visits the header of the class. + * + * @param version + * the class version. + * @param access + * the class's access flags (see {@link Opcodes}). This parameter + * also indicates if the class is deprecated. + * @param name + * the internal name of the class (see + * {@link Type#getInternalName() getInternalName}). + * @param signature + * the signature of this class. May be null if the class + * is not a generic one, and does not extend or implement generic + * classes or interfaces. + * @param superName + * the internal of name of the super class (see + * {@link Type#getInternalName() getInternalName}). For + * interfaces, the super class is {@link Object}. May be + * null, but only for the {@link Object} class. + * @param interfaces + * the internal names of the class's interfaces (see + * {@link Type#getInternalName() getInternalName}). May be + * null. + */ + public void visit(int version, int access, String name, String signature, + String superName, String[] interfaces) { + if (cv != null) { + cv.visit(version, access, name, signature, superName, interfaces); + } + } + + /** + * Visits the source of the class. + * + * @param source + * the name of the source file from which the class was compiled. + * May be null. + * @param debug + * additional debug information to compute the correspondance + * between source and compiled elements of the class. May be + * null. + */ + public void visitSource(String source, String debug) { + if (cv != null) { + cv.visitSource(source, debug); + } + } + + /** + * Visits the enclosing class of the class. This method must be called only + * if the class has an enclosing class. + * + * @param owner + * internal name of the enclosing class of the class. + * @param name + * the name of the method that contains the class, or + * null if the class is not enclosed in a method of its + * enclosing class. + * @param desc + * the descriptor of the method that contains the class, or + * null if the class is not enclosed in a method of its + * enclosing class. + */ + public void visitOuterClass(String owner, String name, String desc) { + if (cv != null) { + cv.visitOuterClass(owner, name, desc); + } + } + + /** + * Visits an annotation of the class. + * + * @param desc + * the class descriptor of the annotation class. + * @param visible + * true if the annotation is visible at runtime. + * @return a visitor to visit the annotation values, or null if + * this visitor is not interested in visiting this annotation. + */ + public AnnotationVisitor visitAnnotation(String desc, boolean visible) { + if (cv != null) { + return cv.visitAnnotation(desc, visible); + } + return null; + } + + /** + * Visits an annotation on a type in the class signature. + * + * @param typeRef + * a reference to the annotated type. The sort of this type + * reference must be {@link TypeReference#CLASS_TYPE_PARAMETER + * CLASS_TYPE_PARAMETER}, + * {@link TypeReference#CLASS_TYPE_PARAMETER_BOUND + * CLASS_TYPE_PARAMETER_BOUND} or + * {@link TypeReference#CLASS_EXTENDS CLASS_EXTENDS}. See + * {@link TypeReference}. + * @param typePath + * the path to the annotated type argument, wildcard bound, array + * element type, or static inner type within 'typeRef'. May be + * null if the annotation targets 'typeRef' as a whole. + * @param desc + * the class descriptor of the annotation class. + * @param visible + * true if the annotation is visible at runtime. + * @return a visitor to visit the annotation values, or null if + * this visitor is not interested in visiting this annotation. + */ + public AnnotationVisitor visitTypeAnnotation(int typeRef, + TypePath typePath, String desc, boolean visible) { + if (api < Opcodes.ASM5) { + throw new RuntimeException(); + } + if (cv != null) { + return cv.visitTypeAnnotation(typeRef, typePath, desc, visible); + } + return null; + } + + /** + * Visits a non standard attribute of the class. + * + * @param attr + * an attribute. + */ + public void visitAttribute(Attribute attr) { + if (cv != null) { + cv.visitAttribute(attr); + } + } + + /** + * Visits information about an inner class. This inner class is not + * necessarily a member of the class being visited. + * + * @param name + * the internal name of an inner class (see + * {@link Type#getInternalName() getInternalName}). + * @param outerName + * the internal name of the class to which the inner class + * belongs (see {@link Type#getInternalName() getInternalName}). + * May be null for not member classes. + * @param innerName + * the (simple) name of the inner class inside its enclosing + * class. May be null for anonymous inner classes. + * @param access + * the access flags of the inner class as originally declared in + * the enclosing class. + */ + public void visitInnerClass(String name, String outerName, + String innerName, int access) { + if (cv != null) { + cv.visitInnerClass(name, outerName, innerName, access); + } + } + + /** + * Visits a field of the class. + * + * @param access + * the field's access flags (see {@link Opcodes}). This parameter + * also indicates if the field is synthetic and/or deprecated. + * @param name + * the field's name. + * @param desc + * the field's descriptor (see {@link Type Type}). + * @param signature + * the field's signature. May be null if the field's + * type does not use generic types. + * @param value + * the field's initial value. This parameter, which may be + * null if the field does not have an initial value, + * must be an {@link Integer}, a {@link Float}, a {@link Long}, a + * {@link Double} or a {@link String} (for int, + * float, long or String fields + * respectively). This parameter is only used for static + * fields. Its value is ignored for non static fields, which + * must be initialized through bytecode instructions in + * constructors or methods. + * @return a visitor to visit field annotations and attributes, or + * null if this class visitor is not interested in visiting + * these annotations and attributes. + */ + public FieldVisitor visitField(int access, String name, String desc, + String signature, Object value) { + if (cv != null) { + return cv.visitField(access, name, desc, signature, value); + } + return null; + } + + /** + * Visits a method of the class. This method must return a new + * {@link MethodVisitor} instance (or null) each time it is called, + * i.e., it should not return a previously returned visitor. + * + * @param access + * the method's access flags (see {@link Opcodes}). This + * parameter also indicates if the method is synthetic and/or + * deprecated. + * @param name + * the method's name. + * @param desc + * the method's descriptor (see {@link Type Type}). + * @param signature + * the method's signature. May be null if the method + * parameters, return type and exceptions do not use generic + * types. + * @param exceptions + * the internal names of the method's exception classes (see + * {@link Type#getInternalName() getInternalName}). May be + * null. + * @return an object to visit the byte code of the method, or null + * if this class visitor is not interested in visiting the code of + * this method. + */ + public MethodVisitor visitMethod(int access, String name, String desc, + String signature, String[] exceptions) { + if (cv != null) { + return cv.visitMethod(access, name, desc, signature, exceptions); + } + return null; + } + + /** + * Visits the end of the class. This method, which is the last one to be + * called, is used to inform the visitor that all the fields and methods of + * the class have been visited. + */ + public void visitEnd() { + if (cv != null) { + cv.visitEnd(); + } + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/ClassWriter.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/ClassWriter.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/ClassWriter.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/ClassWriter.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,1776 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * A {@link ClassVisitor} that generates classes in bytecode form. More + * precisely this visitor generates a byte array conforming to the Java class + * file format. It can be used alone, to generate a Java class "from scratch", + * or with one or more {@link ClassReader ClassReader} and adapter class visitor + * to generate a modified class from one or more existing Java classes. + * + * @author Eric Bruneton + */ +public class ClassWriter extends ClassVisitor { + + /** + * Flag to automatically compute the maximum stack size and the maximum + * number of local variables of methods. If this flag is set, then the + * arguments of the {@link MethodVisitor#visitMaxs visitMaxs} method of the + * {@link MethodVisitor} returned by the {@link #visitMethod visitMethod} + * method will be ignored, and computed automatically from the signature and + * the bytecode of each method. + * + * @see #ClassWriter(int) + */ + public static final int COMPUTE_MAXS = 1; + + /** + * Flag to automatically compute the stack map frames of methods from + * scratch. If this flag is set, then the calls to the + * {@link MethodVisitor#visitFrame} method are ignored, and the stack map + * frames are recomputed from the methods bytecode. The arguments of the + * {@link MethodVisitor#visitMaxs visitMaxs} method are also ignored and + * recomputed from the bytecode. In other words, computeFrames implies + * computeMaxs. + * + * @see #ClassWriter(int) + */ + public static final int COMPUTE_FRAMES = 2; + + /** + * Pseudo access flag to distinguish between the synthetic attribute and the + * synthetic access flag. + */ + static final int ACC_SYNTHETIC_ATTRIBUTE = 0x40000; + + /** + * Factor to convert from ACC_SYNTHETIC_ATTRIBUTE to Opcode.ACC_SYNTHETIC. + */ + static final int TO_ACC_SYNTHETIC = ACC_SYNTHETIC_ATTRIBUTE + / Opcodes.ACC_SYNTHETIC; + + /** + * The type of instructions without any argument. + */ + static final int NOARG_INSN = 0; + + /** + * The type of instructions with an signed byte argument. + */ + static final int SBYTE_INSN = 1; + + /** + * The type of instructions with an signed short argument. + */ + static final int SHORT_INSN = 2; + + /** + * The type of instructions with a local variable index argument. + */ + static final int VAR_INSN = 3; + + /** + * The type of instructions with an implicit local variable index argument. + */ + static final int IMPLVAR_INSN = 4; + + /** + * The type of instructions with a type descriptor argument. + */ + static final int TYPE_INSN = 5; + + /** + * The type of field and method invocations instructions. + */ + static final int FIELDORMETH_INSN = 6; + + /** + * The type of the INVOKEINTERFACE/INVOKEDYNAMIC instruction. + */ + static final int ITFMETH_INSN = 7; + + /** + * The type of the INVOKEDYNAMIC instruction. + */ + static final int INDYMETH_INSN = 8; + + /** + * The type of instructions with a 2 bytes bytecode offset label. + */ + static final int LABEL_INSN = 9; + + /** + * The type of instructions with a 4 bytes bytecode offset label. + */ + static final int LABELW_INSN = 10; + + /** + * The type of the LDC instruction. + */ + static final int LDC_INSN = 11; + + /** + * The type of the LDC_W and LDC2_W instructions. + */ + static final int LDCW_INSN = 12; + + /** + * The type of the IINC instruction. + */ + static final int IINC_INSN = 13; + + /** + * The type of the TABLESWITCH instruction. + */ + static final int TABL_INSN = 14; + + /** + * The type of the LOOKUPSWITCH instruction. + */ + static final int LOOK_INSN = 15; + + /** + * The type of the MULTIANEWARRAY instruction. + */ + static final int MANA_INSN = 16; + + /** + * The type of the WIDE instruction. + */ + static final int WIDE_INSN = 17; + + /** + * The instruction types of all JVM opcodes. + */ + static final byte[] TYPE; + + /** + * The type of CONSTANT_Class constant pool items. + */ + static final int CLASS = 7; + + /** + * The type of CONSTANT_Fieldref constant pool items. + */ + static final int FIELD = 9; + + /** + * The type of CONSTANT_Methodref constant pool items. + */ + static final int METH = 10; + + /** + * The type of CONSTANT_InterfaceMethodref constant pool items. + */ + static final int IMETH = 11; + + /** + * The type of CONSTANT_String constant pool items. + */ + static final int STR = 8; + + /** + * The type of CONSTANT_Integer constant pool items. + */ + static final int INT = 3; + + /** + * The type of CONSTANT_Float constant pool items. + */ + static final int FLOAT = 4; + + /** + * The type of CONSTANT_Long constant pool items. + */ + static final int LONG = 5; + + /** + * The type of CONSTANT_Double constant pool items. + */ + static final int DOUBLE = 6; + + /** + * The type of CONSTANT_NameAndType constant pool items. + */ + static final int NAME_TYPE = 12; + + /** + * The type of CONSTANT_Utf8 constant pool items. + */ + static final int UTF8 = 1; + + /** + * The type of CONSTANT_MethodType constant pool items. + */ + static final int MTYPE = 16; + + /** + * The type of CONSTANT_MethodHandle constant pool items. + */ + static final int HANDLE = 15; + + /** + * The type of CONSTANT_InvokeDynamic constant pool items. + */ + static final int INDY = 18; + + /** + * The base value for all CONSTANT_MethodHandle constant pool items. + * Internally, ASM store the 9 variations of CONSTANT_MethodHandle into 9 + * different items. + */ + static final int HANDLE_BASE = 20; + + /** + * Normal type Item stored in the ClassWriter {@link ClassWriter#typeTable}, + * instead of the constant pool, in order to avoid clashes with normal + * constant pool items in the ClassWriter constant pool's hash table. + */ + static final int TYPE_NORMAL = 30; + + /** + * Uninitialized type Item stored in the ClassWriter + * {@link ClassWriter#typeTable}, instead of the constant pool, in order to + * avoid clashes with normal constant pool items in the ClassWriter constant + * pool's hash table. + */ + static final int TYPE_UNINIT = 31; + + /** + * Merged type Item stored in the ClassWriter {@link ClassWriter#typeTable}, + * instead of the constant pool, in order to avoid clashes with normal + * constant pool items in the ClassWriter constant pool's hash table. + */ + static final int TYPE_MERGED = 32; + + /** + * The type of BootstrapMethods items. These items are stored in a special + * class attribute named BootstrapMethods and not in the constant pool. + */ + static final int BSM = 33; + + /** + * The class reader from which this class writer was constructed, if any. + */ + ClassReader cr; + + /** + * Minor and major version numbers of the class to be generated. + */ + int version; + + /** + * Index of the next item to be added in the constant pool. + */ + int index; + + /** + * The constant pool of this class. + */ + final ByteVector pool; + + /** + * The constant pool's hash table data. + */ + Item[] items; + + /** + * The threshold of the constant pool's hash table. + */ + int threshold; + + /** + * A reusable key used to look for items in the {@link #items} hash table. + */ + final Item key; + + /** + * A reusable key used to look for items in the {@link #items} hash table. + */ + final Item key2; + + /** + * A reusable key used to look for items in the {@link #items} hash table. + */ + final Item key3; + + /** + * A reusable key used to look for items in the {@link #items} hash table. + */ + final Item key4; + + /** + * A type table used to temporarily store internal names that will not + * necessarily be stored in the constant pool. This type table is used by + * the control flow and data flow analysis algorithm used to compute stack + * map frames from scratch. This array associates to each index i + * the Item whose index is i. All Item objects stored in this array + * are also stored in the {@link #items} hash table. These two arrays allow + * to retrieve an Item from its index or, conversely, to get the index of an + * Item from its value. Each Item stores an internal name in its + * {@link Item#strVal1} field. + */ + Item[] typeTable; + + /** + * Number of elements in the {@link #typeTable} array. + */ + private short typeCount; + + /** + * The access flags of this class. + */ + private int access; + + /** + * The constant pool item that contains the internal name of this class. + */ + private int name; + + /** + * The internal name of this class. + */ + String thisName; + + /** + * The constant pool item that contains the signature of this class. + */ + private int signature; + + /** + * The constant pool item that contains the internal name of the super class + * of this class. + */ + private int superName; + + /** + * Number of interfaces implemented or extended by this class or interface. + */ + private int interfaceCount; + + /** + * The interfaces implemented or extended by this class or interface. More + * precisely, this array contains the indexes of the constant pool items + * that contain the internal names of these interfaces. + */ + private int[] interfaces; + + /** + * The index of the constant pool item that contains the name of the source + * file from which this class was compiled. + */ + private int sourceFile; + + /** + * The SourceDebug attribute of this class. + */ + private ByteVector sourceDebug; + + /** + * The constant pool item that contains the name of the enclosing class of + * this class. + */ + private int enclosingMethodOwner; + + /** + * The constant pool item that contains the name and descriptor of the + * enclosing method of this class. + */ + private int enclosingMethod; + + /** + * The runtime visible annotations of this class. + */ + private AnnotationWriter anns; + + /** + * The runtime invisible annotations of this class. + */ + private AnnotationWriter ianns; + + /** + * The runtime visible type annotations of this class. + */ + private AnnotationWriter tanns; + + /** + * The runtime invisible type annotations of this class. + */ + private AnnotationWriter itanns; + + /** + * The non standard attributes of this class. + */ + private Attribute attrs; + + /** + * The number of entries in the InnerClasses attribute. + */ + private int innerClassesCount; + + /** + * The InnerClasses attribute. + */ + private ByteVector innerClasses; + + /** + * The number of entries in the BootstrapMethods attribute. + */ + int bootstrapMethodsCount; + + /** + * The BootstrapMethods attribute. + */ + ByteVector bootstrapMethods; + + /** + * The fields of this class. These fields are stored in a linked list of + * {@link FieldWriter} objects, linked to each other by their + * {@link FieldWriter#fv} field. This field stores the first element of this + * list. + */ + FieldWriter firstField; + + /** + * The fields of this class. These fields are stored in a linked list of + * {@link FieldWriter} objects, linked to each other by their + * {@link FieldWriter#fv} field. This field stores the last element of this + * list. + */ + FieldWriter lastField; + + /** + * The methods of this class. These methods are stored in a linked list of + * {@link MethodWriter} objects, linked to each other by their + * {@link MethodWriter#mv} field. This field stores the first element of + * this list. + */ + MethodWriter firstMethod; + + /** + * The methods of this class. These methods are stored in a linked list of + * {@link MethodWriter} objects, linked to each other by their + * {@link MethodWriter#mv} field. This field stores the last element of this + * list. + */ + MethodWriter lastMethod; + + /** + * true if the maximum stack size and number of local variables + * must be automatically computed. + */ + private boolean computeMaxs; + + /** + * true if the stack map frames must be recomputed from scratch. + */ + private boolean computeFrames; + + /** + * true if the stack map tables of this class are invalid. The + * {@link MethodWriter#resizeInstructions} method cannot transform existing + * stack map tables, and so produces potentially invalid classes when it is + * executed. In this case the class is reread and rewritten with the + * {@link #COMPUTE_FRAMES} option (the resizeInstructions method can resize + * stack map tables when this option is used). + */ + boolean invalidFrames; + + // ------------------------------------------------------------------------ + // Static initializer + // ------------------------------------------------------------------------ + + /** + * Computes the instruction types of JVM opcodes. + */ + static { + int i; + byte[] b = new byte[220]; + String s = "AAAAAAAAAAAAAAAABCLMMDDDDDEEEEEEEEEEEEEEEEEEEEAAAAAAAADD" + + "DDDEEEEEEEEEEEEEEEEEEEEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + + "AAAAAAAAAAAAAAAAANAAAAAAAAAAAAAAAAAAAAJJJJJJJJJJJJJJJJDOPAA" + + "AAAAGGGGGGGHIFBFAAFFAARQJJKKJJJJJJJJJJJJJJJJJJ"; + for (i = 0; i < b.length; ++i) { + b[i] = (byte) (s.charAt(i) - 'A'); + } + TYPE = b; + + // code to generate the above string + // + // // SBYTE_INSN instructions + // b[Constants.NEWARRAY] = SBYTE_INSN; + // b[Constants.BIPUSH] = SBYTE_INSN; + // + // // SHORT_INSN instructions + // b[Constants.SIPUSH] = SHORT_INSN; + // + // // (IMPL)VAR_INSN instructions + // b[Constants.RET] = VAR_INSN; + // for (i = Constants.ILOAD; i <= Constants.ALOAD; ++i) { + // b[i] = VAR_INSN; + // } + // for (i = Constants.ISTORE; i <= Constants.ASTORE; ++i) { + // b[i] = VAR_INSN; + // } + // for (i = 26; i <= 45; ++i) { // ILOAD_0 to ALOAD_3 + // b[i] = IMPLVAR_INSN; + // } + // for (i = 59; i <= 78; ++i) { // ISTORE_0 to ASTORE_3 + // b[i] = IMPLVAR_INSN; + // } + // + // // TYPE_INSN instructions + // b[Constants.NEW] = TYPE_INSN; + // b[Constants.ANEWARRAY] = TYPE_INSN; + // b[Constants.CHECKCAST] = TYPE_INSN; + // b[Constants.INSTANCEOF] = TYPE_INSN; + // + // // (Set)FIELDORMETH_INSN instructions + // for (i = Constants.GETSTATIC; i <= Constants.INVOKESTATIC; ++i) { + // b[i] = FIELDORMETH_INSN; + // } + // b[Constants.INVOKEINTERFACE] = ITFMETH_INSN; + // b[Constants.INVOKEDYNAMIC] = INDYMETH_INSN; + // + // // LABEL(W)_INSN instructions + // for (i = Constants.IFEQ; i <= Constants.JSR; ++i) { + // b[i] = LABEL_INSN; + // } + // b[Constants.IFNULL] = LABEL_INSN; + // b[Constants.IFNONNULL] = LABEL_INSN; + // b[200] = LABELW_INSN; // GOTO_W + // b[201] = LABELW_INSN; // JSR_W + // // temporary opcodes used internally by ASM - see Label and + // MethodWriter + // for (i = 202; i < 220; ++i) { + // b[i] = LABEL_INSN; + // } + // + // // LDC(_W) instructions + // b[Constants.LDC] = LDC_INSN; + // b[19] = LDCW_INSN; // LDC_W + // b[20] = LDCW_INSN; // LDC2_W + // + // // special instructions + // b[Constants.IINC] = IINC_INSN; + // b[Constants.TABLESWITCH] = TABL_INSN; + // b[Constants.LOOKUPSWITCH] = LOOK_INSN; + // b[Constants.MULTIANEWARRAY] = MANA_INSN; + // b[196] = WIDE_INSN; // WIDE + // + // for (i = 0; i < b.length; ++i) { + // System.err.print((char)('A' + b[i])); + // } + // System.err.println(); + } + + // ------------------------------------------------------------------------ + // Constructor + // ------------------------------------------------------------------------ + + /** + * Constructs a new {@link ClassWriter} object. + * + * @param flags + * option flags that can be used to modify the default behavior + * of this class. See {@link #COMPUTE_MAXS}, + * {@link #COMPUTE_FRAMES}. + */ + public ClassWriter(final int flags) { + super(Opcodes.ASM5); + index = 1; + pool = new ByteVector(); + items = new Item[256]; + threshold = (int) (0.75d * items.length); + key = new Item(); + key2 = new Item(); + key3 = new Item(); + key4 = new Item(); + this.computeMaxs = (flags & COMPUTE_MAXS) != 0; + this.computeFrames = (flags & COMPUTE_FRAMES) != 0; + } + + /** + * Constructs a new {@link ClassWriter} object and enables optimizations for + * "mostly add" bytecode transformations. These optimizations are the + * following: + * + *
    + *
  • The constant pool from the original class is copied as is in the new + * class, which saves time. New constant pool entries will be added at the + * end if necessary, but unused constant pool entries won't be + * removed.
    • + *
  • Methods that are not transformed are copied as is in the new class, + * directly from the original class bytecode (i.e. without emitting visit + * events for all the method instructions), which saves a lot of + * time. Untransformed methods are detected by the fact that the + * {@link ClassReader} receives {@link MethodVisitor} objects that come from + * a {@link ClassWriter} (and not from any other {@link ClassVisitor} + * instance).
    • + *
+ * + * @param classReader + * the {@link ClassReader} used to read the original class. It + * will be used to copy the entire constant pool from the + * original class and also to copy other fragments of original + * bytecode where applicable. + * @param flags + * option flags that can be used to modify the default behavior + * of this class. These option flags do not affect methods + * that are copied as is in the new class. This means that the + * maximum stack size nor the stack frames will be computed for + * these methods. See {@link #COMPUTE_MAXS}, + * {@link #COMPUTE_FRAMES}. + */ + public ClassWriter(final ClassReader classReader, final int flags) { + this(flags); + classReader.copyPool(this); + this.cr = classReader; + } + + // ------------------------------------------------------------------------ + // Implementation of the ClassVisitor abstract class + // ------------------------------------------------------------------------ + + @Override + public final void visit(final int version, final int access, + final String name, final String signature, final String superName, + final String[] interfaces) { + this.version = version; + this.access = access; + this.name = newClass(name); + thisName = name; + if (ClassReader.SIGNATURES && signature != null) { + this.signature = newUTF8(signature); + } + this.superName = superName == null ? 0 : newClass(superName); + if (interfaces != null && interfaces.length > 0) { + interfaceCount = interfaces.length; + this.interfaces = new int[interfaceCount]; + for (int i = 0; i < interfaceCount; ++i) { + this.interfaces[i] = newClass(interfaces[i]); + } + } + } + + @Override + public final void visitSource(final String file, final String debug) { + if (file != null) { + sourceFile = newUTF8(file); + } + if (debug != null) { + sourceDebug = new ByteVector().encodeUTF8(debug, 0, + Integer.MAX_VALUE); + } + } + + @Override + public final void visitOuterClass(final String owner, final String name, + final String desc) { + enclosingMethodOwner = newClass(owner); + if (name != null && desc != null) { + enclosingMethod = newNameType(name, desc); + } + } + + @Override + public final AnnotationVisitor visitAnnotation(final String desc, + final boolean visible) { + if (!ClassReader.ANNOTATIONS) { + return null; + } + ByteVector bv = new ByteVector(); + // write type, and reserve space for values count + bv.putShort(newUTF8(desc)).putShort(0); + AnnotationWriter aw = new AnnotationWriter(this, true, bv, bv, 2); + if (visible) { + aw.next = anns; + anns = aw; + } else { + aw.next = ianns; + ianns = aw; + } + return aw; + } + + @Override + public final AnnotationVisitor visitTypeAnnotation(int typeRef, + TypePath typePath, final String desc, final boolean visible) { + if (!ClassReader.ANNOTATIONS) { + return null; + } + ByteVector bv = new ByteVector(); + // write target_type and target_info + AnnotationWriter.putTarget(typeRef, typePath, bv); + // write type, and reserve space for values count + bv.putShort(newUTF8(desc)).putShort(0); + AnnotationWriter aw = new AnnotationWriter(this, true, bv, bv, + bv.length - 2); + if (visible) { + aw.next = tanns; + tanns = aw; + } else { + aw.next = itanns; + itanns = aw; + } + return aw; + } + + @Override + public final void visitAttribute(final Attribute attr) { + attr.next = attrs; + attrs = attr; + } + + @Override + public final void visitInnerClass(final String name, + final String outerName, final String innerName, final int access) { + if (innerClasses == null) { + innerClasses = new ByteVector(); + } + // Sec. 4.7.6 of the JVMS states "Every CONSTANT_Class_info entry in the + // constant_pool table which represents a class or interface C that is + // not a package member must have exactly one corresponding entry in the + // classes array". To avoid duplicates we keep track in the intVal field + // of the Item of each CONSTANT_Class_info entry C whether an inner + // class entry has already been added for C (this field is unused for + // class entries, and changing its value does not change the hashcode + // and equality tests). If so we store the index of this inner class + // entry (plus one) in intVal. This hack allows duplicate detection in + // O(1) time. + Item nameItem = newClassItem(name); + if (nameItem.intVal == 0) { + ++innerClassesCount; + innerClasses.putShort(nameItem.index); + innerClasses.putShort(outerName == null ? 0 : newClass(outerName)); + innerClasses.putShort(innerName == null ? 0 : newUTF8(innerName)); + innerClasses.putShort(access); + nameItem.intVal = innerClassesCount; + } else { + // Compare the inner classes entry nameItem.intVal - 1 with the + // arguments of this method and throw an exception if there is a + // difference? + } + } + + @Override + public final FieldVisitor visitField(final int access, final String name, + final String desc, final String signature, final Object value) { + return new FieldWriter(this, access, name, desc, signature, value); + } + + @Override + public final MethodVisitor visitMethod(final int access, final String name, + final String desc, final String signature, final String[] exceptions) { + return new MethodWriter(this, access, name, desc, signature, + exceptions, computeMaxs, computeFrames); + } + + @Override + public final void visitEnd() { + } + + // ------------------------------------------------------------------------ + // Other public methods + // ------------------------------------------------------------------------ + + /** + * Returns the bytecode of the class that was build with this class writer. + * + * @return the bytecode of the class that was build with this class writer. + */ + public byte[] toByteArray() { + if (index > 0xFFFF) { + throw new RuntimeException("Class file too large!"); + } + // computes the real size of the bytecode of this class + int size = 24 + 2 * interfaceCount; + int nbFields = 0; + FieldWriter fb = firstField; + while (fb != null) { + ++nbFields; + size += fb.getSize(); + fb = (FieldWriter) fb.fv; + } + int nbMethods = 0; + MethodWriter mb = firstMethod; + while (mb != null) { + ++nbMethods; + size += mb.getSize(); + mb = (MethodWriter) mb.mv; + } + int attributeCount = 0; + if (bootstrapMethods != null) { + // we put it as first attribute in order to improve a bit + // ClassReader.copyBootstrapMethods + ++attributeCount; + size += 8 + bootstrapMethods.length; + newUTF8("BootstrapMethods"); + } + if (ClassReader.SIGNATURES && signature != 0) { + ++attributeCount; + size += 8; + newUTF8("Signature"); + } + if (sourceFile != 0) { + ++attributeCount; + size += 8; + newUTF8("SourceFile"); + } + if (sourceDebug != null) { + ++attributeCount; + size += sourceDebug.length + 6; + newUTF8("SourceDebugExtension"); + } + if (enclosingMethodOwner != 0) { + ++attributeCount; + size += 10; + newUTF8("EnclosingMethod"); + } + if ((access & Opcodes.ACC_DEPRECATED) != 0) { + ++attributeCount; + size += 6; + newUTF8("Deprecated"); + } + if ((access & Opcodes.ACC_SYNTHETIC) != 0) { + if ((version & 0xFFFF) < Opcodes.V1_5 + || (access & ACC_SYNTHETIC_ATTRIBUTE) != 0) { + ++attributeCount; + size += 6; + newUTF8("Synthetic"); + } + } + if (innerClasses != null) { + ++attributeCount; + size += 8 + innerClasses.length; + newUTF8("InnerClasses"); + } + if (ClassReader.ANNOTATIONS && anns != null) { + ++attributeCount; + size += 8 + anns.getSize(); + newUTF8("RuntimeVisibleAnnotations"); + } + if (ClassReader.ANNOTATIONS && ianns != null) { + ++attributeCount; + size += 8 + ianns.getSize(); + newUTF8("RuntimeInvisibleAnnotations"); + } + if (ClassReader.ANNOTATIONS && tanns != null) { + ++attributeCount; + size += 8 + tanns.getSize(); + newUTF8("RuntimeVisibleTypeAnnotations"); + } + if (ClassReader.ANNOTATIONS && itanns != null) { + ++attributeCount; + size += 8 + itanns.getSize(); + newUTF8("RuntimeInvisibleTypeAnnotations"); + } + if (attrs != null) { + attributeCount += attrs.getCount(); + size += attrs.getSize(this, null, 0, -1, -1); + } + size += pool.length; + // allocates a byte vector of this size, in order to avoid unnecessary + // arraycopy operations in the ByteVector.enlarge() method + ByteVector out = new ByteVector(size); + out.putInt(0xCAFEBABE).putInt(version); + out.putShort(index).putByteArray(pool.data, 0, pool.length); + int mask = Opcodes.ACC_DEPRECATED | ACC_SYNTHETIC_ATTRIBUTE + | ((access & ACC_SYNTHETIC_ATTRIBUTE) / TO_ACC_SYNTHETIC); + out.putShort(access & ~mask).putShort(name).putShort(superName); + out.putShort(interfaceCount); + for (int i = 0; i < interfaceCount; ++i) { + out.putShort(interfaces[i]); + } + out.putShort(nbFields); + fb = firstField; + while (fb != null) { + fb.put(out); + fb = (FieldWriter) fb.fv; + } + out.putShort(nbMethods); + mb = firstMethod; + while (mb != null) { + mb.put(out); + mb = (MethodWriter) mb.mv; + } + out.putShort(attributeCount); + if (bootstrapMethods != null) { + out.putShort(newUTF8("BootstrapMethods")); + out.putInt(bootstrapMethods.length + 2).putShort( + bootstrapMethodsCount); + out.putByteArray(bootstrapMethods.data, 0, bootstrapMethods.length); + } + if (ClassReader.SIGNATURES && signature != 0) { + out.putShort(newUTF8("Signature")).putInt(2).putShort(signature); + } + if (sourceFile != 0) { + out.putShort(newUTF8("SourceFile")).putInt(2).putShort(sourceFile); + } + if (sourceDebug != null) { + int len = sourceDebug.length; + out.putShort(newUTF8("SourceDebugExtension")).putInt(len); + out.putByteArray(sourceDebug.data, 0, len); + } + if (enclosingMethodOwner != 0) { + out.putShort(newUTF8("EnclosingMethod")).putInt(4); + out.putShort(enclosingMethodOwner).putShort(enclosingMethod); + } + if ((access & Opcodes.ACC_DEPRECATED) != 0) { + out.putShort(newUTF8("Deprecated")).putInt(0); + } + if ((access & Opcodes.ACC_SYNTHETIC) != 0) { + if ((version & 0xFFFF) < Opcodes.V1_5 + || (access & ACC_SYNTHETIC_ATTRIBUTE) != 0) { + out.putShort(newUTF8("Synthetic")).putInt(0); + } + } + if (innerClasses != null) { + out.putShort(newUTF8("InnerClasses")); + out.putInt(innerClasses.length + 2).putShort(innerClassesCount); + out.putByteArray(innerClasses.data, 0, innerClasses.length); + } + if (ClassReader.ANNOTATIONS && anns != null) { + out.putShort(newUTF8("RuntimeVisibleAnnotations")); + anns.put(out); + } + if (ClassReader.ANNOTATIONS && ianns != null) { + out.putShort(newUTF8("RuntimeInvisibleAnnotations")); + ianns.put(out); + } + if (ClassReader.ANNOTATIONS && tanns != null) { + out.putShort(newUTF8("RuntimeVisibleTypeAnnotations")); + tanns.put(out); + } + if (ClassReader.ANNOTATIONS && itanns != null) { + out.putShort(newUTF8("RuntimeInvisibleTypeAnnotations")); + itanns.put(out); + } + if (attrs != null) { + attrs.put(this, null, 0, -1, -1, out); + } + if (invalidFrames) { + anns = null; + ianns = null; + attrs = null; + innerClassesCount = 0; + innerClasses = null; + bootstrapMethodsCount = 0; + bootstrapMethods = null; + firstField = null; + lastField = null; + firstMethod = null; + lastMethod = null; + computeMaxs = false; + computeFrames = true; + invalidFrames = false; + new ClassReader(out.data).accept(this, ClassReader.SKIP_FRAMES); + return toByteArray(); + } + return out.data; + } + + // ------------------------------------------------------------------------ + // Utility methods: constant pool management + // ------------------------------------------------------------------------ + + /** + * Adds a number or string constant to the constant pool of the class being + * build. Does nothing if the constant pool already contains a similar item. + * + * @param cst + * the value of the constant to be added to the constant pool. + * This parameter must be an {@link Integer}, a {@link Float}, a + * {@link Long}, a {@link Double}, a {@link String} or a + * {@link Type}. + * @return a new or already existing constant item with the given value. + */ + Item newConstItem(final Object cst) { + if (cst instanceof Integer) { + int val = ((Integer) cst).intValue(); + return newInteger(val); + } else if (cst instanceof Byte) { + int val = ((Byte) cst).intValue(); + return newInteger(val); + } else if (cst instanceof Character) { + int val = ((Character) cst).charValue(); + return newInteger(val); + } else if (cst instanceof Short) { + int val = ((Short) cst).intValue(); + return newInteger(val); + } else if (cst instanceof Boolean) { + int val = ((Boolean) cst).booleanValue() ? 1 : 0; + return newInteger(val); + } else if (cst instanceof Float) { + float val = ((Float) cst).floatValue(); + return newFloat(val); + } else if (cst instanceof Long) { + long val = ((Long) cst).longValue(); + return newLong(val); + } else if (cst instanceof Double) { + double val = ((Double) cst).doubleValue(); + return newDouble(val); + } else if (cst instanceof String) { + return newString((String) cst); + } else if (cst instanceof Type) { + Type t = (Type) cst; + int s = t.getSort(); + if (s == Type.OBJECT) { + return newClassItem(t.getInternalName()); + } else if (s == Type.METHOD) { + return newMethodTypeItem(t.getDescriptor()); + } else { // s == primitive type or array + return newClassItem(t.getDescriptor()); + } + } else if (cst instanceof Handle) { + Handle h = (Handle) cst; + return newHandleItem(h.tag, h.owner, h.name, h.desc); + } else { + throw new IllegalArgumentException("value " + cst); + } + } + + /** + * Adds a number or string constant to the constant pool of the class being + * build. Does nothing if the constant pool already contains a similar item. + * This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param cst + * the value of the constant to be added to the constant pool. + * This parameter must be an {@link Integer}, a {@link Float}, a + * {@link Long}, a {@link Double} or a {@link String}. + * @return the index of a new or already existing constant item with the + * given value. + */ + public int newConst(final Object cst) { + return newConstItem(cst).index; + } + + /** + * Adds an UTF8 string to the constant pool of the class being build. Does + * nothing if the constant pool already contains a similar item. This + * method is intended for {@link Attribute} sub classes, and is normally not + * needed by class generators or adapters. + * + * @param value + * the String value. + * @return the index of a new or already existing UTF8 item. + */ + public int newUTF8(final String value) { + key.set(UTF8, value, null, null); + Item result = get(key); + if (result == null) { + pool.putByte(UTF8).putUTF8(value); + result = new Item(index++, key); + put(result); + } + return result.index; + } + + /** + * Adds a class reference to the constant pool of the class being build. + * Does nothing if the constant pool already contains a similar item. + * This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param value + * the internal name of the class. + * @return a new or already existing class reference item. + */ + Item newClassItem(final String value) { + key2.set(CLASS, value, null, null); + Item result = get(key2); + if (result == null) { + pool.put12(CLASS, newUTF8(value)); + result = new Item(index++, key2); + put(result); + } + return result; + } + + /** + * Adds a class reference to the constant pool of the class being build. + * Does nothing if the constant pool already contains a similar item. + * This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param value + * the internal name of the class. + * @return the index of a new or already existing class reference item. + */ + public int newClass(final String value) { + return newClassItem(value).index; + } + + /** + * Adds a method type reference to the constant pool of the class being + * build. Does nothing if the constant pool already contains a similar item. + * This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param methodDesc + * method descriptor of the method type. + * @return a new or already existing method type reference item. + */ + Item newMethodTypeItem(final String methodDesc) { + key2.set(MTYPE, methodDesc, null, null); + Item result = get(key2); + if (result == null) { + pool.put12(MTYPE, newUTF8(methodDesc)); + result = new Item(index++, key2); + put(result); + } + return result; + } + + /** + * Adds a method type reference to the constant pool of the class being + * build. Does nothing if the constant pool already contains a similar item. + * This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param methodDesc + * method descriptor of the method type. + * @return the index of a new or already existing method type reference + * item. + */ + public int newMethodType(final String methodDesc) { + return newMethodTypeItem(methodDesc).index; + } + + /** + * Adds a handle to the constant pool of the class being build. Does nothing + * if the constant pool already contains a similar item. This method is + * intended for {@link Attribute} sub classes, and is normally not needed by + * class generators or adapters. + * + * @param tag + * the kind of this handle. Must be {@link Opcodes#H_GETFIELD}, + * {@link Opcodes#H_GETSTATIC}, {@link Opcodes#H_PUTFIELD}, + * {@link Opcodes#H_PUTSTATIC}, {@link Opcodes#H_INVOKEVIRTUAL}, + * {@link Opcodes#H_INVOKESTATIC}, + * {@link Opcodes#H_INVOKESPECIAL}, + * {@link Opcodes#H_NEWINVOKESPECIAL} or + * {@link Opcodes#H_INVOKEINTERFACE}. + * @param owner + * the internal name of the field or method owner class. + * @param name + * the name of the field or method. + * @param desc + * the descriptor of the field or method. + * @return a new or an already existing method type reference item. + */ + Item newHandleItem(final int tag, final String owner, final String name, + final String desc) { + key4.set(HANDLE_BASE + tag, owner, name, desc); + Item result = get(key4); + if (result == null) { + if (tag <= Opcodes.H_PUTSTATIC) { + put112(HANDLE, tag, newField(owner, name, desc)); + } else { + put112(HANDLE, + tag, + newMethod(owner, name, desc, + tag == Opcodes.H_INVOKEINTERFACE)); + } + result = new Item(index++, key4); + put(result); + } + return result; + } + + /** + * Adds a handle to the constant pool of the class being build. Does nothing + * if the constant pool already contains a similar item. This method is + * intended for {@link Attribute} sub classes, and is normally not needed by + * class generators or adapters. + * + * @param tag + * the kind of this handle. Must be {@link Opcodes#H_GETFIELD}, + * {@link Opcodes#H_GETSTATIC}, {@link Opcodes#H_PUTFIELD}, + * {@link Opcodes#H_PUTSTATIC}, {@link Opcodes#H_INVOKEVIRTUAL}, + * {@link Opcodes#H_INVOKESTATIC}, + * {@link Opcodes#H_INVOKESPECIAL}, + * {@link Opcodes#H_NEWINVOKESPECIAL} or + * {@link Opcodes#H_INVOKEINTERFACE}. + * @param owner + * the internal name of the field or method owner class. + * @param name + * the name of the field or method. + * @param desc + * the descriptor of the field or method. + * @return the index of a new or already existing method type reference + * item. + */ + public int newHandle(final int tag, final String owner, final String name, + final String desc) { + return newHandleItem(tag, owner, name, desc).index; + } + + /** + * Adds an invokedynamic reference to the constant pool of the class being + * build. Does nothing if the constant pool already contains a similar item. + * This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param name + * name of the invoked method. + * @param desc + * descriptor of the invoke method. + * @param bsm + * the bootstrap method. + * @param bsmArgs + * the bootstrap method constant arguments. + * + * @return a new or an already existing invokedynamic type reference item. + */ + Item newInvokeDynamicItem(final String name, final String desc, + final Handle bsm, final Object... bsmArgs) { + // cache for performance + ByteVector bootstrapMethods = this.bootstrapMethods; + if (bootstrapMethods == null) { + bootstrapMethods = this.bootstrapMethods = new ByteVector(); + } + + int position = bootstrapMethods.length; // record current position + + int hashCode = bsm.hashCode(); + bootstrapMethods.putShort(newHandle(bsm.tag, bsm.owner, bsm.name, + bsm.desc)); + + int argsLength = bsmArgs.length; + bootstrapMethods.putShort(argsLength); + + for (int i = 0; i < argsLength; i++) { + Object bsmArg = bsmArgs[i]; + hashCode ^= bsmArg.hashCode(); + bootstrapMethods.putShort(newConst(bsmArg)); + } + + byte[] data = bootstrapMethods.data; + int length = (1 + 1 + argsLength) << 1; // (bsm + argCount + arguments) + hashCode &= 0x7FFFFFFF; + Item result = items[hashCode % items.length]; + loop: while (result != null) { + if (result.type != BSM || result.hashCode != hashCode) { + result = result.next; + continue; + } + + // because the data encode the size of the argument + // we don't need to test if these size are equals + int resultPosition = result.intVal; + for (int p = 0; p < length; p++) { + if (data[position + p] != data[resultPosition + p]) { + result = result.next; + continue loop; + } + } + break; + } + + int bootstrapMethodIndex; + if (result != null) { + bootstrapMethodIndex = result.index; + bootstrapMethods.length = position; // revert to old position + } else { + bootstrapMethodIndex = bootstrapMethodsCount++; + result = new Item(bootstrapMethodIndex); + result.set(position, hashCode); + put(result); + } + + // now, create the InvokeDynamic constant + key3.set(name, desc, bootstrapMethodIndex); + result = get(key3); + if (result == null) { + put122(INDY, bootstrapMethodIndex, newNameType(name, desc)); + result = new Item(index++, key3); + put(result); + } + return result; + } + + /** + * Adds an invokedynamic reference to the constant pool of the class being + * build. Does nothing if the constant pool already contains a similar item. + * This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param name + * name of the invoked method. + * @param desc + * descriptor of the invoke method. + * @param bsm + * the bootstrap method. + * @param bsmArgs + * the bootstrap method constant arguments. + * + * @return the index of a new or already existing invokedynamic reference + * item. + */ + public int newInvokeDynamic(final String name, final String desc, + final Handle bsm, final Object... bsmArgs) { + return newInvokeDynamicItem(name, desc, bsm, bsmArgs).index; + } + + /** + * Adds a field reference to the constant pool of the class being build. + * Does nothing if the constant pool already contains a similar item. + * + * @param owner + * the internal name of the field's owner class. + * @param name + * the field's name. + * @param desc + * the field's descriptor. + * @return a new or already existing field reference item. + */ + Item newFieldItem(final String owner, final String name, final String desc) { + key3.set(FIELD, owner, name, desc); + Item result = get(key3); + if (result == null) { + put122(FIELD, newClass(owner), newNameType(name, desc)); + result = new Item(index++, key3); + put(result); + } + return result; + } + + /** + * Adds a field reference to the constant pool of the class being build. + * Does nothing if the constant pool already contains a similar item. + * This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param owner + * the internal name of the field's owner class. + * @param name + * the field's name. + * @param desc + * the field's descriptor. + * @return the index of a new or already existing field reference item. + */ + public int newField(final String owner, final String name, final String desc) { + return newFieldItem(owner, name, desc).index; + } + + /** + * Adds a method reference to the constant pool of the class being build. + * Does nothing if the constant pool already contains a similar item. + * + * @param owner + * the internal name of the method's owner class. + * @param name + * the method's name. + * @param desc + * the method's descriptor. + * @param itf + * true if owner is an interface. + * @return a new or already existing method reference item. + */ + Item newMethodItem(final String owner, final String name, + final String desc, final boolean itf) { + int type = itf ? IMETH : METH; + key3.set(type, owner, name, desc); + Item result = get(key3); + if (result == null) { + put122(type, newClass(owner), newNameType(name, desc)); + result = new Item(index++, key3); + put(result); + } + return result; + } + + /** + * Adds a method reference to the constant pool of the class being build. + * Does nothing if the constant pool already contains a similar item. + * This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param owner + * the internal name of the method's owner class. + * @param name + * the method's name. + * @param desc + * the method's descriptor. + * @param itf + * true if owner is an interface. + * @return the index of a new or already existing method reference item. + */ + public int newMethod(final String owner, final String name, + final String desc, final boolean itf) { + return newMethodItem(owner, name, desc, itf).index; + } + + /** + * Adds an integer to the constant pool of the class being build. Does + * nothing if the constant pool already contains a similar item. + * + * @param value + * the int value. + * @return a new or already existing int item. + */ + Item newInteger(final int value) { + key.set(value); + Item result = get(key); + if (result == null) { + pool.putByte(INT).putInt(value); + result = new Item(index++, key); + put(result); + } + return result; + } + + /** + * Adds a float to the constant pool of the class being build. Does nothing + * if the constant pool already contains a similar item. + * + * @param value + * the float value. + * @return a new or already existing float item. + */ + Item newFloat(final float value) { + key.set(value); + Item result = get(key); + if (result == null) { + pool.putByte(FLOAT).putInt(key.intVal); + result = new Item(index++, key); + put(result); + } + return result; + } + + /** + * Adds a long to the constant pool of the class being build. Does nothing + * if the constant pool already contains a similar item. + * + * @param value + * the long value. + * @return a new or already existing long item. + */ + Item newLong(final long value) { + key.set(value); + Item result = get(key); + if (result == null) { + pool.putByte(LONG).putLong(value); + result = new Item(index, key); + index += 2; + put(result); + } + return result; + } + + /** + * Adds a double to the constant pool of the class being build. Does nothing + * if the constant pool already contains a similar item. + * + * @param value + * the double value. + * @return a new or already existing double item. + */ + Item newDouble(final double value) { + key.set(value); + Item result = get(key); + if (result == null) { + pool.putByte(DOUBLE).putLong(key.longVal); + result = new Item(index, key); + index += 2; + put(result); + } + return result; + } + + /** + * Adds a string to the constant pool of the class being build. Does nothing + * if the constant pool already contains a similar item. + * + * @param value + * the String value. + * @return a new or already existing string item. + */ + private Item newString(final String value) { + key2.set(STR, value, null, null); + Item result = get(key2); + if (result == null) { + pool.put12(STR, newUTF8(value)); + result = new Item(index++, key2); + put(result); + } + return result; + } + + /** + * Adds a name and type to the constant pool of the class being build. Does + * nothing if the constant pool already contains a similar item. This + * method is intended for {@link Attribute} sub classes, and is normally not + * needed by class generators or adapters. + * + * @param name + * a name. + * @param desc + * a type descriptor. + * @return the index of a new or already existing name and type item. + */ + public int newNameType(final String name, final String desc) { + return newNameTypeItem(name, desc).index; + } + + /** + * Adds a name and type to the constant pool of the class being build. Does + * nothing if the constant pool already contains a similar item. + * + * @param name + * a name. + * @param desc + * a type descriptor. + * @return a new or already existing name and type item. + */ + Item newNameTypeItem(final String name, final String desc) { + key2.set(NAME_TYPE, name, desc, null); + Item result = get(key2); + if (result == null) { + put122(NAME_TYPE, newUTF8(name), newUTF8(desc)); + result = new Item(index++, key2); + put(result); + } + return result; + } + + /** + * Adds the given internal name to {@link #typeTable} and returns its index. + * Does nothing if the type table already contains this internal name. + * + * @param type + * the internal name to be added to the type table. + * @return the index of this internal name in the type table. + */ + int addType(final String type) { + key.set(TYPE_NORMAL, type, null, null); + Item result = get(key); + if (result == null) { + result = addType(key); + } + return result.index; + } + + /** + * Adds the given "uninitialized" type to {@link #typeTable} and returns its + * index. This method is used for UNINITIALIZED types, made of an internal + * name and a bytecode offset. + * + * @param type + * the internal name to be added to the type table. + * @param offset + * the bytecode offset of the NEW instruction that created this + * UNINITIALIZED type value. + * @return the index of this internal name in the type table. + */ + int addUninitializedType(final String type, final int offset) { + key.type = TYPE_UNINIT; + key.intVal = offset; + key.strVal1 = type; + key.hashCode = 0x7FFFFFFF & (TYPE_UNINIT + type.hashCode() + offset); + Item result = get(key); + if (result == null) { + result = addType(key); + } + return result.index; + } + + /** + * Adds the given Item to {@link #typeTable}. + * + * @param item + * the value to be added to the type table. + * @return the added Item, which a new Item instance with the same value as + * the given Item. + */ + private Item addType(final Item item) { + ++typeCount; + Item result = new Item(typeCount, key); + put(result); + if (typeTable == null) { + typeTable = new Item[16]; + } + if (typeCount == typeTable.length) { + Item[] newTable = new Item[2 * typeTable.length]; + System.arraycopy(typeTable, 0, newTable, 0, typeTable.length); + typeTable = newTable; + } + typeTable[typeCount] = result; + return result; + } + + /** + * Returns the index of the common super type of the two given types. This + * method calls {@link #getCommonSuperClass} and caches the result in the + * {@link #items} hash table to speedup future calls with the same + * parameters. + * + * @param type1 + * index of an internal name in {@link #typeTable}. + * @param type2 + * index of an internal name in {@link #typeTable}. + * @return the index of the common super type of the two given types. + */ + int getMergedType(final int type1, final int type2) { + key2.type = TYPE_MERGED; + key2.longVal = type1 | (((long) type2) << 32); + key2.hashCode = 0x7FFFFFFF & (TYPE_MERGED + type1 + type2); + Item result = get(key2); + if (result == null) { + String t = typeTable[type1].strVal1; + String u = typeTable[type2].strVal1; + key2.intVal = addType(getCommonSuperClass(t, u)); + result = new Item((short) 0, key2); + put(result); + } + return result.intVal; + } + + /** + * Returns the common super type of the two given types. The default + * implementation of this method loads the two given classes and uses + * the java.lang.Class methods to find the common super class. It can be + * overridden to compute this common super type in other ways, in particular + * without actually loading any class, or to take into account the class + * that is currently being generated by this ClassWriter, which can of + * course not be loaded since it is under construction. + * + * @param type1 + * the internal name of a class. + * @param type2 + * the internal name of another class. + * @return the internal name of the common super class of the two given + * classes. + */ + protected String getCommonSuperClass(final String type1, final String type2) { + Class c, d; + ClassLoader classLoader = getClass().getClassLoader(); + try { + c = Class.forName(type1.replace('/', '.'), false, classLoader); + d = Class.forName(type2.replace('/', '.'), false, classLoader); + } catch (Exception e) { + throw new RuntimeException(e.toString()); + } + if (c.isAssignableFrom(d)) { + return type1; + } + if (d.isAssignableFrom(c)) { + return type2; + } + if (c.isInterface() || d.isInterface()) { + return "java/lang/Object"; + } else { + do { + c = c.getSuperclass(); + } while (!c.isAssignableFrom(d)); + return c.getName().replace('.', '/'); + } + } + + /** + * Returns the constant pool's hash table item which is equal to the given + * item. + * + * @param key + * a constant pool item. + * @return the constant pool's hash table item which is equal to the given + * item, or null if there is no such item. + */ + private Item get(final Item key) { + Item i = items[key.hashCode % items.length]; + while (i != null && (i.type != key.type || !key.isEqualTo(i))) { + i = i.next; + } + return i; + } + + /** + * Puts the given item in the constant pool's hash table. The hash table + * must not already contains this item. + * + * @param i + * the item to be added to the constant pool's hash table. + */ + private void put(final Item i) { + if (index + typeCount > threshold) { + int ll = items.length; + int nl = ll * 2 + 1; + Item[] newItems = new Item[nl]; + for (int l = ll - 1; l >= 0; --l) { + Item j = items[l]; + while (j != null) { + int index = j.hashCode % newItems.length; + Item k = j.next; + j.next = newItems[index]; + newItems[index] = j; + j = k; + } + } + items = newItems; + threshold = (int) (nl * 0.75); + } + int index = i.hashCode % items.length; + i.next = items[index]; + items[index] = i; + } + + /** + * Puts one byte and two shorts into the constant pool. + * + * @param b + * a byte. + * @param s1 + * a short. + * @param s2 + * another short. + */ + private void put122(final int b, final int s1, final int s2) { + pool.put12(b, s1).putShort(s2); + } + + /** + * Puts two bytes and one short into the constant pool. + * + * @param b1 + * a byte. + * @param b2 + * another byte. + * @param s + * a short. + */ + private void put112(final int b1, final int b2, final int s) { + pool.put11(b1, b2).putShort(s); + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Context.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Context.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Context.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Context.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,145 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.objectweb.asm; + +/** + * Information about a class being parsed in a {@link ClassReader}. + * + * @author Eric Bruneton + */ +class Context { + + /** + * Prototypes of the attributes that must be parsed for this class. + */ + Attribute[] attrs; + + /** + * The {@link ClassReader} option flags for the parsing of this class. + */ + int flags; + + /** + * The buffer used to read strings. + */ + char[] buffer; + + /** + * The start index of each bootstrap method. + */ + int[] bootstrapMethods; + + /** + * The access flags of the method currently being parsed. + */ + int access; + + /** + * The name of the method currently being parsed. + */ + String name; + + /** + * The descriptor of the method currently being parsed. + */ + String desc; + + /** + * The label objects, indexed by bytecode offset, of the method currently + * being parsed (only bytecode offsets for which a label is needed have a + * non null associated Label object). + */ + Label[] labels; + + /** + * The target of the type annotation currently being parsed. + */ + int typeRef; + + /** + * The path of the type annotation currently being parsed. + */ + TypePath typePath; + + /** + * The offset of the latest stack map frame that has been parsed. + */ + int offset; + + /** + * The labels corresponding to the start of the local variable ranges in the + * local variable type annotation currently being parsed. + */ + Label[] start; + + /** + * The labels corresponding to the end of the local variable ranges in the + * local variable type annotation currently being parsed. + */ + Label[] end; + + /** + * The local variable indices for each local variable range in the local + * variable type annotation currently being parsed. + */ + int[] index; + + /** + * The encoding of the latest stack map frame that has been parsed. + */ + int mode; + + /** + * The number of locals in the latest stack map frame that has been parsed. + */ + int localCount; + + /** + * The number locals in the latest stack map frame that has been parsed, + * minus the number of locals in the previous frame. + */ + int localDiff; + + /** + * The local values of the latest stack map frame that has been parsed. + */ + Object[] local; + + /** + * The stack size of the latest stack map frame that has been parsed. + */ + int stackCount; + + /** + * The stack values of the latest stack map frame that has been parsed. + */ + Object[] stack; +} \ No newline at end of file diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Edge.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Edge.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Edge.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Edge.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,75 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * An edge in the control flow graph of a method body. See {@link Label Label}. + * + * @author Eric Bruneton + */ +class Edge { + + /** + * Denotes a normal control flow graph edge. + */ + static final int NORMAL = 0; + + /** + * Denotes a control flow graph edge corresponding to an exception handler. + * More precisely any {@link Edge} whose {@link #info} is strictly positive + * corresponds to an exception handler. The actual value of {@link #info} is + * the index, in the {@link ClassWriter} type table, of the exception that + * is catched. + */ + static final int EXCEPTION = 0x7FFFFFFF; + + /** + * Information about this control flow graph edge. If + * {@link ClassWriter#COMPUTE_MAXS} is used this field is the (relative) + * stack size in the basic block from which this edge originates. This size + * is equal to the stack size at the "jump" instruction to which this edge + * corresponds, relatively to the stack size at the beginning of the + * originating basic block. If {@link ClassWriter#COMPUTE_FRAMES} is used, + * this field is the kind of this control flow graph edge (i.e. NORMAL or + * EXCEPTION). + */ + int info; + + /** + * The successor block of the basic block from which this edge originates. + */ + Label successor; + + /** + * The next edge in the list of successors of the originating basic block. + * See {@link Label#successors successors}. + */ + Edge next; +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/FieldVisitor.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/FieldVisitor.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/FieldVisitor.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/FieldVisitor.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,150 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * A visitor to visit a Java field. The methods of this class must be called in + * the following order: ( visitAnnotation | + * visitTypeAnnotation | visitAttribute )* visitEnd. + * + * @author Eric Bruneton + */ +public abstract class FieldVisitor { + + /** + * The ASM API version implemented by this visitor. The value of this field + * must be one of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + */ + protected final int api; + + /** + * The field visitor to which this visitor must delegate method calls. May + * be null. + */ + protected FieldVisitor fv; + + /** + * Constructs a new {@link FieldVisitor}. + * + * @param api + * the ASM API version implemented by this visitor. Must be one + * of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + */ + public FieldVisitor(final int api) { + this(api, null); + } + + /** + * Constructs a new {@link FieldVisitor}. + * + * @param api + * the ASM API version implemented by this visitor. Must be one + * of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + * @param fv + * the field visitor to which this visitor must delegate method + * calls. May be null. + */ + public FieldVisitor(final int api, final FieldVisitor fv) { + if (api != Opcodes.ASM4 && api != Opcodes.ASM5) { + throw new IllegalArgumentException(); + } + this.api = api; + this.fv = fv; + } + + /** + * Visits an annotation of the field. + * + * @param desc + * the class descriptor of the annotation class. + * @param visible + * true if the annotation is visible at runtime. + * @return a visitor to visit the annotation values, or null if + * this visitor is not interested in visiting this annotation. + */ + public AnnotationVisitor visitAnnotation(String desc, boolean visible) { + if (fv != null) { + return fv.visitAnnotation(desc, visible); + } + return null; + } + + /** + * Visits an annotation on the type of the field. + * + * @param typeRef + * a reference to the annotated type. The sort of this type + * reference must be {@link TypeReference#FIELD FIELD}. See + * {@link TypeReference}. + * @param typePath + * the path to the annotated type argument, wildcard bound, array + * element type, or static inner type within 'typeRef'. May be + * null if the annotation targets 'typeRef' as a whole. + * @param desc + * the class descriptor of the annotation class. + * @param visible + * true if the annotation is visible at runtime. + * @return a visitor to visit the annotation values, or null if + * this visitor is not interested in visiting this annotation. + */ + public AnnotationVisitor visitTypeAnnotation(int typeRef, + TypePath typePath, String desc, boolean visible) { + if (api < Opcodes.ASM5) { + throw new RuntimeException(); + } + if (fv != null) { + return fv.visitTypeAnnotation(typeRef, typePath, desc, visible); + } + return null; + } + + /** + * Visits a non standard attribute of the field. + * + * @param attr + * an attribute. + */ + public void visitAttribute(Attribute attr) { + if (fv != null) { + fv.visitAttribute(attr); + } + } + + /** + * Visits the end of the field. This method, which is the last one to be + * called, is used to inform the visitor that all the annotations and + * attributes of the field have been visited. + */ + public void visitEnd() { + if (fv != null) { + fv.visitEnd(); + } + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/FieldWriter.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/FieldWriter.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/FieldWriter.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/FieldWriter.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,329 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * An {@link FieldVisitor} that generates Java fields in bytecode form. + * + * @author Eric Bruneton + */ +final class FieldWriter extends FieldVisitor { + + /** + * The class writer to which this field must be added. + */ + private final ClassWriter cw; + + /** + * Access flags of this field. + */ + private final int access; + + /** + * The index of the constant pool item that contains the name of this + * method. + */ + private final int name; + + /** + * The index of the constant pool item that contains the descriptor of this + * field. + */ + private final int desc; + + /** + * The index of the constant pool item that contains the signature of this + * field. + */ + private int signature; + + /** + * The index of the constant pool item that contains the constant value of + * this field. + */ + private int value; + + /** + * The runtime visible annotations of this field. May be null. + */ + private AnnotationWriter anns; + + /** + * The runtime invisible annotations of this field. May be null. + */ + private AnnotationWriter ianns; + + /** + * The runtime visible type annotations of this field. May be null. + */ + private AnnotationWriter tanns; + + /** + * The runtime invisible type annotations of this field. May be + * null. + */ + private AnnotationWriter itanns; + + /** + * The non standard attributes of this field. May be null. + */ + private Attribute attrs; + + // ------------------------------------------------------------------------ + // Constructor + // ------------------------------------------------------------------------ + + /** + * Constructs a new {@link FieldWriter}. + * + * @param cw + * the class writer to which this field must be added. + * @param access + * the field's access flags (see {@link Opcodes}). + * @param name + * the field's name. + * @param desc + * the field's descriptor (see {@link Type}). + * @param signature + * the field's signature. May be null. + * @param value + * the field's constant value. May be null. + */ + FieldWriter(final ClassWriter cw, final int access, final String name, + final String desc, final String signature, final Object value) { + super(Opcodes.ASM5); + if (cw.firstField == null) { + cw.firstField = this; + } else { + cw.lastField.fv = this; + } + cw.lastField = this; + this.cw = cw; + this.access = access; + this.name = cw.newUTF8(name); + this.desc = cw.newUTF8(desc); + if (ClassReader.SIGNATURES && signature != null) { + this.signature = cw.newUTF8(signature); + } + if (value != null) { + this.value = cw.newConstItem(value).index; + } + } + + // ------------------------------------------------------------------------ + // Implementation of the FieldVisitor abstract class + // ------------------------------------------------------------------------ + + @Override + public AnnotationVisitor visitAnnotation(final String desc, + final boolean visible) { + if (!ClassReader.ANNOTATIONS) { + return null; + } + ByteVector bv = new ByteVector(); + // write type, and reserve space for values count + bv.putShort(cw.newUTF8(desc)).putShort(0); + AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, 2); + if (visible) { + aw.next = anns; + anns = aw; + } else { + aw.next = ianns; + ianns = aw; + } + return aw; + } + + @Override + public AnnotationVisitor visitTypeAnnotation(final int typeRef, + final TypePath typePath, final String desc, final boolean visible) { + if (!ClassReader.ANNOTATIONS) { + return null; + } + ByteVector bv = new ByteVector(); + // write target_type and target_info + AnnotationWriter.putTarget(typeRef, typePath, bv); + // write type, and reserve space for values count + bv.putShort(cw.newUTF8(desc)).putShort(0); + AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, + bv.length - 2); + if (visible) { + aw.next = tanns; + tanns = aw; + } else { + aw.next = itanns; + itanns = aw; + } + return aw; + } + + @Override + public void visitAttribute(final Attribute attr) { + attr.next = attrs; + attrs = attr; + } + + @Override + public void visitEnd() { + } + + // ------------------------------------------------------------------------ + // Utility methods + // ------------------------------------------------------------------------ + + /** + * Returns the size of this field. + * + * @return the size of this field. + */ + int getSize() { + int size = 8; + if (value != 0) { + cw.newUTF8("ConstantValue"); + size += 8; + } + if ((access & Opcodes.ACC_SYNTHETIC) != 0) { + if ((cw.version & 0xFFFF) < Opcodes.V1_5 + || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0) { + cw.newUTF8("Synthetic"); + size += 6; + } + } + if ((access & Opcodes.ACC_DEPRECATED) != 0) { + cw.newUTF8("Deprecated"); + size += 6; + } + if (ClassReader.SIGNATURES && signature != 0) { + cw.newUTF8("Signature"); + size += 8; + } + if (ClassReader.ANNOTATIONS && anns != null) { + cw.newUTF8("RuntimeVisibleAnnotations"); + size += 8 + anns.getSize(); + } + if (ClassReader.ANNOTATIONS && ianns != null) { + cw.newUTF8("RuntimeInvisibleAnnotations"); + size += 8 + ianns.getSize(); + } + if (ClassReader.ANNOTATIONS && tanns != null) { + cw.newUTF8("RuntimeVisibleTypeAnnotations"); + size += 8 + tanns.getSize(); + } + if (ClassReader.ANNOTATIONS && itanns != null) { + cw.newUTF8("RuntimeInvisibleTypeAnnotations"); + size += 8 + itanns.getSize(); + } + if (attrs != null) { + size += attrs.getSize(cw, null, 0, -1, -1); + } + return size; + } + + /** + * Puts the content of this field into the given byte vector. + * + * @param out + * where the content of this field must be put. + */ + void put(final ByteVector out) { + final int FACTOR = ClassWriter.TO_ACC_SYNTHETIC; + int mask = Opcodes.ACC_DEPRECATED | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE + | ((access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) / FACTOR); + out.putShort(access & ~mask).putShort(name).putShort(desc); + int attributeCount = 0; + if (value != 0) { + ++attributeCount; + } + if ((access & Opcodes.ACC_SYNTHETIC) != 0) { + if ((cw.version & 0xFFFF) < Opcodes.V1_5 + || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0) { + ++attributeCount; + } + } + if ((access & Opcodes.ACC_DEPRECATED) != 0) { + ++attributeCount; + } + if (ClassReader.SIGNATURES && signature != 0) { + ++attributeCount; + } + if (ClassReader.ANNOTATIONS && anns != null) { + ++attributeCount; + } + if (ClassReader.ANNOTATIONS && ianns != null) { + ++attributeCount; + } + if (ClassReader.ANNOTATIONS && tanns != null) { + ++attributeCount; + } + if (ClassReader.ANNOTATIONS && itanns != null) { + ++attributeCount; + } + if (attrs != null) { + attributeCount += attrs.getCount(); + } + out.putShort(attributeCount); + if (value != 0) { + out.putShort(cw.newUTF8("ConstantValue")); + out.putInt(2).putShort(value); + } + if ((access & Opcodes.ACC_SYNTHETIC) != 0) { + if ((cw.version & 0xFFFF) < Opcodes.V1_5 + || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0) { + out.putShort(cw.newUTF8("Synthetic")).putInt(0); + } + } + if ((access & Opcodes.ACC_DEPRECATED) != 0) { + out.putShort(cw.newUTF8("Deprecated")).putInt(0); + } + if (ClassReader.SIGNATURES && signature != 0) { + out.putShort(cw.newUTF8("Signature")); + out.putInt(2).putShort(signature); + } + if (ClassReader.ANNOTATIONS && anns != null) { + out.putShort(cw.newUTF8("RuntimeVisibleAnnotations")); + anns.put(out); + } + if (ClassReader.ANNOTATIONS && ianns != null) { + out.putShort(cw.newUTF8("RuntimeInvisibleAnnotations")); + ianns.put(out); + } + if (ClassReader.ANNOTATIONS && tanns != null) { + out.putShort(cw.newUTF8("RuntimeVisibleTypeAnnotations")); + tanns.put(out); + } + if (ClassReader.ANNOTATIONS && itanns != null) { + out.putShort(cw.newUTF8("RuntimeInvisibleTypeAnnotations")); + itanns.put(out); + } + if (attrs != null) { + attrs.put(cw, null, 0, -1, -1, out); + } + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Frame.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Frame.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Frame.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Frame.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,1462 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * Information about the input and output stack map frames of a basic block. + * + * @author Eric Bruneton + */ +final class Frame { + + /* + * Frames are computed in a two steps process: during the visit of each + * instruction, the state of the frame at the end of current basic block is + * updated by simulating the action of the instruction on the previous state + * of this so called "output frame". In visitMaxs, a fix point algorithm is + * used to compute the "input frame" of each basic block, i.e. the stack map + * frame at the beginning of the basic block, starting from the input frame + * of the first basic block (which is computed from the method descriptor), + * and by using the previously computed output frames to compute the input + * state of the other blocks. + * + * All output and input frames are stored as arrays of integers. Reference + * and array types are represented by an index into a type table (which is + * not the same as the constant pool of the class, in order to avoid adding + * unnecessary constants in the pool - not all computed frames will end up + * being stored in the stack map table). This allows very fast type + * comparisons. + * + * Output stack map frames are computed relatively to the input frame of the + * basic block, which is not yet known when output frames are computed. It + * is therefore necessary to be able to represent abstract types such as + * "the type at position x in the input frame locals" or "the type at + * position x from the top of the input frame stack" or even "the type at + * position x in the input frame, with y more (or less) array dimensions". + * This explains the rather complicated type format used in output frames. + * + * This format is the following: DIM KIND VALUE (4, 4 and 24 bits). DIM is a + * signed number of array dimensions (from -8 to 7). KIND is either BASE, + * LOCAL or STACK. BASE is used for types that are not relative to the input + * frame. LOCAL is used for types that are relative to the input local + * variable types. STACK is used for types that are relative to the input + * stack types. VALUE depends on KIND. For LOCAL types, it is an index in + * the input local variable types. For STACK types, it is a position + * relatively to the top of input frame stack. For BASE types, it is either + * one of the constants defined below, or for OBJECT and UNINITIALIZED + * types, a tag and an index in the type table. + * + * Output frames can contain types of any kind and with a positive or + * negative dimension (and even unassigned types, represented by 0 - which + * does not correspond to any valid type value). Input frames can only + * contain BASE types of positive or null dimension. In all cases the type + * table contains only internal type names (array type descriptors are + * forbidden - dimensions must be represented through the DIM field). + * + * The LONG and DOUBLE types are always represented by using two slots (LONG + * + TOP or DOUBLE + TOP), for local variable types as well as in the + * operand stack. This is necessary to be able to simulate DUPx_y + * instructions, whose effect would be dependent on the actual type values + * if types were always represented by a single slot in the stack (and this + * is not possible, since actual type values are not always known - cf LOCAL + * and STACK type kinds). + */ + + /** + * Mask to get the dimension of a frame type. This dimension is a signed + * integer between -8 and 7. + */ + static final int DIM = 0xF0000000; + + /** + * Constant to be added to a type to get a type with one more dimension. + */ + static final int ARRAY_OF = 0x10000000; + + /** + * Constant to be added to a type to get a type with one less dimension. + */ + static final int ELEMENT_OF = 0xF0000000; + + /** + * Mask to get the kind of a frame type. + * + * @see #BASE + * @see #LOCAL + * @see #STACK + */ + static final int KIND = 0xF000000; + + /** + * Flag used for LOCAL and STACK types. Indicates that if this type happens + * to be a long or double type (during the computations of input frames), + * then it must be set to TOP because the second word of this value has been + * reused to store other data in the basic block. Hence the first word no + * longer stores a valid long or double value. + */ + static final int TOP_IF_LONG_OR_DOUBLE = 0x800000; + + /** + * Mask to get the value of a frame type. + */ + static final int VALUE = 0x7FFFFF; + + /** + * Mask to get the kind of base types. + */ + static final int BASE_KIND = 0xFF00000; + + /** + * Mask to get the value of base types. + */ + static final int BASE_VALUE = 0xFFFFF; + + /** + * Kind of the types that are not relative to an input stack map frame. + */ + static final int BASE = 0x1000000; + + /** + * Base kind of the base reference types. The BASE_VALUE of such types is an + * index into the type table. + */ + static final int OBJECT = BASE | 0x700000; + + /** + * Base kind of the uninitialized base types. The BASE_VALUE of such types + * in an index into the type table (the Item at that index contains both an + * instruction offset and an internal class name). + */ + static final int UNINITIALIZED = BASE | 0x800000; + + /** + * Kind of the types that are relative to the local variable types of an + * input stack map frame. The value of such types is a local variable index. + */ + private static final int LOCAL = 0x2000000; + + /** + * Kind of the the types that are relative to the stack of an input stack + * map frame. The value of such types is a position relatively to the top of + * this stack. + */ + private static final int STACK = 0x3000000; + + /** + * The TOP type. This is a BASE type. + */ + static final int TOP = BASE | 0; + + /** + * The BOOLEAN type. This is a BASE type mainly used for array types. + */ + static final int BOOLEAN = BASE | 9; + + /** + * The BYTE type. This is a BASE type mainly used for array types. + */ + static final int BYTE = BASE | 10; + + /** + * The CHAR type. This is a BASE type mainly used for array types. + */ + static final int CHAR = BASE | 11; + + /** + * The SHORT type. This is a BASE type mainly used for array types. + */ + static final int SHORT = BASE | 12; + + /** + * The INTEGER type. This is a BASE type. + */ + static final int INTEGER = BASE | 1; + + /** + * The FLOAT type. This is a BASE type. + */ + static final int FLOAT = BASE | 2; + + /** + * The DOUBLE type. This is a BASE type. + */ + static final int DOUBLE = BASE | 3; + + /** + * The LONG type. This is a BASE type. + */ + static final int LONG = BASE | 4; + + /** + * The NULL type. This is a BASE type. + */ + static final int NULL = BASE | 5; + + /** + * The UNINITIALIZED_THIS type. This is a BASE type. + */ + static final int UNINITIALIZED_THIS = BASE | 6; + + /** + * The stack size variation corresponding to each JVM instruction. This + * stack variation is equal to the size of the values produced by an + * instruction, minus the size of the values consumed by this instruction. + */ + static final int[] SIZE; + + /** + * Computes the stack size variation corresponding to each JVM instruction. + */ + static { + int i; + int[] b = new int[202]; + String s = "EFFFFFFFFGGFFFGGFFFEEFGFGFEEEEEEEEEEEEEEEEEEEEDEDEDDDDD" + + "CDCDEEEEEEEEEEEEEEEEEEEEBABABBBBDCFFFGGGEDCDCDCDCDCDCDCDCD" + + "CDCEEEEDDDDDDDCDCDCEFEFDDEEFFDEDEEEBDDBBDDDDDDCCCCCCCCEFED" + + "DDCDCDEEEEEEEEEEFEEEEEEDDEEDDEE"; + for (i = 0; i < b.length; ++i) { + b[i] = s.charAt(i) - 'E'; + } + SIZE = b; + + // code to generate the above string + // + // int NA = 0; // not applicable (unused opcode or variable size opcode) + // + // b = new int[] { + // 0, //NOP, // visitInsn + // 1, //ACONST_NULL, // - + // 1, //ICONST_M1, // - + // 1, //ICONST_0, // - + // 1, //ICONST_1, // - + // 1, //ICONST_2, // - + // 1, //ICONST_3, // - + // 1, //ICONST_4, // - + // 1, //ICONST_5, // - + // 2, //LCONST_0, // - + // 2, //LCONST_1, // - + // 1, //FCONST_0, // - + // 1, //FCONST_1, // - + // 1, //FCONST_2, // - + // 2, //DCONST_0, // - + // 2, //DCONST_1, // - + // 1, //BIPUSH, // visitIntInsn + // 1, //SIPUSH, // - + // 1, //LDC, // visitLdcInsn + // NA, //LDC_W, // - + // NA, //LDC2_W, // - + // 1, //ILOAD, // visitVarInsn + // 2, //LLOAD, // - + // 1, //FLOAD, // - + // 2, //DLOAD, // - + // 1, //ALOAD, // - + // NA, //ILOAD_0, // - + // NA, //ILOAD_1, // - + // NA, //ILOAD_2, // - + // NA, //ILOAD_3, // - + // NA, //LLOAD_0, // - + // NA, //LLOAD_1, // - + // NA, //LLOAD_2, // - + // NA, //LLOAD_3, // - + // NA, //FLOAD_0, // - + // NA, //FLOAD_1, // - + // NA, //FLOAD_2, // - + // NA, //FLOAD_3, // - + // NA, //DLOAD_0, // - + // NA, //DLOAD_1, // - + // NA, //DLOAD_2, // - + // NA, //DLOAD_3, // - + // NA, //ALOAD_0, // - + // NA, //ALOAD_1, // - + // NA, //ALOAD_2, // - + // NA, //ALOAD_3, // - + // -1, //IALOAD, // visitInsn + // 0, //LALOAD, // - + // -1, //FALOAD, // - + // 0, //DALOAD, // - + // -1, //AALOAD, // - + // -1, //BALOAD, // - + // -1, //CALOAD, // - + // -1, //SALOAD, // - + // -1, //ISTORE, // visitVarInsn + // -2, //LSTORE, // - + // -1, //FSTORE, // - + // -2, //DSTORE, // - + // -1, //ASTORE, // - + // NA, //ISTORE_0, // - + // NA, //ISTORE_1, // - + // NA, //ISTORE_2, // - + // NA, //ISTORE_3, // - + // NA, //LSTORE_0, // - + // NA, //LSTORE_1, // - + // NA, //LSTORE_2, // - + // NA, //LSTORE_3, // - + // NA, //FSTORE_0, // - + // NA, //FSTORE_1, // - + // NA, //FSTORE_2, // - + // NA, //FSTORE_3, // - + // NA, //DSTORE_0, // - + // NA, //DSTORE_1, // - + // NA, //DSTORE_2, // - + // NA, //DSTORE_3, // - + // NA, //ASTORE_0, // - + // NA, //ASTORE_1, // - + // NA, //ASTORE_2, // - + // NA, //ASTORE_3, // - + // -3, //IASTORE, // visitInsn + // -4, //LASTORE, // - + // -3, //FASTORE, // - + // -4, //DASTORE, // - + // -3, //AASTORE, // - + // -3, //BASTORE, // - + // -3, //CASTORE, // - + // -3, //SASTORE, // - + // -1, //POP, // - + // -2, //POP2, // - + // 1, //DUP, // - + // 1, //DUP_X1, // - + // 1, //DUP_X2, // - + // 2, //DUP2, // - + // 2, //DUP2_X1, // - + // 2, //DUP2_X2, // - + // 0, //SWAP, // - + // -1, //IADD, // - + // -2, //LADD, // - + // -1, //FADD, // - + // -2, //DADD, // - + // -1, //ISUB, // - + // -2, //LSUB, // - + // -1, //FSUB, // - + // -2, //DSUB, // - + // -1, //IMUL, // - + // -2, //LMUL, // - + // -1, //FMUL, // - + // -2, //DMUL, // - + // -1, //IDIV, // - + // -2, //LDIV, // - + // -1, //FDIV, // - + // -2, //DDIV, // - + // -1, //IREM, // - + // -2, //LREM, // - + // -1, //FREM, // - + // -2, //DREM, // - + // 0, //INEG, // - + // 0, //LNEG, // - + // 0, //FNEG, // - + // 0, //DNEG, // - + // -1, //ISHL, // - + // -1, //LSHL, // - + // -1, //ISHR, // - + // -1, //LSHR, // - + // -1, //IUSHR, // - + // -1, //LUSHR, // - + // -1, //IAND, // - + // -2, //LAND, // - + // -1, //IOR, // - + // -2, //LOR, // - + // -1, //IXOR, // - + // -2, //LXOR, // - + // 0, //IINC, // visitIincInsn + // 1, //I2L, // visitInsn + // 0, //I2F, // - + // 1, //I2D, // - + // -1, //L2I, // - + // -1, //L2F, // - + // 0, //L2D, // - + // 0, //F2I, // - + // 1, //F2L, // - + // 1, //F2D, // - + // -1, //D2I, // - + // 0, //D2L, // - + // -1, //D2F, // - + // 0, //I2B, // - + // 0, //I2C, // - + // 0, //I2S, // - + // -3, //LCMP, // - + // -1, //FCMPL, // - + // -1, //FCMPG, // - + // -3, //DCMPL, // - + // -3, //DCMPG, // - + // -1, //IFEQ, // visitJumpInsn + // -1, //IFNE, // - + // -1, //IFLT, // - + // -1, //IFGE, // - + // -1, //IFGT, // - + // -1, //IFLE, // - + // -2, //IF_ICMPEQ, // - + // -2, //IF_ICMPNE, // - + // -2, //IF_ICMPLT, // - + // -2, //IF_ICMPGE, // - + // -2, //IF_ICMPGT, // - + // -2, //IF_ICMPLE, // - + // -2, //IF_ACMPEQ, // - + // -2, //IF_ACMPNE, // - + // 0, //GOTO, // - + // 1, //JSR, // - + // 0, //RET, // visitVarInsn + // -1, //TABLESWITCH, // visiTableSwitchInsn + // -1, //LOOKUPSWITCH, // visitLookupSwitch + // -1, //IRETURN, // visitInsn + // -2, //LRETURN, // - + // -1, //FRETURN, // - + // -2, //DRETURN, // - + // -1, //ARETURN, // - + // 0, //RETURN, // - + // NA, //GETSTATIC, // visitFieldInsn + // NA, //PUTSTATIC, // - + // NA, //GETFIELD, // - + // NA, //PUTFIELD, // - + // NA, //INVOKEVIRTUAL, // visitMethodInsn + // NA, //INVOKESPECIAL, // - + // NA, //INVOKESTATIC, // - + // NA, //INVOKEINTERFACE, // - + // NA, //INVOKEDYNAMIC, // visitInvokeDynamicInsn + // 1, //NEW, // visitTypeInsn + // 0, //NEWARRAY, // visitIntInsn + // 0, //ANEWARRAY, // visitTypeInsn + // 0, //ARRAYLENGTH, // visitInsn + // NA, //ATHROW, // - + // 0, //CHECKCAST, // visitTypeInsn + // 0, //INSTANCEOF, // - + // -1, //MONITORENTER, // visitInsn + // -1, //MONITOREXIT, // - + // NA, //WIDE, // NOT VISITED + // NA, //MULTIANEWARRAY, // visitMultiANewArrayInsn + // -1, //IFNULL, // visitJumpInsn + // -1, //IFNONNULL, // - + // NA, //GOTO_W, // - + // NA, //JSR_W, // - + // }; + // for (i = 0; i < b.length; ++i) { + // System.err.print((char)('E' + b[i])); + // } + // System.err.println(); + } + + /** + * The label (i.e. basic block) to which these input and output stack map + * frames correspond. + */ + Label owner; + + /** + * The input stack map frame locals. + */ + int[] inputLocals; + + /** + * The input stack map frame stack. + */ + int[] inputStack; + + /** + * The output stack map frame locals. + */ + private int[] outputLocals; + + /** + * The output stack map frame stack. + */ + private int[] outputStack; + + /** + * Relative size of the output stack. The exact semantics of this field + * depends on the algorithm that is used. + * + * When only the maximum stack size is computed, this field is the size of + * the output stack relatively to the top of the input stack. + * + * When the stack map frames are completely computed, this field is the + * actual number of types in {@link #outputStack}. + */ + private int outputStackTop; + + /** + * Number of types that are initialized in the basic block. + * + * @see #initializations + */ + private int initializationCount; + + /** + * The types that are initialized in the basic block. A constructor + * invocation on an UNINITIALIZED or UNINITIALIZED_THIS type must replace + * every occurence of this type in the local variables and in the + * operand stack. This cannot be done during the first phase of the + * algorithm since, during this phase, the local variables and the operand + * stack are not completely computed. It is therefore necessary to store the + * types on which constructors are invoked in the basic block, in order to + * do this replacement during the second phase of the algorithm, where the + * frames are fully computed. Note that this array can contain types that + * are relative to input locals or to the input stack (see below for the + * description of the algorithm). + */ + private int[] initializations; + + /** + * Returns the output frame local variable type at the given index. + * + * @param local + * the index of the local that must be returned. + * @return the output frame local variable type at the given index. + */ + private int get(final int local) { + if (outputLocals == null || local >= outputLocals.length) { + // this local has never been assigned in this basic block, + // so it is still equal to its value in the input frame + return LOCAL | local; + } else { + int type = outputLocals[local]; + if (type == 0) { + // this local has never been assigned in this basic block, + // so it is still equal to its value in the input frame + type = outputLocals[local] = LOCAL | local; + } + return type; + } + } + + /** + * Sets the output frame local variable type at the given index. + * + * @param local + * the index of the local that must be set. + * @param type + * the value of the local that must be set. + */ + private void set(final int local, final int type) { + // creates and/or resizes the output local variables array if necessary + if (outputLocals == null) { + outputLocals = new int[10]; + } + int n = outputLocals.length; + if (local >= n) { + int[] t = new int[Math.max(local + 1, 2 * n)]; + System.arraycopy(outputLocals, 0, t, 0, n); + outputLocals = t; + } + // sets the local variable + outputLocals[local] = type; + } + + /** + * Pushes a new type onto the output frame stack. + * + * @param type + * the type that must be pushed. + */ + private void push(final int type) { + // creates and/or resizes the output stack array if necessary + if (outputStack == null) { + outputStack = new int[10]; + } + int n = outputStack.length; + if (outputStackTop >= n) { + int[] t = new int[Math.max(outputStackTop + 1, 2 * n)]; + System.arraycopy(outputStack, 0, t, 0, n); + outputStack = t; + } + // pushes the type on the output stack + outputStack[outputStackTop++] = type; + // updates the maximun height reached by the output stack, if needed + int top = owner.inputStackTop + outputStackTop; + if (top > owner.outputStackMax) { + owner.outputStackMax = top; + } + } + + /** + * Pushes a new type onto the output frame stack. + * + * @param cw + * the ClassWriter to which this label belongs. + * @param desc + * the descriptor of the type to be pushed. Can also be a method + * descriptor (in this case this method pushes its return type + * onto the output frame stack). + */ + private void push(final ClassWriter cw, final String desc) { + int type = type(cw, desc); + if (type != 0) { + push(type); + if (type == LONG || type == DOUBLE) { + push(TOP); + } + } + } + + /** + * Returns the int encoding of the given type. + * + * @param cw + * the ClassWriter to which this label belongs. + * @param desc + * a type descriptor. + * @return the int encoding of the given type. + */ + private static int type(final ClassWriter cw, final String desc) { + String t; + int index = desc.charAt(0) == '(' ? desc.indexOf(')') + 1 : 0; + switch (desc.charAt(index)) { + case 'V': + return 0; + case 'Z': + case 'C': + case 'B': + case 'S': + case 'I': + return INTEGER; + case 'F': + return FLOAT; + case 'J': + return LONG; + case 'D': + return DOUBLE; + case 'L': + // stores the internal name, not the descriptor! + t = desc.substring(index + 1, desc.length() - 1); + return OBJECT | cw.addType(t); + // case '[': + default: + // extracts the dimensions and the element type + int data; + int dims = index + 1; + while (desc.charAt(dims) == '[') { + ++dims; + } + switch (desc.charAt(dims)) { + case 'Z': + data = BOOLEAN; + break; + case 'C': + data = CHAR; + break; + case 'B': + data = BYTE; + break; + case 'S': + data = SHORT; + break; + case 'I': + data = INTEGER; + break; + case 'F': + data = FLOAT; + break; + case 'J': + data = LONG; + break; + case 'D': + data = DOUBLE; + break; + // case 'L': + default: + // stores the internal name, not the descriptor + t = desc.substring(dims + 1, desc.length() - 1); + data = OBJECT | cw.addType(t); + } + return (dims - index) << 28 | data; + } + } + + /** + * Pops a type from the output frame stack and returns its value. + * + * @return the type that has been popped from the output frame stack. + */ + private int pop() { + if (outputStackTop > 0) { + return outputStack[--outputStackTop]; + } else { + // if the output frame stack is empty, pops from the input stack + return STACK | -(--owner.inputStackTop); + } + } + + /** + * Pops the given number of types from the output frame stack. + * + * @param elements + * the number of types that must be popped. + */ + private void pop(final int elements) { + if (outputStackTop >= elements) { + outputStackTop -= elements; + } else { + // if the number of elements to be popped is greater than the number + // of elements in the output stack, clear it, and pops the remaining + // elements from the input stack. + owner.inputStackTop -= elements - outputStackTop; + outputStackTop = 0; + } + } + + /** + * Pops a type from the output frame stack. + * + * @param desc + * the descriptor of the type to be popped. Can also be a method + * descriptor (in this case this method pops the types + * corresponding to the method arguments). + */ + private void pop(final String desc) { + char c = desc.charAt(0); + if (c == '(') { + pop((Type.getArgumentsAndReturnSizes(desc) >> 2) - 1); + } else if (c == 'J' || c == 'D') { + pop(2); + } else { + pop(1); + } + } + + /** + * Adds a new type to the list of types on which a constructor is invoked in + * the basic block. + * + * @param var + * a type on a which a constructor is invoked. + */ + private void init(final int var) { + // creates and/or resizes the initializations array if necessary + if (initializations == null) { + initializations = new int[2]; + } + int n = initializations.length; + if (initializationCount >= n) { + int[] t = new int[Math.max(initializationCount + 1, 2 * n)]; + System.arraycopy(initializations, 0, t, 0, n); + initializations = t; + } + // stores the type to be initialized + initializations[initializationCount++] = var; + } + + /** + * Replaces the given type with the appropriate type if it is one of the + * types on which a constructor is invoked in the basic block. + * + * @param cw + * the ClassWriter to which this label belongs. + * @param t + * a type + * @return t or, if t is one of the types on which a constructor is invoked + * in the basic block, the type corresponding to this constructor. + */ + private int init(final ClassWriter cw, final int t) { + int s; + if (t == UNINITIALIZED_THIS) { + s = OBJECT | cw.addType(cw.thisName); + } else if ((t & (DIM | BASE_KIND)) == UNINITIALIZED) { + String type = cw.typeTable[t & BASE_VALUE].strVal1; + s = OBJECT | cw.addType(type); + } else { + return t; + } + for (int j = 0; j < initializationCount; ++j) { + int u = initializations[j]; + int dim = u & DIM; + int kind = u & KIND; + if (kind == LOCAL) { + u = dim + inputLocals[u & VALUE]; + } else if (kind == STACK) { + u = dim + inputStack[inputStack.length - (u & VALUE)]; + } + if (t == u) { + return s; + } + } + return t; + } + + /** + * Initializes the input frame of the first basic block from the method + * descriptor. + * + * @param cw + * the ClassWriter to which this label belongs. + * @param access + * the access flags of the method to which this label belongs. + * @param args + * the formal parameter types of this method. + * @param maxLocals + * the maximum number of local variables of this method. + */ + void initInputFrame(final ClassWriter cw, final int access, + final Type[] args, final int maxLocals) { + inputLocals = new int[maxLocals]; + inputStack = new int[0]; + int i = 0; + if ((access & Opcodes.ACC_STATIC) == 0) { + if ((access & MethodWriter.ACC_CONSTRUCTOR) == 0) { + inputLocals[i++] = OBJECT | cw.addType(cw.thisName); + } else { + inputLocals[i++] = UNINITIALIZED_THIS; + } + } + for (int j = 0; j < args.length; ++j) { + int t = type(cw, args[j].getDescriptor()); + inputLocals[i++] = t; + if (t == LONG || t == DOUBLE) { + inputLocals[i++] = TOP; + } + } + while (i < maxLocals) { + inputLocals[i++] = TOP; + } + } + + /** + * Simulates the action of the given instruction on the output stack frame. + * + * @param opcode + * the opcode of the instruction. + * @param arg + * the operand of the instruction, if any. + * @param cw + * the class writer to which this label belongs. + * @param item + * the operand of the instructions, if any. + */ + void execute(final int opcode, final int arg, final ClassWriter cw, + final Item item) { + int t1, t2, t3, t4; + switch (opcode) { + case Opcodes.NOP: + case Opcodes.INEG: + case Opcodes.LNEG: + case Opcodes.FNEG: + case Opcodes.DNEG: + case Opcodes.I2B: + case Opcodes.I2C: + case Opcodes.I2S: + case Opcodes.GOTO: + case Opcodes.RETURN: + break; + case Opcodes.ACONST_NULL: + push(NULL); + break; + case Opcodes.ICONST_M1: + case Opcodes.ICONST_0: + case Opcodes.ICONST_1: + case Opcodes.ICONST_2: + case Opcodes.ICONST_3: + case Opcodes.ICONST_4: + case Opcodes.ICONST_5: + case Opcodes.BIPUSH: + case Opcodes.SIPUSH: + case Opcodes.ILOAD: + push(INTEGER); + break; + case Opcodes.LCONST_0: + case Opcodes.LCONST_1: + case Opcodes.LLOAD: + push(LONG); + push(TOP); + break; + case Opcodes.FCONST_0: + case Opcodes.FCONST_1: + case Opcodes.FCONST_2: + case Opcodes.FLOAD: + push(FLOAT); + break; + case Opcodes.DCONST_0: + case Opcodes.DCONST_1: + case Opcodes.DLOAD: + push(DOUBLE); + push(TOP); + break; + case Opcodes.LDC: + switch (item.type) { + case ClassWriter.INT: + push(INTEGER); + break; + case ClassWriter.LONG: + push(LONG); + push(TOP); + break; + case ClassWriter.FLOAT: + push(FLOAT); + break; + case ClassWriter.DOUBLE: + push(DOUBLE); + push(TOP); + break; + case ClassWriter.CLASS: + push(OBJECT | cw.addType("java/lang/Class")); + break; + case ClassWriter.STR: + push(OBJECT | cw.addType("java/lang/String")); + break; + case ClassWriter.MTYPE: + push(OBJECT | cw.addType("java/lang/invoke/MethodType")); + break; + // case ClassWriter.HANDLE_BASE + [1..9]: + default: + push(OBJECT | cw.addType("java/lang/invoke/MethodHandle")); + } + break; + case Opcodes.ALOAD: + push(get(arg)); + break; + case Opcodes.IALOAD: + case Opcodes.BALOAD: + case Opcodes.CALOAD: + case Opcodes.SALOAD: + pop(2); + push(INTEGER); + break; + case Opcodes.LALOAD: + case Opcodes.D2L: + pop(2); + push(LONG); + push(TOP); + break; + case Opcodes.FALOAD: + pop(2); + push(FLOAT); + break; + case Opcodes.DALOAD: + case Opcodes.L2D: + pop(2); + push(DOUBLE); + push(TOP); + break; + case Opcodes.AALOAD: + pop(1); + t1 = pop(); + push(ELEMENT_OF + t1); + break; + case Opcodes.ISTORE: + case Opcodes.FSTORE: + case Opcodes.ASTORE: + t1 = pop(); + set(arg, t1); + if (arg > 0) { + t2 = get(arg - 1); + // if t2 is of kind STACK or LOCAL we cannot know its size! + if (t2 == LONG || t2 == DOUBLE) { + set(arg - 1, TOP); + } else if ((t2 & KIND) != BASE) { + set(arg - 1, t2 | TOP_IF_LONG_OR_DOUBLE); + } + } + break; + case Opcodes.LSTORE: + case Opcodes.DSTORE: + pop(1); + t1 = pop(); + set(arg, t1); + set(arg + 1, TOP); + if (arg > 0) { + t2 = get(arg - 1); + // if t2 is of kind STACK or LOCAL we cannot know its size! + if (t2 == LONG || t2 == DOUBLE) { + set(arg - 1, TOP); + } else if ((t2 & KIND) != BASE) { + set(arg - 1, t2 | TOP_IF_LONG_OR_DOUBLE); + } + } + break; + case Opcodes.IASTORE: + case Opcodes.BASTORE: + case Opcodes.CASTORE: + case Opcodes.SASTORE: + case Opcodes.FASTORE: + case Opcodes.AASTORE: + pop(3); + break; + case Opcodes.LASTORE: + case Opcodes.DASTORE: + pop(4); + break; + case Opcodes.POP: + case Opcodes.IFEQ: + case Opcodes.IFNE: + case Opcodes.IFLT: + case Opcodes.IFGE: + case Opcodes.IFGT: + case Opcodes.IFLE: + case Opcodes.IRETURN: + case Opcodes.FRETURN: + case Opcodes.ARETURN: + case Opcodes.TABLESWITCH: + case Opcodes.LOOKUPSWITCH: + case Opcodes.ATHROW: + case Opcodes.MONITORENTER: + case Opcodes.MONITOREXIT: + case Opcodes.IFNULL: + case Opcodes.IFNONNULL: + pop(1); + break; + case Opcodes.POP2: + case Opcodes.IF_ICMPEQ: + case Opcodes.IF_ICMPNE: + case Opcodes.IF_ICMPLT: + case Opcodes.IF_ICMPGE: + case Opcodes.IF_ICMPGT: + case Opcodes.IF_ICMPLE: + case Opcodes.IF_ACMPEQ: + case Opcodes.IF_ACMPNE: + case Opcodes.LRETURN: + case Opcodes.DRETURN: + pop(2); + break; + case Opcodes.DUP: + t1 = pop(); + push(t1); + push(t1); + break; + case Opcodes.DUP_X1: + t1 = pop(); + t2 = pop(); + push(t1); + push(t2); + push(t1); + break; + case Opcodes.DUP_X2: + t1 = pop(); + t2 = pop(); + t3 = pop(); + push(t1); + push(t3); + push(t2); + push(t1); + break; + case Opcodes.DUP2: + t1 = pop(); + t2 = pop(); + push(t2); + push(t1); + push(t2); + push(t1); + break; + case Opcodes.DUP2_X1: + t1 = pop(); + t2 = pop(); + t3 = pop(); + push(t2); + push(t1); + push(t3); + push(t2); + push(t1); + break; + case Opcodes.DUP2_X2: + t1 = pop(); + t2 = pop(); + t3 = pop(); + t4 = pop(); + push(t2); + push(t1); + push(t4); + push(t3); + push(t2); + push(t1); + break; + case Opcodes.SWAP: + t1 = pop(); + t2 = pop(); + push(t1); + push(t2); + break; + case Opcodes.IADD: + case Opcodes.ISUB: + case Opcodes.IMUL: + case Opcodes.IDIV: + case Opcodes.IREM: + case Opcodes.IAND: + case Opcodes.IOR: + case Opcodes.IXOR: + case Opcodes.ISHL: + case Opcodes.ISHR: + case Opcodes.IUSHR: + case Opcodes.L2I: + case Opcodes.D2I: + case Opcodes.FCMPL: + case Opcodes.FCMPG: + pop(2); + push(INTEGER); + break; + case Opcodes.LADD: + case Opcodes.LSUB: + case Opcodes.LMUL: + case Opcodes.LDIV: + case Opcodes.LREM: + case Opcodes.LAND: + case Opcodes.LOR: + case Opcodes.LXOR: + pop(4); + push(LONG); + push(TOP); + break; + case Opcodes.FADD: + case Opcodes.FSUB: + case Opcodes.FMUL: + case Opcodes.FDIV: + case Opcodes.FREM: + case Opcodes.L2F: + case Opcodes.D2F: + pop(2); + push(FLOAT); + break; + case Opcodes.DADD: + case Opcodes.DSUB: + case Opcodes.DMUL: + case Opcodes.DDIV: + case Opcodes.DREM: + pop(4); + push(DOUBLE); + push(TOP); + break; + case Opcodes.LSHL: + case Opcodes.LSHR: + case Opcodes.LUSHR: + pop(3); + push(LONG); + push(TOP); + break; + case Opcodes.IINC: + set(arg, INTEGER); + break; + case Opcodes.I2L: + case Opcodes.F2L: + pop(1); + push(LONG); + push(TOP); + break; + case Opcodes.I2F: + pop(1); + push(FLOAT); + break; + case Opcodes.I2D: + case Opcodes.F2D: + pop(1); + push(DOUBLE); + push(TOP); + break; + case Opcodes.F2I: + case Opcodes.ARRAYLENGTH: + case Opcodes.INSTANCEOF: + pop(1); + push(INTEGER); + break; + case Opcodes.LCMP: + case Opcodes.DCMPL: + case Opcodes.DCMPG: + pop(4); + push(INTEGER); + break; + case Opcodes.JSR: + case Opcodes.RET: + throw new RuntimeException( + "JSR/RET are not supported with computeFrames option"); + case Opcodes.GETSTATIC: + push(cw, item.strVal3); + break; + case Opcodes.PUTSTATIC: + pop(item.strVal3); + break; + case Opcodes.GETFIELD: + pop(1); + push(cw, item.strVal3); + break; + case Opcodes.PUTFIELD: + pop(item.strVal3); + pop(); + break; + case Opcodes.INVOKEVIRTUAL: + case Opcodes.INVOKESPECIAL: + case Opcodes.INVOKESTATIC: + case Opcodes.INVOKEINTERFACE: + pop(item.strVal3); + if (opcode != Opcodes.INVOKESTATIC) { + t1 = pop(); + if (opcode == Opcodes.INVOKESPECIAL + && item.strVal2.charAt(0) == '<') { + init(t1); + } + } + push(cw, item.strVal3); + break; + case Opcodes.INVOKEDYNAMIC: + pop(item.strVal2); + push(cw, item.strVal2); + break; + case Opcodes.NEW: + push(UNINITIALIZED | cw.addUninitializedType(item.strVal1, arg)); + break; + case Opcodes.NEWARRAY: + pop(); + switch (arg) { + case Opcodes.T_BOOLEAN: + push(ARRAY_OF | BOOLEAN); + break; + case Opcodes.T_CHAR: + push(ARRAY_OF | CHAR); + break; + case Opcodes.T_BYTE: + push(ARRAY_OF | BYTE); + break; + case Opcodes.T_SHORT: + push(ARRAY_OF | SHORT); + break; + case Opcodes.T_INT: + push(ARRAY_OF | INTEGER); + break; + case Opcodes.T_FLOAT: + push(ARRAY_OF | FLOAT); + break; + case Opcodes.T_DOUBLE: + push(ARRAY_OF | DOUBLE); + break; + // case Opcodes.T_LONG: + default: + push(ARRAY_OF | LONG); + break; + } + break; + case Opcodes.ANEWARRAY: + String s = item.strVal1; + pop(); + if (s.charAt(0) == '[') { + push(cw, '[' + s); + } else { + push(ARRAY_OF | OBJECT | cw.addType(s)); + } + break; + case Opcodes.CHECKCAST: + s = item.strVal1; + pop(); + if (s.charAt(0) == '[') { + push(cw, s); + } else { + push(OBJECT | cw.addType(s)); + } + break; + // case Opcodes.MULTIANEWARRAY: + default: + pop(arg); + push(cw, item.strVal1); + break; + } + } + + /** + * Merges the input frame of the given basic block with the input and output + * frames of this basic block. Returns true if the input frame of + * the given label has been changed by this operation. + * + * @param cw + * the ClassWriter to which this label belongs. + * @param frame + * the basic block whose input frame must be updated. + * @param edge + * the kind of the {@link Edge} between this label and 'label'. + * See {@link Edge#info}. + * @return true if the input frame of the given label has been + * changed by this operation. + */ + boolean merge(final ClassWriter cw, final Frame frame, final int edge) { + boolean changed = false; + int i, s, dim, kind, t; + + int nLocal = inputLocals.length; + int nStack = inputStack.length; + if (frame.inputLocals == null) { + frame.inputLocals = new int[nLocal]; + changed = true; + } + + for (i = 0; i < nLocal; ++i) { + if (outputLocals != null && i < outputLocals.length) { + s = outputLocals[i]; + if (s == 0) { + t = inputLocals[i]; + } else { + dim = s & DIM; + kind = s & KIND; + if (kind == BASE) { + t = s; + } else { + if (kind == LOCAL) { + t = dim + inputLocals[s & VALUE]; + } else { + t = dim + inputStack[nStack - (s & VALUE)]; + } + if ((s & TOP_IF_LONG_OR_DOUBLE) != 0 + && (t == LONG || t == DOUBLE)) { + t = TOP; + } + } + } + } else { + t = inputLocals[i]; + } + if (initializations != null) { + t = init(cw, t); + } + changed |= merge(cw, t, frame.inputLocals, i); + } + + if (edge > 0) { + for (i = 0; i < nLocal; ++i) { + t = inputLocals[i]; + changed |= merge(cw, t, frame.inputLocals, i); + } + if (frame.inputStack == null) { + frame.inputStack = new int[1]; + changed = true; + } + changed |= merge(cw, edge, frame.inputStack, 0); + return changed; + } + + int nInputStack = inputStack.length + owner.inputStackTop; + if (frame.inputStack == null) { + frame.inputStack = new int[nInputStack + outputStackTop]; + changed = true; + } + + for (i = 0; i < nInputStack; ++i) { + t = inputStack[i]; + if (initializations != null) { + t = init(cw, t); + } + changed |= merge(cw, t, frame.inputStack, i); + } + for (i = 0; i < outputStackTop; ++i) { + s = outputStack[i]; + dim = s & DIM; + kind = s & KIND; + if (kind == BASE) { + t = s; + } else { + if (kind == LOCAL) { + t = dim + inputLocals[s & VALUE]; + } else { + t = dim + inputStack[nStack - (s & VALUE)]; + } + if ((s & TOP_IF_LONG_OR_DOUBLE) != 0 + && (t == LONG || t == DOUBLE)) { + t = TOP; + } + } + if (initializations != null) { + t = init(cw, t); + } + changed |= merge(cw, t, frame.inputStack, nInputStack + i); + } + return changed; + } + + /** + * Merges the type at the given index in the given type array with the given + * type. Returns true if the type array has been modified by this + * operation. + * + * @param cw + * the ClassWriter to which this label belongs. + * @param t + * the type with which the type array element must be merged. + * @param types + * an array of types. + * @param index + * the index of the type that must be merged in 'types'. + * @return true if the type array has been modified by this + * operation. + */ + private static boolean merge(final ClassWriter cw, int t, + final int[] types, final int index) { + int u = types[index]; + if (u == t) { + // if the types are equal, merge(u,t)=u, so there is no change + return false; + } + if ((t & ~DIM) == NULL) { + if (u == NULL) { + return false; + } + t = NULL; + } + if (u == 0) { + // if types[index] has never been assigned, merge(u,t)=t + types[index] = t; + return true; + } + int v; + if ((u & BASE_KIND) == OBJECT || (u & DIM) != 0) { + // if u is a reference type of any dimension + if (t == NULL) { + // if t is the NULL type, merge(u,t)=u, so there is no change + return false; + } else if ((t & (DIM | BASE_KIND)) == (u & (DIM | BASE_KIND))) { + // if t and u have the same dimension and same base kind + if ((u & BASE_KIND) == OBJECT) { + // if t is also a reference type, and if u and t have the + // same dimension merge(u,t) = dim(t) | common parent of the + // element types of u and t + v = (t & DIM) | OBJECT + | cw.getMergedType(t & BASE_VALUE, u & BASE_VALUE); + } else { + // if u and t are array types, but not with the same element + // type, merge(u,t) = dim(u) - 1 | java/lang/Object + int vdim = ELEMENT_OF + (u & DIM); + v = vdim | OBJECT | cw.addType("java/lang/Object"); + } + } else if ((t & BASE_KIND) == OBJECT || (t & DIM) != 0) { + // if t is any other reference or array type, the merged type + // is min(udim, tdim) | java/lang/Object, where udim is the + // array dimension of u, minus 1 if u is an array type with a + // primitive element type (and similarly for tdim). + int tdim = (((t & DIM) == 0 || (t & BASE_KIND) == OBJECT) ? 0 + : ELEMENT_OF) + (t & DIM); + int udim = (((u & DIM) == 0 || (u & BASE_KIND) == OBJECT) ? 0 + : ELEMENT_OF) + (u & DIM); + v = Math.min(tdim, udim) | OBJECT + | cw.addType("java/lang/Object"); + } else { + // if t is any other type, merge(u,t)=TOP + v = TOP; + } + } else if (u == NULL) { + // if u is the NULL type, merge(u,t)=t, + // or TOP if t is not a reference type + v = (t & BASE_KIND) == OBJECT || (t & DIM) != 0 ? t : TOP; + } else { + // if u is any other type, merge(u,t)=TOP whatever t + v = TOP; + } + if (u != v) { + types[index] = v; + return true; + } + return false; + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Handle.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Handle.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Handle.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Handle.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,170 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.objectweb.asm; + +/** + * A reference to a field or a method. + * + * @author Remi Forax + * @author Eric Bruneton + */ +public final class Handle { + + /** + * The kind of field or method designated by this Handle. Should be + * {@link Opcodes#H_GETFIELD}, {@link Opcodes#H_GETSTATIC}, + * {@link Opcodes#H_PUTFIELD}, {@link Opcodes#H_PUTSTATIC}, + * {@link Opcodes#H_INVOKEVIRTUAL}, {@link Opcodes#H_INVOKESTATIC}, + * {@link Opcodes#H_INVOKESPECIAL}, {@link Opcodes#H_NEWINVOKESPECIAL} or + * {@link Opcodes#H_INVOKEINTERFACE}. + */ + final int tag; + + /** + * The internal name of the class that owns the field or method designated + * by this handle. + */ + final String owner; + + /** + * The name of the field or method designated by this handle. + */ + final String name; + + /** + * The descriptor of the field or method designated by this handle. + */ + final String desc; + + /** + * Constructs a new field or method handle. + * + * @param tag + * the kind of field or method designated by this Handle. Must be + * {@link Opcodes#H_GETFIELD}, {@link Opcodes#H_GETSTATIC}, + * {@link Opcodes#H_PUTFIELD}, {@link Opcodes#H_PUTSTATIC}, + * {@link Opcodes#H_INVOKEVIRTUAL}, + * {@link Opcodes#H_INVOKESTATIC}, + * {@link Opcodes#H_INVOKESPECIAL}, + * {@link Opcodes#H_NEWINVOKESPECIAL} or + * {@link Opcodes#H_INVOKEINTERFACE}. + * @param owner + * the internal name of the class that owns the field or method + * designated by this handle. + * @param name + * the name of the field or method designated by this handle. + * @param desc + * the descriptor of the field or method designated by this + * handle. + */ + public Handle(int tag, String owner, String name, String desc) { + this.tag = tag; + this.owner = owner; + this.name = name; + this.desc = desc; + } + + /** + * Returns the kind of field or method designated by this handle. + * + * @return {@link Opcodes#H_GETFIELD}, {@link Opcodes#H_GETSTATIC}, + * {@link Opcodes#H_PUTFIELD}, {@link Opcodes#H_PUTSTATIC}, + * {@link Opcodes#H_INVOKEVIRTUAL}, {@link Opcodes#H_INVOKESTATIC}, + * {@link Opcodes#H_INVOKESPECIAL}, + * {@link Opcodes#H_NEWINVOKESPECIAL} or + * {@link Opcodes#H_INVOKEINTERFACE}. + */ + public int getTag() { + return tag; + } + + /** + * Returns the internal name of the class that owns the field or method + * designated by this handle. + * + * @return the internal name of the class that owns the field or method + * designated by this handle. + */ + public String getOwner() { + return owner; + } + + /** + * Returns the name of the field or method designated by this handle. + * + * @return the name of the field or method designated by this handle. + */ + public String getName() { + return name; + } + + /** + * Returns the descriptor of the field or method designated by this handle. + * + * @return the descriptor of the field or method designated by this handle. + */ + public String getDesc() { + return desc; + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof Handle)) { + return false; + } + Handle h = (Handle) obj; + return tag == h.tag && owner.equals(h.owner) && name.equals(h.name) + && desc.equals(h.desc); + } + + @Override + public int hashCode() { + return tag + owner.hashCode() * name.hashCode() * desc.hashCode(); + } + + /** + * Returns the textual representation of this handle. The textual + * representation is: + * + * 
+     * owner '.' name desc ' ' '(' tag ')'
+     *
+ * + * . As this format is unambiguous, it can be parsed if necessary. + */ + @Override + public String toString() { + return owner + '.' + name + desc + " (" + tag + ')'; + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Handler.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Handler.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Handler.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Handler.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,121 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * Information about an exception handler block. + * + * @author Eric Bruneton + */ +class Handler { + + /** + * Beginning of the exception handler's scope (inclusive). + */ + Label start; + + /** + * End of the exception handler's scope (exclusive). + */ + Label end; + + /** + * Beginning of the exception handler's code. + */ + Label handler; + + /** + * Internal name of the type of exceptions handled by this handler, or + * null to catch any exceptions. + */ + String desc; + + /** + * Constant pool index of the internal name of the type of exceptions + * handled by this handler, or 0 to catch any exceptions. + */ + int type; + + /** + * Next exception handler block info. + */ + Handler next; + + /** + * Removes the range between start and end from the given exception + * handlers. + * + * @param h + * an exception handler list. + * @param start + * the start of the range to be removed. + * @param end + * the end of the range to be removed. Maybe null. + * @return the exception handler list with the start-end range removed. + */ + static Handler remove(Handler h, Label start, Label end) { + if (h == null) { + return null; + } else { + h.next = remove(h.next, start, end); + } + int hstart = h.start.position; + int hend = h.end.position; + int s = start.position; + int e = end == null ? Integer.MAX_VALUE : end.position; + // if [hstart,hend[ and [s,e[ intervals intersect... + if (s < hend && e > hstart) { + if (s <= hstart) { + if (e >= hend) { + // [hstart,hend[ fully included in [s,e[, h removed + h = h.next; + } else { + // [hstart,hend[ minus [s,e[ = [e,hend[ + h.start = end; + } + } else if (e >= hend) { + // [hstart,hend[ minus [s,e[ = [hstart,s[ + h.end = start; + } else { + // [hstart,hend[ minus [s,e[ = [hstart,s[ + [e,hend[ + Handler g = new Handler(); + g.start = end; + g.end = h.end; + g.handler = h.handler; + g.desc = h.desc; + g.type = h.type; + g.next = h.next; + h.end = start; + h.next = g; + } + } + return h; + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Item.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Item.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Item.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Item.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,313 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * A constant pool item. Constant pool items can be created with the 'newXXX' + * methods in the {@link ClassWriter} class. + * + * @author Eric Bruneton + */ +final class Item { + + /** + * Index of this item in the constant pool. + */ + int index; + + /** + * Type of this constant pool item. A single class is used to represent all + * constant pool item types, in order to minimize the bytecode size of this + * package. The value of this field is one of {@link ClassWriter#INT}, + * {@link ClassWriter#LONG}, {@link ClassWriter#FLOAT}, + * {@link ClassWriter#DOUBLE}, {@link ClassWriter#UTF8}, + * {@link ClassWriter#STR}, {@link ClassWriter#CLASS}, + * {@link ClassWriter#NAME_TYPE}, {@link ClassWriter#FIELD}, + * {@link ClassWriter#METH}, {@link ClassWriter#IMETH}, + * {@link ClassWriter#MTYPE}, {@link ClassWriter#INDY}. + * + * MethodHandle constant 9 variations are stored using a range of 9 values + * from {@link ClassWriter#HANDLE_BASE} + 1 to + * {@link ClassWriter#HANDLE_BASE} + 9. + * + * Special Item types are used for Items that are stored in the ClassWriter + * {@link ClassWriter#typeTable}, instead of the constant pool, in order to + * avoid clashes with normal constant pool items in the ClassWriter constant + * pool's hash table. These special item types are + * {@link ClassWriter#TYPE_NORMAL}, {@link ClassWriter#TYPE_UNINIT} and + * {@link ClassWriter#TYPE_MERGED}. + */ + int type; + + /** + * Value of this item, for an integer item. + */ + int intVal; + + /** + * Value of this item, for a long item. + */ + long longVal; + + /** + * First part of the value of this item, for items that do not hold a + * primitive value. + */ + String strVal1; + + /** + * Second part of the value of this item, for items that do not hold a + * primitive value. + */ + String strVal2; + + /** + * Third part of the value of this item, for items that do not hold a + * primitive value. + */ + String strVal3; + + /** + * The hash code value of this constant pool item. + */ + int hashCode; + + /** + * Link to another constant pool item, used for collision lists in the + * constant pool's hash table. + */ + Item next; + + /** + * Constructs an uninitialized {@link Item}. + */ + Item() { + } + + /** + * Constructs an uninitialized {@link Item} for constant pool element at + * given position. + * + * @param index + * index of the item to be constructed. + */ + Item(final int index) { + this.index = index; + } + + /** + * Constructs a copy of the given item. + * + * @param index + * index of the item to be constructed. + * @param i + * the item that must be copied into the item to be constructed. + */ + Item(final int index, final Item i) { + this.index = index; + type = i.type; + intVal = i.intVal; + longVal = i.longVal; + strVal1 = i.strVal1; + strVal2 = i.strVal2; + strVal3 = i.strVal3; + hashCode = i.hashCode; + } + + /** + * Sets this item to an integer item. + * + * @param intVal + * the value of this item. + */ + void set(final int intVal) { + this.type = ClassWriter.INT; + this.intVal = intVal; + this.hashCode = 0x7FFFFFFF & (type + intVal); + } + + /** + * Sets this item to a long item. + * + * @param longVal + * the value of this item. + */ + void set(final long longVal) { + this.type = ClassWriter.LONG; + this.longVal = longVal; + this.hashCode = 0x7FFFFFFF & (type + (int) longVal); + } + + /** + * Sets this item to a float item. + * + * @param floatVal + * the value of this item. + */ + void set(final float floatVal) { + this.type = ClassWriter.FLOAT; + this.intVal = Float.floatToRawIntBits(floatVal); + this.hashCode = 0x7FFFFFFF & (type + (int) floatVal); + } + + /** + * Sets this item to a double item. + * + * @param doubleVal + * the value of this item. + */ + void set(final double doubleVal) { + this.type = ClassWriter.DOUBLE; + this.longVal = Double.doubleToRawLongBits(doubleVal); + this.hashCode = 0x7FFFFFFF & (type + (int) doubleVal); + } + + /** + * Sets this item to an item that do not hold a primitive value. + * + * @param type + * the type of this item. + * @param strVal1 + * first part of the value of this item. + * @param strVal2 + * second part of the value of this item. + * @param strVal3 + * third part of the value of this item. + */ + @SuppressWarnings("fallthrough") + void set(final int type, final String strVal1, final String strVal2, + final String strVal3) { + this.type = type; + this.strVal1 = strVal1; + this.strVal2 = strVal2; + this.strVal3 = strVal3; + switch (type) { + case ClassWriter.CLASS: + this.intVal = 0; // intVal of a class must be zero, see visitInnerClass + case ClassWriter.UTF8: + case ClassWriter.STR: + case ClassWriter.MTYPE: + case ClassWriter.TYPE_NORMAL: + hashCode = 0x7FFFFFFF & (type + strVal1.hashCode()); + return; + case ClassWriter.NAME_TYPE: { + hashCode = 0x7FFFFFFF & (type + strVal1.hashCode() + * strVal2.hashCode()); + return; + } + // ClassWriter.FIELD: + // ClassWriter.METH: + // ClassWriter.IMETH: + // ClassWriter.HANDLE_BASE + 1..9 + default: + hashCode = 0x7FFFFFFF & (type + strVal1.hashCode() + * strVal2.hashCode() * strVal3.hashCode()); + } + } + + /** + * Sets the item to an InvokeDynamic item. + * + * @param name + * invokedynamic's name. + * @param desc + * invokedynamic's desc. + * @param bsmIndex + * zero based index into the class attribute BootrapMethods. + */ + void set(String name, String desc, int bsmIndex) { + this.type = ClassWriter.INDY; + this.longVal = bsmIndex; + this.strVal1 = name; + this.strVal2 = desc; + this.hashCode = 0x7FFFFFFF & (ClassWriter.INDY + bsmIndex + * strVal1.hashCode() * strVal2.hashCode()); + } + + /** + * Sets the item to a BootstrapMethod item. + * + * @param position + * position in byte in the class attribute BootrapMethods. + * @param hashCode + * hashcode of the item. This hashcode is processed from the + * hashcode of the bootstrap method and the hashcode of all + * bootstrap arguments. + */ + void set(int position, int hashCode) { + this.type = ClassWriter.BSM; + this.intVal = position; + this.hashCode = hashCode; + } + + /** + * Indicates if the given item is equal to this one. This method assumes + * that the two items have the same {@link #type}. + * + * @param i + * the item to be compared to this one. Both items must have the + * same {@link #type}. + * @return true if the given item if equal to this one, + * false otherwise. + */ + boolean isEqualTo(final Item i) { + switch (type) { + case ClassWriter.UTF8: + case ClassWriter.STR: + case ClassWriter.CLASS: + case ClassWriter.MTYPE: + case ClassWriter.TYPE_NORMAL: + return i.strVal1.equals(strVal1); + case ClassWriter.TYPE_MERGED: + case ClassWriter.LONG: + case ClassWriter.DOUBLE: + return i.longVal == longVal; + case ClassWriter.INT: + case ClassWriter.FLOAT: + return i.intVal == intVal; + case ClassWriter.TYPE_UNINIT: + return i.intVal == intVal && i.strVal1.equals(strVal1); + case ClassWriter.NAME_TYPE: + return i.strVal1.equals(strVal1) && i.strVal2.equals(strVal2); + case ClassWriter.INDY: { + return i.longVal == longVal && i.strVal1.equals(strVal1) + && i.strVal2.equals(strVal2); + } + // case ClassWriter.FIELD: + // case ClassWriter.METH: + // case ClassWriter.IMETH: + // case ClassWriter.HANDLE_BASE + 1..9 + default: + return i.strVal1.equals(strVal1) && i.strVal2.equals(strVal2) + && i.strVal3.equals(strVal3); + } + } + +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Label.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Label.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Label.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Label.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,565 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * A label represents a position in the bytecode of a method. Labels are used + * for jump, goto, and switch instructions, and for try catch blocks. A label + * designates the instruction that is just after. Note however that there + * can be other elements between a label and the instruction it designates (such + * as other labels, stack map frames, line numbers, etc.). + * + * @author Eric Bruneton + */ +public class Label { + + /** + * Indicates if this label is only used for debug attributes. Such a label + * is not the start of a basic block, the target of a jump instruction, or + * an exception handler. It can be safely ignored in control flow graph + * analysis algorithms (for optimization purposes). + */ + static final int DEBUG = 1; + + /** + * Indicates if the position of this label is known. + */ + static final int RESOLVED = 2; + + /** + * Indicates if this label has been updated, after instruction resizing. + */ + static final int RESIZED = 4; + + /** + * Indicates if this basic block has been pushed in the basic block stack. + * See {@link MethodWriter#visitMaxs visitMaxs}. + */ + static final int PUSHED = 8; + + /** + * Indicates if this label is the target of a jump instruction, or the start + * of an exception handler. + */ + static final int TARGET = 16; + + /** + * Indicates if a stack map frame must be stored for this label. + */ + static final int STORE = 32; + + /** + * Indicates if this label corresponds to a reachable basic block. + */ + static final int REACHABLE = 64; + + /** + * Indicates if this basic block ends with a JSR instruction. + */ + static final int JSR = 128; + + /** + * Indicates if this basic block ends with a RET instruction. + */ + static final int RET = 256; + + /** + * Indicates if this basic block is the start of a subroutine. + */ + static final int SUBROUTINE = 512; + + /** + * Indicates if this subroutine basic block has been visited by a + * visitSubroutine(null, ...) call. + */ + static final int VISITED = 1024; + + /** + * Indicates if this subroutine basic block has been visited by a + * visitSubroutine(!null, ...) call. + */ + static final int VISITED2 = 2048; + + /** + * Field used to associate user information to a label. Warning: this field + * is used by the ASM tree package. In order to use it with the ASM tree + * package you must override the + * {@link org.objectweb.asm.tree.MethodNode#getLabelNode} method. + */ + public Object info; + + /** + * Flags that indicate the status of this label. + * + * @see #DEBUG + * @see #RESOLVED + * @see #RESIZED + * @see #PUSHED + * @see #TARGET + * @see #STORE + * @see #REACHABLE + * @see #JSR + * @see #RET + */ + int status; + + /** + * The line number corresponding to this label, if known. If there are + * several lines, each line is stored in a separate label, all linked via + * their next field (these links are created in ClassReader and removed just + * before visitLabel is called, so that this does not impact the rest of the + * code). + */ + int line; + + /** + * The position of this label in the code, if known. + */ + int position; + + /** + * Number of forward references to this label, times two. + */ + private int referenceCount; + + /** + * Informations about forward references. Each forward reference is + * described by two consecutive integers in this array: the first one is the + * position of the first byte of the bytecode instruction that contains the + * forward reference, while the second is the position of the first byte of + * the forward reference itself. In fact the sign of the first integer + * indicates if this reference uses 2 or 4 bytes, and its absolute value + * gives the position of the bytecode instruction. This array is also used + * as a bitset to store the subroutines to which a basic block belongs. This + * information is needed in {@linked MethodWriter#visitMaxs}, after all + * forward references have been resolved. Hence the same array can be used + * for both purposes without problems. + */ + private int[] srcAndRefPositions; + + // ------------------------------------------------------------------------ + + /* + * Fields for the control flow and data flow graph analysis algorithms (used + * to compute the maximum stack size or the stack map frames). A control + * flow graph contains one node per "basic block", and one edge per "jump" + * from one basic block to another. Each node (i.e., each basic block) is + * represented by the Label object that corresponds to the first instruction + * of this basic block. Each node also stores the list of its successors in + * the graph, as a linked list of Edge objects. + * + * The control flow analysis algorithms used to compute the maximum stack + * size or the stack map frames are similar and use two steps. The first + * step, during the visit of each instruction, builds information about the + * state of the local variables and the operand stack at the end of each + * basic block, called the "output frame", relatively to the frame + * state at the beginning of the basic block, which is called the "input + * frame", and which is unknown during this step. The second step, in + * {@link MethodWriter#visitMaxs}, is a fix point algorithm that computes + * information about the input frame of each basic block, from the input + * state of the first basic block (known from the method signature), and by + * the using the previously computed relative output frames. + * + * The algorithm used to compute the maximum stack size only computes the + * relative output and absolute input stack heights, while the algorithm + * used to compute stack map frames computes relative output frames and + * absolute input frames. + */ + + /** + * Start of the output stack relatively to the input stack. The exact + * semantics of this field depends on the algorithm that is used. + * + * When only the maximum stack size is computed, this field is the number of + * elements in the input stack. + * + * When the stack map frames are completely computed, this field is the + * offset of the first output stack element relatively to the top of the + * input stack. This offset is always negative or null. A null offset means + * that the output stack must be appended to the input stack. A -n offset + * means that the first n output stack elements must replace the top n input + * stack elements, and that the other elements must be appended to the input + * stack. + */ + int inputStackTop; + + /** + * Maximum height reached by the output stack, relatively to the top of the + * input stack. This maximum is always positive or null. + */ + int outputStackMax; + + /** + * Information about the input and output stack map frames of this basic + * block. This field is only used when {@link ClassWriter#COMPUTE_FRAMES} + * option is used. + */ + Frame frame; + + /** + * The successor of this label, in the order they are visited. This linked + * list does not include labels used for debug info only. If + * {@link ClassWriter#COMPUTE_FRAMES} option is used then, in addition, it + * does not contain successive labels that denote the same bytecode position + * (in this case only the first label appears in this list). + */ + Label successor; + + /** + * The successors of this node in the control flow graph. These successors + * are stored in a linked list of {@link Edge Edge} objects, linked to each + * other by their {@link Edge#next} field. + */ + Edge successors; + + /** + * The next basic block in the basic block stack. This stack is used in the + * main loop of the fix point algorithm used in the second step of the + * control flow analysis algorithms. It is also used in + * {@link #visitSubroutine} to avoid using a recursive method, and in + * ClassReader to temporarily store multiple source lines for a label. + * + * @see MethodWriter#visitMaxs + */ + Label next; + + // ------------------------------------------------------------------------ + // Constructor + // ------------------------------------------------------------------------ + + /** + * Constructs a new label. + */ + public Label() { + } + + // ------------------------------------------------------------------------ + // Methods to compute offsets and to manage forward references + // ------------------------------------------------------------------------ + + /** + * Returns the offset corresponding to this label. This offset is computed + * from the start of the method's bytecode. This method is intended for + * {@link Attribute} sub classes, and is normally not needed by class + * generators or adapters. + * + * @return the offset corresponding to this label. + * @throws IllegalStateException + * if this label is not resolved yet. + */ + public int getOffset() { + if ((status & RESOLVED) == 0) { + throw new IllegalStateException( + "Label offset position has not been resolved yet"); + } + return position; + } + + /** + * Puts a reference to this label in the bytecode of a method. If the + * position of the label is known, the offset is computed and written + * directly. Otherwise, a null offset is written and a new forward reference + * is declared for this label. + * + * @param owner + * the code writer that calls this method. + * @param out + * the bytecode of the method. + * @param source + * the position of first byte of the bytecode instruction that + * contains this label. + * @param wideOffset + * true if the reference must be stored in 4 bytes, or + * false if it must be stored with 2 bytes. + * @throws IllegalArgumentException + * if this label has not been created by the given code writer. + */ + void put(final MethodWriter owner, final ByteVector out, final int source, + final boolean wideOffset) { + if ((status & RESOLVED) == 0) { + if (wideOffset) { + addReference(-1 - source, out.length); + out.putInt(-1); + } else { + addReference(source, out.length); + out.putShort(-1); + } + } else { + if (wideOffset) { + out.putInt(position - source); + } else { + out.putShort(position - source); + } + } + } + + /** + * Adds a forward reference to this label. This method must be called only + * for a true forward reference, i.e. only if this label is not resolved + * yet. For backward references, the offset of the reference can be, and + * must be, computed and stored directly. + * + * @param sourcePosition + * the position of the referencing instruction. This position + * will be used to compute the offset of this forward reference. + * @param referencePosition + * the position where the offset for this forward reference must + * be stored. + */ + private void addReference(final int sourcePosition, + final int referencePosition) { + if (srcAndRefPositions == null) { + srcAndRefPositions = new int[6]; + } + if (referenceCount >= srcAndRefPositions.length) { + int[] a = new int[srcAndRefPositions.length + 6]; + System.arraycopy(srcAndRefPositions, 0, a, 0, + srcAndRefPositions.length); + srcAndRefPositions = a; + } + srcAndRefPositions[referenceCount++] = sourcePosition; + srcAndRefPositions[referenceCount++] = referencePosition; + } + + /** + * Resolves all forward references to this label. This method must be called + * when this label is added to the bytecode of the method, i.e. when its + * position becomes known. This method fills in the blanks that where left + * in the bytecode by each forward reference previously added to this label. + * + * @param owner + * the code writer that calls this method. + * @param position + * the position of this label in the bytecode. + * @param data + * the bytecode of the method. + * @return true if a blank that was left for this label was to + * small to store the offset. In such a case the corresponding jump + * instruction is replaced with a pseudo instruction (using unused + * opcodes) using an unsigned two bytes offset. These pseudo + * instructions will need to be replaced with true instructions with + * wider offsets (4 bytes instead of 2). This is done in + * {@link MethodWriter#resizeInstructions}. + * @throws IllegalArgumentException + * if this label has already been resolved, or if it has not + * been created by the given code writer. + */ + boolean resolve(final MethodWriter owner, final int position, + final byte[] data) { + boolean needUpdate = false; + this.status |= RESOLVED; + this.position = position; + int i = 0; + while (i < referenceCount) { + int source = srcAndRefPositions[i++]; + int reference = srcAndRefPositions[i++]; + int offset; + if (source >= 0) { + offset = position - source; + if (offset < Short.MIN_VALUE || offset > Short.MAX_VALUE) { + /* + * changes the opcode of the jump instruction, in order to + * be able to find it later (see resizeInstructions in + * MethodWriter). These temporary opcodes are similar to + * jump instruction opcodes, except that the 2 bytes offset + * is unsigned (and can therefore represent values from 0 to + * 65535, which is sufficient since the size of a method is + * limited to 65535 bytes). + */ + int opcode = data[reference - 1] & 0xFF; + if (opcode <= Opcodes.JSR) { + // changes IFEQ ... JSR to opcodes 202 to 217 + data[reference - 1] = (byte) (opcode + 49); + } else { + // changes IFNULL and IFNONNULL to opcodes 218 and 219 + data[reference - 1] = (byte) (opcode + 20); + } + needUpdate = true; + } + data[reference++] = (byte) (offset >>> 8); + data[reference] = (byte) offset; + } else { + offset = position + source + 1; + data[reference++] = (byte) (offset >>> 24); + data[reference++] = (byte) (offset >>> 16); + data[reference++] = (byte) (offset >>> 8); + data[reference] = (byte) offset; + } + } + return needUpdate; + } + + /** + * Returns the first label of the series to which this label belongs. For an + * isolated label or for the first label in a series of successive labels, + * this method returns the label itself. For other labels it returns the + * first label of the series. + * + * @return the first label of the series to which this label belongs. + */ + Label getFirst() { + return !ClassReader.FRAMES || frame == null ? this : frame.owner; + } + + // ------------------------------------------------------------------------ + // Methods related to subroutines + // ------------------------------------------------------------------------ + + /** + * Returns true is this basic block belongs to the given subroutine. + * + * @param id + * a subroutine id. + * @return true is this basic block belongs to the given subroutine. + */ + boolean inSubroutine(final long id) { + if ((status & Label.VISITED) != 0) { + return (srcAndRefPositions[(int) (id >>> 32)] & (int) id) != 0; + } + return false; + } + + /** + * Returns true if this basic block and the given one belong to a common + * subroutine. + * + * @param block + * another basic block. + * @return true if this basic block and the given one belong to a common + * subroutine. + */ + boolean inSameSubroutine(final Label block) { + if ((status & VISITED) == 0 || (block.status & VISITED) == 0) { + return false; + } + for (int i = 0; i < srcAndRefPositions.length; ++i) { + if ((srcAndRefPositions[i] & block.srcAndRefPositions[i]) != 0) { + return true; + } + } + return false; + } + + /** + * Marks this basic block as belonging to the given subroutine. + * + * @param id + * a subroutine id. + * @param nbSubroutines + * the total number of subroutines in the method. + */ + void addToSubroutine(final long id, final int nbSubroutines) { + if ((status & VISITED) == 0) { + status |= VISITED; + srcAndRefPositions = new int[nbSubroutines / 32 + 1]; + } + srcAndRefPositions[(int) (id >>> 32)] |= (int) id; + } + + /** + * Finds the basic blocks that belong to a given subroutine, and marks these + * blocks as belonging to this subroutine. This method follows the control + * flow graph to find all the blocks that are reachable from the current + * block WITHOUT following any JSR target. + * + * @param JSR + * a JSR block that jumps to this subroutine. If this JSR is not + * null it is added to the successor of the RET blocks found in + * the subroutine. + * @param id + * the id of this subroutine. + * @param nbSubroutines + * the total number of subroutines in the method. + */ + void visitSubroutine(final Label JSR, final long id, final int nbSubroutines) { + // user managed stack of labels, to avoid using a recursive method + // (recursivity can lead to stack overflow with very large methods) + Label stack = this; + while (stack != null) { + // removes a label l from the stack + Label l = stack; + stack = l.next; + l.next = null; + + if (JSR != null) { + if ((l.status & VISITED2) != 0) { + continue; + } + l.status |= VISITED2; + // adds JSR to the successors of l, if it is a RET block + if ((l.status & RET) != 0) { + if (!l.inSameSubroutine(JSR)) { + Edge e = new Edge(); + e.info = l.inputStackTop; + e.successor = JSR.successors.successor; + e.next = l.successors; + l.successors = e; + } + } + } else { + // if the l block already belongs to subroutine 'id', continue + if (l.inSubroutine(id)) { + continue; + } + // marks the l block as belonging to subroutine 'id' + l.addToSubroutine(id, nbSubroutines); + } + // pushes each successor of l on the stack, except JSR targets + Edge e = l.successors; + while (e != null) { + // if the l block is a JSR block, then 'l.successors.next' leads + // to the JSR target (see {@link #visitJumpInsn}) and must + // therefore not be followed + if ((l.status & Label.JSR) == 0 || e != l.successors.next) { + // pushes e.successor on the stack if it not already added + if (e.successor.next == null) { + e.successor.next = stack; + stack = e.successor; + } + } + e = e.next; + } + } + } + + // ------------------------------------------------------------------------ + // Overriden Object methods + // ------------------------------------------------------------------------ + + /** + * Returns a string representation of this label. + * + * @return a string representation of this label. + */ + @Override + public String toString() { + return "L" + System.identityHashCode(this); + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/MethodVisitor.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/MethodVisitor.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/MethodVisitor.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/MethodVisitor.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,881 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * A visitor to visit a Java method. The methods of this class must be called in + * the following order: ( visitParameter )* [ + * visitAnnotationDefault ] ( visitAnnotation | + * visitParameterAnnotation visitTypeAnnotation | + * visitAttribute )* [ visitCode ( visitFrame | + * visitXInsn | visitLabel | + * visitInsnAnnotation | visitTryCatchBlock | + * visitTryCatchAnnotation | visitLocalVariable | + * visitLocalVariableAnnotation | visitLineNumber )* + * visitMaxs ] visitEnd. In addition, the + * visitXInsn and visitLabel methods must be called in + * the sequential order of the bytecode instructions of the visited code, + * visitInsnAnnotation must be called after the annotated + * instruction, visitTryCatchBlock must be called before the + * labels passed as arguments have been visited, + * visitTryCatchBlockAnnotation must be called after the + * corresponding try catch block has been visited, and the + * visitLocalVariable, visitLocalVariableAnnotation and + * visitLineNumber methods must be called after the labels + * passed as arguments have been visited. + * + * @author Eric Bruneton + */ +public abstract class MethodVisitor { + + /** + * The ASM API version implemented by this visitor. The value of this field + * must be one of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + */ + protected final int api; + + /** + * The method visitor to which this visitor must delegate method calls. May + * be null. + */ + protected MethodVisitor mv; + + /** + * Constructs a new {@link MethodVisitor}. + * + * @param api + * the ASM API version implemented by this visitor. Must be one + * of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + */ + public MethodVisitor(final int api) { + this(api, null); + } + + /** + * Constructs a new {@link MethodVisitor}. + * + * @param api + * the ASM API version implemented by this visitor. Must be one + * of {@link Opcodes#ASM4} or {@link Opcodes#ASM5}. + * @param mv + * the method visitor to which this visitor must delegate method + * calls. May be null. + */ + public MethodVisitor(final int api, final MethodVisitor mv) { + if (api != Opcodes.ASM4 && api != Opcodes.ASM5) { + throw new IllegalArgumentException(); + } + this.api = api; + this.mv = mv; + } + + // ------------------------------------------------------------------------- + // Parameters, annotations and non standard attributes + // ------------------------------------------------------------------------- + + /** + * Visits a parameter of this method. + * + * @param name + * parameter name or null if none is provided. + * @param access + * the parameter's access flags, only ACC_FINAL, + * ACC_SYNTHETIC or/and ACC_MANDATED are + * allowed (see {@link Opcodes}). + */ + public void visitParameter(String name, int access) { + if (api < Opcodes.ASM5) { + throw new RuntimeException(); + } + if (mv != null) { + mv.visitParameter(name, access); + } + } + + /** + * Visits the default value of this annotation interface method. + * + * @return a visitor to the visit the actual default value of this + * annotation interface method, or null if this visitor is + * not interested in visiting this default value. The 'name' + * parameters passed to the methods of this annotation visitor are + * ignored. Moreover, exacly one visit method must be called on this + * annotation visitor, followed by visitEnd. + */ + public AnnotationVisitor visitAnnotationDefault() { + if (mv != null) { + return mv.visitAnnotationDefault(); + } + return null; + } + + /** + * Visits an annotation of this method. + * + * @param desc + * the class descriptor of the annotation class. + * @param visible + * true if the annotation is visible at runtime. + * @return a visitor to visit the annotation values, or null if + * this visitor is not interested in visiting this annotation. + */ + public AnnotationVisitor visitAnnotation(String desc, boolean visible) { + if (mv != null) { + return mv.visitAnnotation(desc, visible); + } + return null; + } + + /** + * Visits an annotation on a type in the method signature. + * + * @param typeRef + * a reference to the annotated type. The sort of this type + * reference must be {@link TypeReference#METHOD_TYPE_PARAMETER + * METHOD_TYPE_PARAMETER}, + * {@link TypeReference#METHOD_TYPE_PARAMETER_BOUND + * METHOD_TYPE_PARAMETER_BOUND}, + * {@link TypeReference#METHOD_RETURN METHOD_RETURN}, + * {@link TypeReference#METHOD_RECEIVER METHOD_RECEIVER}, + * {@link TypeReference#METHOD_FORMAL_PARAMETER + * METHOD_FORMAL_PARAMETER} or {@link TypeReference#THROWS + * THROWS}. See {@link TypeReference}. + * @param typePath + * the path to the annotated type argument, wildcard bound, array + * element type, or static inner type within 'typeRef'. May be + * null if the annotation targets 'typeRef' as a whole. + * @param desc + * the class descriptor of the annotation class. + * @param visible + * true if the annotation is visible at runtime. + * @return a visitor to visit the annotation values, or null if + * this visitor is not interested in visiting this annotation. + */ + public AnnotationVisitor visitTypeAnnotation(int typeRef, + TypePath typePath, String desc, boolean visible) { + if (api < Opcodes.ASM5) { + throw new RuntimeException(); + } + if (mv != null) { + return mv.visitTypeAnnotation(typeRef, typePath, desc, visible); + } + return null; + } + + /** + * Visits an annotation of a parameter this method. + * + * @param parameter + * the parameter index. + * @param desc + * the class descriptor of the annotation class. + * @param visible + * true if the annotation is visible at runtime. + * @return a visitor to visit the annotation values, or null if + * this visitor is not interested in visiting this annotation. + */ + public AnnotationVisitor visitParameterAnnotation(int parameter, + String desc, boolean visible) { + if (mv != null) { + return mv.visitParameterAnnotation(parameter, desc, visible); + } + return null; + } + + /** + * Visits a non standard attribute of this method. + * + * @param attr + * an attribute. + */ + public void visitAttribute(Attribute attr) { + if (mv != null) { + mv.visitAttribute(attr); + } + } + + /** + * Starts the visit of the method's code, if any (i.e. non abstract method). + */ + public void visitCode() { + if (mv != null) { + mv.visitCode(); + } + } + + /** + * Visits the current state of the local variables and operand stack + * elements. This method must(*) be called just before any + * instruction i that follows an unconditional branch instruction + * such as GOTO or THROW, that is the target of a jump instruction, or that + * starts an exception handler block. The visited types must describe the + * values of the local variables and of the operand stack elements just + * before i is executed.
+ *
+ * (*) this is mandatory only for classes whose version is greater than or + * equal to {@link Opcodes#V1_6 V1_6}.
+ *
+ * The frames of a method must be given either in expanded form, or in + * compressed form (all frames must use the same format, i.e. you must not + * mix expanded and compressed frames within a single method): + *
    + *
  • In expanded form, all frames must have the F_NEW type.
    • + *
  • In compressed form, frames are basically "deltas" from the state of + * the previous frame: + *
      + *
    • {@link Opcodes#F_SAME} representing frame with exactly the same + * locals as the previous frame and with the empty stack.
      • + *
    • {@link Opcodes#F_SAME1} representing frame with exactly the same + * locals as the previous frame and with single value on the stack ( + * nStack is 1 and stack[0] contains value for the + * type of the stack item).
      • + *
    • {@link Opcodes#F_APPEND} representing frame with current locals are + * the same as the locals in the previous frame, except that additional + * locals are defined (nLocal is 1, 2 or 3 and + * local elements contains values representing added types).
      • + *
    • {@link Opcodes#F_CHOP} representing frame with current locals are the + * same as the locals in the previous frame, except that the last 1-3 locals + * are absent and with the empty stack (nLocals is 1, 2 or 3).
      • + *
    • {@link Opcodes#F_FULL} representing complete frame data.
      • + *
    + *
    • + *
+ *
+ * In both cases the first frame, corresponding to the method's parameters + * and access flags, is implicit and must not be visited. Also, it is + * illegal to visit two or more frames for the same code location (i.e., at + * least one instruction must be visited between two calls to visitFrame). + * + * @param type + * the type of this stack map frame. Must be + * {@link Opcodes#F_NEW} for expanded frames, or + * {@link Opcodes#F_FULL}, {@link Opcodes#F_APPEND}, + * {@link Opcodes#F_CHOP}, {@link Opcodes#F_SAME} or + * {@link Opcodes#F_APPEND}, {@link Opcodes#F_SAME1} for + * compressed frames. + * @param nLocal + * the number of local variables in the visited frame. + * @param local + * the local variable types in this frame. This array must not be + * modified. Primitive types are represented by + * {@link Opcodes#TOP}, {@link Opcodes#INTEGER}, + * {@link Opcodes#FLOAT}, {@link Opcodes#LONG}, + * {@link Opcodes#DOUBLE},{@link Opcodes#NULL} or + * {@link Opcodes#UNINITIALIZED_THIS} (long and double are + * represented by a single element). Reference types are + * represented by String objects (representing internal names), + * and uninitialized types by Label objects (this label + * designates the NEW instruction that created this uninitialized + * value). + * @param nStack + * the number of operand stack elements in the visited frame. + * @param stack + * the operand stack types in this frame. This array must not be + * modified. Its content has the same format as the "local" + * array. + * @throws IllegalStateException + * if a frame is visited just after another one, without any + * instruction between the two (unless this frame is a + * Opcodes#F_SAME frame, in which case it is silently ignored). + */ + public void visitFrame(int type, int nLocal, Object[] local, int nStack, + Object[] stack) { + if (mv != null) { + mv.visitFrame(type, nLocal, local, nStack, stack); + } + } + + // ------------------------------------------------------------------------- + // Normal instructions + // ------------------------------------------------------------------------- + + /** + * Visits a zero operand instruction. + * + * @param opcode + * the opcode of the instruction to be visited. This opcode is + * either NOP, ACONST_NULL, ICONST_M1, ICONST_0, ICONST_1, + * ICONST_2, ICONST_3, ICONST_4, ICONST_5, LCONST_0, LCONST_1, + * FCONST_0, FCONST_1, FCONST_2, DCONST_0, DCONST_1, IALOAD, + * LALOAD, FALOAD, DALOAD, AALOAD, BALOAD, CALOAD, SALOAD, + * IASTORE, LASTORE, FASTORE, DASTORE, AASTORE, BASTORE, CASTORE, + * SASTORE, POP, POP2, DUP, DUP_X1, DUP_X2, DUP2, DUP2_X1, + * DUP2_X2, SWAP, IADD, LADD, FADD, DADD, ISUB, LSUB, FSUB, DSUB, + * IMUL, LMUL, FMUL, DMUL, IDIV, LDIV, FDIV, DDIV, IREM, LREM, + * FREM, DREM, INEG, LNEG, FNEG, DNEG, ISHL, LSHL, ISHR, LSHR, + * IUSHR, LUSHR, IAND, LAND, IOR, LOR, IXOR, LXOR, I2L, I2F, I2D, + * L2I, L2F, L2D, F2I, F2L, F2D, D2I, D2L, D2F, I2B, I2C, I2S, + * LCMP, FCMPL, FCMPG, DCMPL, DCMPG, IRETURN, LRETURN, FRETURN, + * DRETURN, ARETURN, RETURN, ARRAYLENGTH, ATHROW, MONITORENTER, + * or MONITOREXIT. + */ + public void visitInsn(int opcode) { + if (mv != null) { + mv.visitInsn(opcode); + } + } + + /** + * Visits an instruction with a single int operand. + * + * @param opcode + * the opcode of the instruction to be visited. This opcode is + * either BIPUSH, SIPUSH or NEWARRAY. + * @param operand + * the operand of the instruction to be visited.
+ * When opcode is BIPUSH, operand value should be between + * Byte.MIN_VALUE and Byte.MAX_VALUE.
+ * When opcode is SIPUSH, operand value should be between + * Short.MIN_VALUE and Short.MAX_VALUE.
+ * When opcode is NEWARRAY, operand value should be one of + * {@link Opcodes#T_BOOLEAN}, {@link Opcodes#T_CHAR}, + * {@link Opcodes#T_FLOAT}, {@link Opcodes#T_DOUBLE}, + * {@link Opcodes#T_BYTE}, {@link Opcodes#T_SHORT}, + * {@link Opcodes#T_INT} or {@link Opcodes#T_LONG}. + */ + public void visitIntInsn(int opcode, int operand) { + if (mv != null) { + mv.visitIntInsn(opcode, operand); + } + } + + /** + * Visits a local variable instruction. A local variable instruction is an + * instruction that loads or stores the value of a local variable. + * + * @param opcode + * the opcode of the local variable instruction to be visited. + * This opcode is either ILOAD, LLOAD, FLOAD, DLOAD, ALOAD, + * ISTORE, LSTORE, FSTORE, DSTORE, ASTORE or RET. + * @param var + * the operand of the instruction to be visited. This operand is + * the index of a local variable. + */ + public void visitVarInsn(int opcode, int var) { + if (mv != null) { + mv.visitVarInsn(opcode, var); + } + } + + /** + * Visits a type instruction. A type instruction is an instruction that + * takes the internal name of a class as parameter. + * + * @param opcode + * the opcode of the type instruction to be visited. This opcode + * is either NEW, ANEWARRAY, CHECKCAST or INSTANCEOF. + * @param type + * the operand of the instruction to be visited. This operand + * must be the internal name of an object or array class (see + * {@link Type#getInternalName() getInternalName}). + */ + public void visitTypeInsn(int opcode, String type) { + if (mv != null) { + mv.visitTypeInsn(opcode, type); + } + } + + /** + * Visits a field instruction. A field instruction is an instruction that + * loads or stores the value of a field of an object. + * + * @param opcode + * the opcode of the type instruction to be visited. This opcode + * is either GETSTATIC, PUTSTATIC, GETFIELD or PUTFIELD. + * @param owner + * the internal name of the field's owner class (see + * {@link Type#getInternalName() getInternalName}). + * @param name + * the field's name. + * @param desc + * the field's descriptor (see {@link Type Type}). + */ + public void visitFieldInsn(int opcode, String owner, String name, + String desc) { + if (mv != null) { + mv.visitFieldInsn(opcode, owner, name, desc); + } + } + + /** + * Visits a method instruction. A method instruction is an instruction that + * invokes a method. + * + * @param opcode + * the opcode of the type instruction to be visited. This opcode + * is either INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or + * INVOKEINTERFACE. + * @param owner + * the internal name of the method's owner class (see + * {@link Type#getInternalName() getInternalName}). + * @param name + * the method's name. + * @param desc + * the method's descriptor (see {@link Type Type}). + */ + @Deprecated + public void visitMethodInsn(int opcode, String owner, String name, + String desc) { + if (api >= Opcodes.ASM5) { + boolean itf = opcode == Opcodes.INVOKEINTERFACE; + visitMethodInsn(opcode, owner, name, desc, itf); + return; + } + if (mv != null) { + mv.visitMethodInsn(opcode, owner, name, desc); + } + } + + /** + * Visits a method instruction. A method instruction is an instruction that + * invokes a method. + * + * @param opcode + * the opcode of the type instruction to be visited. This opcode + * is either INVOKEVIRTUAL, INVOKESPECIAL, INVOKESTATIC or + * INVOKEINTERFACE. + * @param owner + * the internal name of the method's owner class (see + * {@link Type#getInternalName() getInternalName}). + * @param name + * the method's name. + * @param desc + * the method's descriptor (see {@link Type Type}). + * @param itf + * if the method's owner class is an interface. + */ + public void visitMethodInsn(int opcode, String owner, String name, + String desc, boolean itf) { + if (api < Opcodes.ASM5) { + if (itf != (opcode == Opcodes.INVOKEINTERFACE)) { + throw new IllegalArgumentException( + "INVOKESPECIAL/STATIC on interfaces require ASM 5"); + } + visitMethodInsn(opcode, owner, name, desc); + return; + } + if (mv != null) { + mv.visitMethodInsn(opcode, owner, name, desc, itf); + } + } + + /** + * Visits an invokedynamic instruction. + * + * @param name + * the method's name. + * @param desc + * the method's descriptor (see {@link Type Type}). + * @param bsm + * the bootstrap method. + * @param bsmArgs + * the bootstrap method constant arguments. Each argument must be + * an {@link Integer}, {@link Float}, {@link Long}, + * {@link Double}, {@link String}, {@link Type} or {@link Handle} + * value. This method is allowed to modify the content of the + * array so a caller should expect that this array may change. + */ + public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, + Object... bsmArgs) { + if (mv != null) { + mv.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs); + } + } + + /** + * Visits a jump instruction. A jump instruction is an instruction that may + * jump to another instruction. + * + * @param opcode + * the opcode of the type instruction to be visited. This opcode + * is either IFEQ, IFNE, IFLT, IFGE, IFGT, IFLE, IF_ICMPEQ, + * IF_ICMPNE, IF_ICMPLT, IF_ICMPGE, IF_ICMPGT, IF_ICMPLE, + * IF_ACMPEQ, IF_ACMPNE, GOTO, JSR, IFNULL or IFNONNULL. + * @param label + * the operand of the instruction to be visited. This operand is + * a label that designates the instruction to which the jump + * instruction may jump. + */ + public void visitJumpInsn(int opcode, Label label) { + if (mv != null) { + mv.visitJumpInsn(opcode, label); + } + } + + /** + * Visits a label. A label designates the instruction that will be visited + * just after it. + * + * @param label + * a {@link Label Label} object. + */ + public void visitLabel(Label label) { + if (mv != null) { + mv.visitLabel(label); + } + } + + // ------------------------------------------------------------------------- + // Special instructions + // ------------------------------------------------------------------------- + + /** + * Visits a LDC instruction. Note that new constant types may be added in + * future versions of the Java Virtual Machine. To easily detect new + * constant types, implementations of this method should check for + * unexpected constant types, like this: + * + * 
+     * if (cst instanceof Integer) {
+     *     // ...
+     * } else if (cst instanceof Float) {
+     *     // ...
+     * } else if (cst instanceof Long) {
+     *     // ...
+     * } else if (cst instanceof Double) {
+     *     // ...
+     * } else if (cst instanceof String) {
+     *     // ...
+     * } else if (cst instanceof Type) {
+     *     int sort = ((Type) cst).getSort();
+     *     if (sort == Type.OBJECT) {
+     *         // ...
+     *     } else if (sort == Type.ARRAY) {
+     *         // ...
+     *     } else if (sort == Type.METHOD) {
+     *         // ...
+     *     } else {
+     *         // throw an exception
+     *     }
+     * } else if (cst instanceof Handle) {
+     *     // ...
+     * } else {
+     *     // throw an exception
+     * }
+     *
+ * + * @param cst + * the constant to be loaded on the stack. This parameter must be + * a non null {@link Integer}, a {@link Float}, a {@link Long}, a + * {@link Double}, a {@link String}, a {@link Type} of OBJECT or + * ARRAY sort for .class constants, for classes whose + * version is 49.0, a {@link Type} of METHOD sort or a + * {@link Handle} for MethodType and MethodHandle constants, for + * classes whose version is 51.0. + */ + public void visitLdcInsn(Object cst) { + if (mv != null) { + mv.visitLdcInsn(cst); + } + } + + /** + * Visits an IINC instruction. + * + * @param var + * index of the local variable to be incremented. + * @param increment + * amount to increment the local variable by. + */ + public void visitIincInsn(int var, int increment) { + if (mv != null) { + mv.visitIincInsn(var, increment); + } + } + + /** + * Visits a TABLESWITCH instruction. + * + * @param min + * the minimum key value. + * @param max + * the maximum key value. + * @param dflt + * beginning of the default handler block. + * @param labels + * beginnings of the handler blocks. labels[i] is the + * beginning of the handler block for the min + i key. + */ + public void visitTableSwitchInsn(int min, int max, Label dflt, + Label... labels) { + if (mv != null) { + mv.visitTableSwitchInsn(min, max, dflt, labels); + } + } + + /** + * Visits a LOOKUPSWITCH instruction. + * + * @param dflt + * beginning of the default handler block. + * @param keys + * the values of the keys. + * @param labels + * beginnings of the handler blocks. labels[i] is the + * beginning of the handler block for the keys[i] key. + */ + public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) { + if (mv != null) { + mv.visitLookupSwitchInsn(dflt, keys, labels); + } + } + + /** + * Visits a MULTIANEWARRAY instruction. + * + * @param desc + * an array type descriptor (see {@link Type Type}). + * @param dims + * number of dimensions of the array to allocate. + */ + public void visitMultiANewArrayInsn(String desc, int dims) { + if (mv != null) { + mv.visitMultiANewArrayInsn(desc, dims); + } + } + + /** + * Visits an annotation on an instruction. This method must be called just + * after the annotated instruction. It can be called several times + * for the same instruction. + * + * @param typeRef + * a reference to the annotated type. The sort of this type + * reference must be {@link TypeReference#INSTANCEOF INSTANCEOF}, + * {@link TypeReference#NEW NEW}, + * {@link TypeReference#CONSTRUCTOR_REFERENCE + * CONSTRUCTOR_REFERENCE}, {@link TypeReference#METHOD_REFERENCE + * METHOD_REFERENCE}, {@link TypeReference#CAST CAST}, + * {@link TypeReference#CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT + * CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT}, + * {@link TypeReference#METHOD_INVOCATION_TYPE_ARGUMENT + * METHOD_INVOCATION_TYPE_ARGUMENT}, + * {@link TypeReference#CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT + * CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT}, or + * {@link TypeReference#METHOD_REFERENCE_TYPE_ARGUMENT + * METHOD_REFERENCE_TYPE_ARGUMENT}. See {@link TypeReference}. + * @param typePath + * the path to the annotated type argument, wildcard bound, array + * element type, or static inner type within 'typeRef'. May be + * null if the annotation targets 'typeRef' as a whole. + * @param desc + * the class descriptor of the annotation class. + * @param visible + * true if the annotation is visible at runtime. + * @return a visitor to visit the annotation values, or null if + * this visitor is not interested in visiting this annotation. + */ + public AnnotationVisitor visitInsnAnnotation(int typeRef, + TypePath typePath, String desc, boolean visible) { + if (api < Opcodes.ASM5) { + throw new RuntimeException(); + } + if (mv != null) { + return mv.visitInsnAnnotation(typeRef, typePath, desc, visible); + } + return null; + } + + // ------------------------------------------------------------------------- + // Exceptions table entries, debug information, max stack and max locals + // ------------------------------------------------------------------------- + + /** + * Visits a try catch block. + * + * @param start + * beginning of the exception handler's scope (inclusive). + * @param end + * end of the exception handler's scope (exclusive). + * @param handler + * beginning of the exception handler's code. + * @param type + * internal name of the type of exceptions handled by the + * handler, or null to catch any exceptions (for + * "finally" blocks). + * @throws IllegalArgumentException + * if one of the labels has already been visited by this visitor + * (by the {@link #visitLabel visitLabel} method). + */ + public void visitTryCatchBlock(Label start, Label end, Label handler, + String type) { + if (mv != null) { + mv.visitTryCatchBlock(start, end, handler, type); + } + } + + /** + * Visits an annotation on an exception handler type. This method must be + * called after the {@link #visitTryCatchBlock} for the annotated + * exception handler. It can be called several times for the same exception + * handler. + * + * @param typeRef + * a reference to the annotated type. The sort of this type + * reference must be {@link TypeReference#EXCEPTION_PARAMETER + * EXCEPTION_PARAMETER}. See {@link TypeReference}. + * @param typePath + * the path to the annotated type argument, wildcard bound, array + * element type, or static inner type within 'typeRef'. May be + * null if the annotation targets 'typeRef' as a whole. + * @param desc + * the class descriptor of the annotation class. + * @param visible + * true if the annotation is visible at runtime. + * @return a visitor to visit the annotation values, or null if + * this visitor is not interested in visiting this annotation. + */ + public AnnotationVisitor visitTryCatchAnnotation(int typeRef, + TypePath typePath, String desc, boolean visible) { + if (api < Opcodes.ASM5) { + throw new RuntimeException(); + } + if (mv != null) { + return mv.visitTryCatchAnnotation(typeRef, typePath, desc, visible); + } + return null; + } + + /** + * Visits a local variable declaration. + * + * @param name + * the name of a local variable. + * @param desc + * the type descriptor of this local variable. + * @param signature + * the type signature of this local variable. May be + * null if the local variable type does not use generic + * types. + * @param start + * the first instruction corresponding to the scope of this local + * variable (inclusive). + * @param end + * the last instruction corresponding to the scope of this local + * variable (exclusive). + * @param index + * the local variable's index. + * @throws IllegalArgumentException + * if one of the labels has not already been visited by this + * visitor (by the {@link #visitLabel visitLabel} method). + */ + public void visitLocalVariable(String name, String desc, String signature, + Label start, Label end, int index) { + if (mv != null) { + mv.visitLocalVariable(name, desc, signature, start, end, index); + } + } + + /** + * Visits an annotation on a local variable type. + * + * @param typeRef + * a reference to the annotated type. The sort of this type + * reference must be {@link TypeReference#LOCAL_VARIABLE + * LOCAL_VARIABLE} or {@link TypeReference#RESOURCE_VARIABLE + * RESOURCE_VARIABLE}. See {@link TypeReference}. + * @param typePath + * the path to the annotated type argument, wildcard bound, array + * element type, or static inner type within 'typeRef'. May be + * null if the annotation targets 'typeRef' as a whole. + * @param start + * the fist instructions corresponding to the continuous ranges + * that make the scope of this local variable (inclusive). + * @param end + * the last instructions corresponding to the continuous ranges + * that make the scope of this local variable (exclusive). This + * array must have the same size as the 'start' array. + * @param index + * the local variable's index in each range. This array must have + * the same size as the 'start' array. + * @param desc + * the class descriptor of the annotation class. + * @param visible + * true if the annotation is visible at runtime. + * @return a visitor to visit the annotation values, or null if + * this visitor is not interested in visiting this annotation. + */ + public AnnotationVisitor visitLocalVariableAnnotation(int typeRef, + TypePath typePath, Label[] start, Label[] end, int[] index, + String desc, boolean visible) { + if (api < Opcodes.ASM5) { + throw new RuntimeException(); + } + if (mv != null) { + return mv.visitLocalVariableAnnotation(typeRef, typePath, start, + end, index, desc, visible); + } + return null; + } + + /** + * Visits a line number declaration. + * + * @param line + * a line number. This number refers to the source file from + * which the class was compiled. + * @param start + * the first instruction corresponding to this line number. + * @throws IllegalArgumentException + * if start has not already been visited by this + * visitor (by the {@link #visitLabel visitLabel} method). + */ + public void visitLineNumber(int line, Label start) { + if (mv != null) { + mv.visitLineNumber(line, start); + } + } + + /** + * Visits the maximum stack size and the maximum number of local variables + * of the method. + * + * @param maxStack + * maximum stack size of the method. + * @param maxLocals + * maximum number of local variables for the method. + */ + public void visitMaxs(int maxStack, int maxLocals) { + if (mv != null) { + mv.visitMaxs(maxStack, maxLocals); + } + } + + /** + * Visits the end of the method. This method, which is the last one to be + * called, is used to inform the visitor that all the annotations and + * attributes of the method have been visited. + */ + public void visitEnd() { + if (mv != null) { + mv.visitEnd(); + } + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/MethodWriter.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/MethodWriter.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/MethodWriter.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/MethodWriter.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,2915 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * A {@link MethodVisitor} that generates methods in bytecode form. Each visit + * method of this class appends the bytecode corresponding to the visited + * instruction to a byte vector, in the order these methods are called. + * + * @author Eric Bruneton + * @author Eugene Kuleshov + */ +class MethodWriter extends MethodVisitor { + + /** + * Pseudo access flag used to denote constructors. + */ + static final int ACC_CONSTRUCTOR = 0x80000; + + /** + * Frame has exactly the same locals as the previous stack map frame and + * number of stack items is zero. + */ + static final int SAME_FRAME = 0; // to 63 (0-3f) + + /** + * Frame has exactly the same locals as the previous stack map frame and + * number of stack items is 1 + */ + static final int SAME_LOCALS_1_STACK_ITEM_FRAME = 64; // to 127 (40-7f) + + /** + * Reserved for future use + */ + static final int RESERVED = 128; + + /** + * Frame has exactly the same locals as the previous stack map frame and + * number of stack items is 1. Offset is bigger then 63; + */ + static final int SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED = 247; // f7 + + /** + * Frame where current locals are the same as the locals in the previous + * frame, except that the k last locals are absent. The value of k is given + * by the formula 251-frame_type. + */ + static final int CHOP_FRAME = 248; // to 250 (f8-fA) + + /** + * Frame has exactly the same locals as the previous stack map frame and + * number of stack items is zero. Offset is bigger then 63; + */ + static final int SAME_FRAME_EXTENDED = 251; // fb + + /** + * Frame where current locals are the same as the locals in the previous + * frame, except that k additional locals are defined. The value of k is + * given by the formula frame_type-251. + */ + static final int APPEND_FRAME = 252; // to 254 // fc-fe + + /** + * Full frame + */ + static final int FULL_FRAME = 255; // ff + + /** + * Indicates that the stack map frames must be recomputed from scratch. In + * this case the maximum stack size and number of local variables is also + * recomputed from scratch. + * + * @see #compute + */ + private static final int FRAMES = 0; + + /** + * Indicates that the maximum stack size and number of local variables must + * be automatically computed. + * + * @see #compute + */ + private static final int MAXS = 1; + + /** + * Indicates that nothing must be automatically computed. + * + * @see #compute + */ + private static final int NOTHING = 2; + + /** + * The class writer to which this method must be added. + */ + final ClassWriter cw; + + /** + * Access flags of this method. + */ + private int access; + + /** + * The index of the constant pool item that contains the name of this + * method. + */ + private final int name; + + /** + * The index of the constant pool item that contains the descriptor of this + * method. + */ + private final int desc; + + /** + * The descriptor of this method. + */ + private final String descriptor; + + /** + * The signature of this method. + */ + String signature; + + /** + * If not zero, indicates that the code of this method must be copied from + * the ClassReader associated to this writer in cw.cr. More + * precisely, this field gives the index of the first byte to copied from + * cw.cr.b. + */ + int classReaderOffset; + + /** + * If not zero, indicates that the code of this method must be copied from + * the ClassReader associated to this writer in cw.cr. More + * precisely, this field gives the number of bytes to copied from + * cw.cr.b. + */ + int classReaderLength; + + /** + * Number of exceptions that can be thrown by this method. + */ + int exceptionCount; + + /** + * The exceptions that can be thrown by this method. More precisely, this + * array contains the indexes of the constant pool items that contain the + * internal names of these exception classes. + */ + int[] exceptions; + + /** + * The annotation default attribute of this method. May be null. + */ + private ByteVector annd; + + /** + * The runtime visible annotations of this method. May be null. + */ + private AnnotationWriter anns; + + /** + * The runtime invisible annotations of this method. May be null. + */ + private AnnotationWriter ianns; + + /** + * The runtime visible type annotations of this method. May be null + * . + */ + private AnnotationWriter tanns; + + /** + * The runtime invisible type annotations of this method. May be + * null. + */ + private AnnotationWriter itanns; + + /** + * The runtime visible parameter annotations of this method. May be + * null. + */ + private AnnotationWriter[] panns; + + /** + * The runtime invisible parameter annotations of this method. May be + * null. + */ + private AnnotationWriter[] ipanns; + + /** + * The number of synthetic parameters of this method. + */ + private int synthetics; + + /** + * The non standard attributes of the method. + */ + private Attribute attrs; + + /** + * The bytecode of this method. + */ + private ByteVector code = new ByteVector(); + + /** + * Maximum stack size of this method. + */ + private int maxStack; + + /** + * Maximum number of local variables for this method. + */ + private int maxLocals; + + /** + * Number of local variables in the current stack map frame. + */ + private int currentLocals; + + /** + * Number of stack map frames in the StackMapTable attribute. + */ + private int frameCount; + + /** + * The StackMapTable attribute. + */ + private ByteVector stackMap; + + /** + * The offset of the last frame that was written in the StackMapTable + * attribute. + */ + private int previousFrameOffset; + + /** + * The last frame that was written in the StackMapTable attribute. + * + * @see #frame + */ + private int[] previousFrame; + + /** + * The current stack map frame. The first element contains the offset of the + * instruction to which the frame corresponds, the second element is the + * number of locals and the third one is the number of stack elements. The + * local variables start at index 3 and are followed by the operand stack + * values. In summary frame[0] = offset, frame[1] = nLocal, frame[2] = + * nStack, frame[3] = nLocal. All types are encoded as integers, with the + * same format as the one used in {@link Label}, but limited to BASE types. + */ + private int[] frame; + + /** + * Number of elements in the exception handler list. + */ + private int handlerCount; + + /** + * The first element in the exception handler list. + */ + private Handler firstHandler; + + /** + * The last element in the exception handler list. + */ + private Handler lastHandler; + + /** + * Number of entries in the MethodParameters attribute. + */ + private int methodParametersCount; + + /** + * The MethodParameters attribute. + */ + private ByteVector methodParameters; + + /** + * Number of entries in the LocalVariableTable attribute. + */ + private int localVarCount; + + /** + * The LocalVariableTable attribute. + */ + private ByteVector localVar; + + /** + * Number of entries in the LocalVariableTypeTable attribute. + */ + private int localVarTypeCount; + + /** + * The LocalVariableTypeTable attribute. + */ + private ByteVector localVarType; + + /** + * Number of entries in the LineNumberTable attribute. + */ + private int lineNumberCount; + + /** + * The LineNumberTable attribute. + */ + private ByteVector lineNumber; + + /** + * The start offset of the last visited instruction. + */ + private int lastCodeOffset; + + /** + * The runtime visible type annotations of the code. May be null. + */ + private AnnotationWriter ctanns; + + /** + * The runtime invisible type annotations of the code. May be null. + */ + private AnnotationWriter ictanns; + + /** + * The non standard attributes of the method's code. + */ + private Attribute cattrs; + + /** + * Indicates if some jump instructions are too small and need to be resized. + */ + private boolean resize; + + /** + * The number of subroutines in this method. + */ + private int subroutines; + + // ------------------------------------------------------------------------ + + /* + * Fields for the control flow graph analysis algorithm (used to compute the + * maximum stack size). A control flow graph contains one node per "basic + * block", and one edge per "jump" from one basic block to another. Each + * node (i.e., each basic block) is represented by the Label object that + * corresponds to the first instruction of this basic block. Each node also + * stores the list of its successors in the graph, as a linked list of Edge + * objects. + */ + + /** + * Indicates what must be automatically computed. + * + * @see #FRAMES + * @see #MAXS + * @see #NOTHING + */ + private final int compute; + + /** + * A list of labels. This list is the list of basic blocks in the method, + * i.e. a list of Label objects linked to each other by their + * {@link Label#successor} field, in the order they are visited by + * {@link MethodVisitor#visitLabel}, and starting with the first basic + * block. + */ + private Label labels; + + /** + * The previous basic block. + */ + private Label previousBlock; + + /** + * The current basic block. + */ + private Label currentBlock; + + /** + * The (relative) stack size after the last visited instruction. This size + * is relative to the beginning of the current basic block, i.e., the true + * stack size after the last visited instruction is equal to the + * {@link Label#inputStackTop beginStackSize} of the current basic block + * plus stackSize. + */ + private int stackSize; + + /** + * The (relative) maximum stack size after the last visited instruction. + * This size is relative to the beginning of the current basic block, i.e., + * the true maximum stack size after the last visited instruction is equal + * to the {@link Label#inputStackTop beginStackSize} of the current basic + * block plus stackSize. + */ + private int maxStackSize; + + // ------------------------------------------------------------------------ + // Constructor + // ------------------------------------------------------------------------ + + /** + * Constructs a new {@link MethodWriter}. + * + * @param cw + * the class writer in which the method must be added. + * @param access + * the method's access flags (see {@link Opcodes}). + * @param name + * the method's name. + * @param desc + * the method's descriptor (see {@link Type}). + * @param signature + * the method's signature. May be null. + * @param exceptions + * the internal names of the method's exceptions. May be + * null. + * @param computeMaxs + * true if the maximum stack size and number of local + * variables must be automatically computed. + * @param computeFrames + * true if the stack map tables must be recomputed from + * scratch. + */ + MethodWriter(final ClassWriter cw, final int access, final String name, + final String desc, final String signature, + final String[] exceptions, final boolean computeMaxs, + final boolean computeFrames) { + super(Opcodes.ASM5); + if (cw.firstMethod == null) { + cw.firstMethod = this; + } else { + cw.lastMethod.mv = this; + } + cw.lastMethod = this; + this.cw = cw; + this.access = access; + if ("".equals(name)) { + this.access |= ACC_CONSTRUCTOR; + } + this.name = cw.newUTF8(name); + this.desc = cw.newUTF8(desc); + this.descriptor = desc; + if (ClassReader.SIGNATURES) { + this.signature = signature; + } + if (exceptions != null && exceptions.length > 0) { + exceptionCount = exceptions.length; + this.exceptions = new int[exceptionCount]; + for (int i = 0; i < exceptionCount; ++i) { + this.exceptions[i] = cw.newClass(exceptions[i]); + } + } + this.compute = computeFrames ? FRAMES : (computeMaxs ? MAXS : NOTHING); + if (computeMaxs || computeFrames) { + // updates maxLocals + int size = Type.getArgumentsAndReturnSizes(descriptor) >> 2; + if ((access & Opcodes.ACC_STATIC) != 0) { + --size; + } + maxLocals = size; + currentLocals = size; + // creates and visits the label for the first basic block + labels = new Label(); + labels.status |= Label.PUSHED; + visitLabel(labels); + } + } + + // ------------------------------------------------------------------------ + // Implementation of the MethodVisitor abstract class + // ------------------------------------------------------------------------ + + @Override + public void visitParameter(String name, int access) { + if (methodParameters == null) { + methodParameters = new ByteVector(); + } + ++methodParametersCount; + methodParameters.putShort((name == null) ? 0 : cw.newUTF8(name)) + .putShort(access); + } + + @Override + public AnnotationVisitor visitAnnotationDefault() { + if (!ClassReader.ANNOTATIONS) { + return null; + } + annd = new ByteVector(); + return new AnnotationWriter(cw, false, annd, null, 0); + } + + @Override + public AnnotationVisitor visitAnnotation(final String desc, + final boolean visible) { + if (!ClassReader.ANNOTATIONS) { + return null; + } + ByteVector bv = new ByteVector(); + // write type, and reserve space for values count + bv.putShort(cw.newUTF8(desc)).putShort(0); + AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, 2); + if (visible) { + aw.next = anns; + anns = aw; + } else { + aw.next = ianns; + ianns = aw; + } + return aw; + } + + @Override + public AnnotationVisitor visitTypeAnnotation(final int typeRef, + final TypePath typePath, final String desc, final boolean visible) { + if (!ClassReader.ANNOTATIONS) { + return null; + } + ByteVector bv = new ByteVector(); + // write target_type and target_info + AnnotationWriter.putTarget(typeRef, typePath, bv); + // write type, and reserve space for values count + bv.putShort(cw.newUTF8(desc)).putShort(0); + AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, + bv.length - 2); + if (visible) { + aw.next = tanns; + tanns = aw; + } else { + aw.next = itanns; + itanns = aw; + } + return aw; + } + + @Override + public AnnotationVisitor visitParameterAnnotation(final int parameter, + final String desc, final boolean visible) { + if (!ClassReader.ANNOTATIONS) { + return null; + } + ByteVector bv = new ByteVector(); + if ("Ljava/lang/Synthetic;".equals(desc)) { + // workaround for a bug in javac with synthetic parameters + // see ClassReader.readParameterAnnotations + synthetics = Math.max(synthetics, parameter + 1); + return new AnnotationWriter(cw, false, bv, null, 0); + } + // write type, and reserve space for values count + bv.putShort(cw.newUTF8(desc)).putShort(0); + AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, 2); + if (visible) { + if (panns == null) { + panns = new AnnotationWriter[Type.getArgumentTypes(descriptor).length]; + } + aw.next = panns[parameter]; + panns[parameter] = aw; + } else { + if (ipanns == null) { + ipanns = new AnnotationWriter[Type.getArgumentTypes(descriptor).length]; + } + aw.next = ipanns[parameter]; + ipanns[parameter] = aw; + } + return aw; + } + + @Override + public void visitAttribute(final Attribute attr) { + if (attr.isCodeAttribute()) { + attr.next = cattrs; + cattrs = attr; + } else { + attr.next = attrs; + attrs = attr; + } + } + + @Override + public void visitCode() { + } + + @Override + public void visitFrame(final int type, final int nLocal, + final Object[] local, final int nStack, final Object[] stack) { + if (!ClassReader.FRAMES || compute == FRAMES) { + return; + } + + if (type == Opcodes.F_NEW) { + if (previousFrame == null) { + visitImplicitFirstFrame(); + } + currentLocals = nLocal; + int frameIndex = startFrame(code.length, nLocal, nStack); + for (int i = 0; i < nLocal; ++i) { + if (local[i] instanceof String) { + frame[frameIndex++] = Frame.OBJECT + | cw.addType((String) local[i]); + } else if (local[i] instanceof Integer) { + frame[frameIndex++] = ((Integer) local[i]).intValue(); + } else { + frame[frameIndex++] = Frame.UNINITIALIZED + | cw.addUninitializedType("", + ((Label) local[i]).position); + } + } + for (int i = 0; i < nStack; ++i) { + if (stack[i] instanceof String) { + frame[frameIndex++] = Frame.OBJECT + | cw.addType((String) stack[i]); + } else if (stack[i] instanceof Integer) { + frame[frameIndex++] = ((Integer) stack[i]).intValue(); + } else { + frame[frameIndex++] = Frame.UNINITIALIZED + | cw.addUninitializedType("", + ((Label) stack[i]).position); + } + } + endFrame(); + } else { + int delta; + if (stackMap == null) { + stackMap = new ByteVector(); + delta = code.length; + } else { + delta = code.length - previousFrameOffset - 1; + if (delta < 0) { + if (type == Opcodes.F_SAME) { + return; + } else { + throw new IllegalStateException(); + } + } + } + + switch (type) { + case Opcodes.F_FULL: + currentLocals = nLocal; + stackMap.putByte(FULL_FRAME).putShort(delta).putShort(nLocal); + for (int i = 0; i < nLocal; ++i) { + writeFrameType(local[i]); + } + stackMap.putShort(nStack); + for (int i = 0; i < nStack; ++i) { + writeFrameType(stack[i]); + } + break; + case Opcodes.F_APPEND: + currentLocals += nLocal; + stackMap.putByte(SAME_FRAME_EXTENDED + nLocal).putShort(delta); + for (int i = 0; i < nLocal; ++i) { + writeFrameType(local[i]); + } + break; + case Opcodes.F_CHOP: + currentLocals -= nLocal; + stackMap.putByte(SAME_FRAME_EXTENDED - nLocal).putShort(delta); + break; + case Opcodes.F_SAME: + if (delta < 64) { + stackMap.putByte(delta); + } else { + stackMap.putByte(SAME_FRAME_EXTENDED).putShort(delta); + } + break; + case Opcodes.F_SAME1: + if (delta < 64) { + stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME + delta); + } else { + stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) + .putShort(delta); + } + writeFrameType(stack[0]); + break; + } + + previousFrameOffset = code.length; + ++frameCount; + } + + maxStack = Math.max(maxStack, nStack); + maxLocals = Math.max(maxLocals, currentLocals); + } + + @Override + public void visitInsn(final int opcode) { + lastCodeOffset = code.length; + // adds the instruction to the bytecode of the method + code.putByte(opcode); + // update currentBlock + // Label currentBlock = this.currentBlock; + if (currentBlock != null) { + if (compute == FRAMES) { + currentBlock.frame.execute(opcode, 0, null, null); + } else { + // updates current and max stack sizes + int size = stackSize + Frame.SIZE[opcode]; + if (size > maxStackSize) { + maxStackSize = size; + } + stackSize = size; + } + // if opcode == ATHROW or xRETURN, ends current block (no successor) + if ((opcode >= Opcodes.IRETURN && opcode <= Opcodes.RETURN) + || opcode == Opcodes.ATHROW) { + noSuccessor(); + } + } + } + + @Override + public void visitIntInsn(final int opcode, final int operand) { + lastCodeOffset = code.length; + // Label currentBlock = this.currentBlock; + if (currentBlock != null) { + if (compute == FRAMES) { + currentBlock.frame.execute(opcode, operand, null, null); + } else if (opcode != Opcodes.NEWARRAY) { + // updates current and max stack sizes only for NEWARRAY + // (stack size variation = 0 for BIPUSH or SIPUSH) + int size = stackSize + 1; + if (size > maxStackSize) { + maxStackSize = size; + } + stackSize = size; + } + } + // adds the instruction to the bytecode of the method + if (opcode == Opcodes.SIPUSH) { + code.put12(opcode, operand); + } else { // BIPUSH or NEWARRAY + code.put11(opcode, operand); + } + } + + @Override + public void visitVarInsn(final int opcode, final int var) { + lastCodeOffset = code.length; + // Label currentBlock = this.currentBlock; + if (currentBlock != null) { + if (compute == FRAMES) { + currentBlock.frame.execute(opcode, var, null, null); + } else { + // updates current and max stack sizes + if (opcode == Opcodes.RET) { + // no stack change, but end of current block (no successor) + currentBlock.status |= Label.RET; + // save 'stackSize' here for future use + // (see {@link #findSubroutineSuccessors}) + currentBlock.inputStackTop = stackSize; + noSuccessor(); + } else { // xLOAD or xSTORE + int size = stackSize + Frame.SIZE[opcode]; + if (size > maxStackSize) { + maxStackSize = size; + } + stackSize = size; + } + } + } + if (compute != NOTHING) { + // updates max locals + int n; + if (opcode == Opcodes.LLOAD || opcode == Opcodes.DLOAD + || opcode == Opcodes.LSTORE || opcode == Opcodes.DSTORE) { + n = var + 2; + } else { + n = var + 1; + } + if (n > maxLocals) { + maxLocals = n; + } + } + // adds the instruction to the bytecode of the method + if (var < 4 && opcode != Opcodes.RET) { + int opt; + if (opcode < Opcodes.ISTORE) { + /* ILOAD_0 */ + opt = 26 + ((opcode - Opcodes.ILOAD) << 2) + var; + } else { + /* ISTORE_0 */ + opt = 59 + ((opcode - Opcodes.ISTORE) << 2) + var; + } + code.putByte(opt); + } else if (var >= 256) { + code.putByte(196 /* WIDE */).put12(opcode, var); + } else { + code.put11(opcode, var); + } + if (opcode >= Opcodes.ISTORE && compute == FRAMES && handlerCount > 0) { + visitLabel(new Label()); + } + } + + @Override + public void visitTypeInsn(final int opcode, final String type) { + lastCodeOffset = code.length; + Item i = cw.newClassItem(type); + // Label currentBlock = this.currentBlock; + if (currentBlock != null) { + if (compute == FRAMES) { + currentBlock.frame.execute(opcode, code.length, cw, i); + } else if (opcode == Opcodes.NEW) { + // updates current and max stack sizes only if opcode == NEW + // (no stack change for ANEWARRAY, CHECKCAST, INSTANCEOF) + int size = stackSize + 1; + if (size > maxStackSize) { + maxStackSize = size; + } + stackSize = size; + } + } + // adds the instruction to the bytecode of the method + code.put12(opcode, i.index); + } + + @Override + public void visitFieldInsn(final int opcode, final String owner, + final String name, final String desc) { + lastCodeOffset = code.length; + Item i = cw.newFieldItem(owner, name, desc); + // Label currentBlock = this.currentBlock; + if (currentBlock != null) { + if (compute == FRAMES) { + currentBlock.frame.execute(opcode, 0, cw, i); + } else { + int size; + // computes the stack size variation + char c = desc.charAt(0); + switch (opcode) { + case Opcodes.GETSTATIC: + size = stackSize + (c == 'D' || c == 'J' ? 2 : 1); + break; + case Opcodes.PUTSTATIC: + size = stackSize + (c == 'D' || c == 'J' ? -2 : -1); + break; + case Opcodes.GETFIELD: + size = stackSize + (c == 'D' || c == 'J' ? 1 : 0); + break; + // case Constants.PUTFIELD: + default: + size = stackSize + (c == 'D' || c == 'J' ? -3 : -2); + break; + } + // updates current and max stack sizes + if (size > maxStackSize) { + maxStackSize = size; + } + stackSize = size; + } + } + // adds the instruction to the bytecode of the method + code.put12(opcode, i.index); + } + + @Override + public void visitMethodInsn(final int opcode, final String owner, + final String name, final String desc, final boolean itf) { + lastCodeOffset = code.length; + Item i = cw.newMethodItem(owner, name, desc, itf); + int argSize = i.intVal; + // Label currentBlock = this.currentBlock; + if (currentBlock != null) { + if (compute == FRAMES) { + currentBlock.frame.execute(opcode, 0, cw, i); + } else { + /* + * computes the stack size variation. In order not to recompute + * several times this variation for the same Item, we use the + * intVal field of this item to store this variation, once it + * has been computed. More precisely this intVal field stores + * the sizes of the arguments and of the return value + * corresponding to desc. + */ + if (argSize == 0) { + // the above sizes have not been computed yet, + // so we compute them... + argSize = Type.getArgumentsAndReturnSizes(desc); + // ... and we save them in order + // not to recompute them in the future + i.intVal = argSize; + } + int size; + if (opcode == Opcodes.INVOKESTATIC) { + size = stackSize - (argSize >> 2) + (argSize & 0x03) + 1; + } else { + size = stackSize - (argSize >> 2) + (argSize & 0x03); + } + // updates current and max stack sizes + if (size > maxStackSize) { + maxStackSize = size; + } + stackSize = size; + } + } + // adds the instruction to the bytecode of the method + if (opcode == Opcodes.INVOKEINTERFACE) { + if (argSize == 0) { + argSize = Type.getArgumentsAndReturnSizes(desc); + i.intVal = argSize; + } + code.put12(Opcodes.INVOKEINTERFACE, i.index).put11(argSize >> 2, 0); + } else { + code.put12(opcode, i.index); + } + } + + @Override + public void visitInvokeDynamicInsn(final String name, final String desc, + final Handle bsm, final Object... bsmArgs) { + lastCodeOffset = code.length; + Item i = cw.newInvokeDynamicItem(name, desc, bsm, bsmArgs); + int argSize = i.intVal; + // Label currentBlock = this.currentBlock; + if (currentBlock != null) { + if (compute == FRAMES) { + currentBlock.frame.execute(Opcodes.INVOKEDYNAMIC, 0, cw, i); + } else { + /* + * computes the stack size variation. In order not to recompute + * several times this variation for the same Item, we use the + * intVal field of this item to store this variation, once it + * has been computed. More precisely this intVal field stores + * the sizes of the arguments and of the return value + * corresponding to desc. + */ + if (argSize == 0) { + // the above sizes have not been computed yet, + // so we compute them... + argSize = Type.getArgumentsAndReturnSizes(desc); + // ... and we save them in order + // not to recompute them in the future + i.intVal = argSize; + } + int size = stackSize - (argSize >> 2) + (argSize & 0x03) + 1; + + // updates current and max stack sizes + if (size > maxStackSize) { + maxStackSize = size; + } + stackSize = size; + } + } + // adds the instruction to the bytecode of the method + code.put12(Opcodes.INVOKEDYNAMIC, i.index); + code.putShort(0); + } + + @Override + public void visitJumpInsn(final int opcode, final Label label) { + lastCodeOffset = code.length; + Label nextInsn = null; + // Label currentBlock = this.currentBlock; + if (currentBlock != null) { + if (compute == FRAMES) { + currentBlock.frame.execute(opcode, 0, null, null); + // 'label' is the target of a jump instruction + label.getFirst().status |= Label.TARGET; + // adds 'label' as a successor of this basic block + addSuccessor(Edge.NORMAL, label); + if (opcode != Opcodes.GOTO) { + // creates a Label for the next basic block + nextInsn = new Label(); + } + } else { + if (opcode == Opcodes.JSR) { + if ((label.status & Label.SUBROUTINE) == 0) { + label.status |= Label.SUBROUTINE; + ++subroutines; + } + currentBlock.status |= Label.JSR; + addSuccessor(stackSize + 1, label); + // creates a Label for the next basic block + nextInsn = new Label(); + /* + * note that, by construction in this method, a JSR block + * has at least two successors in the control flow graph: + * the first one leads the next instruction after the JSR, + * while the second one leads to the JSR target. + */ + } else { + // updates current stack size (max stack size unchanged + // because stack size variation always negative in this + // case) + stackSize += Frame.SIZE[opcode]; + addSuccessor(stackSize, label); + } + } + } + // adds the instruction to the bytecode of the method + if ((label.status & Label.RESOLVED) != 0 + && label.position - code.length < Short.MIN_VALUE) { + /* + * case of a backward jump with an offset < -32768. In this case we + * automatically replace GOTO with GOTO_W, JSR with JSR_W and IFxxx + * with IFNOTxxx GOTO_W , where IFNOTxxx is the + * "opposite" opcode of IFxxx (i.e., IFNE for IFEQ) and where + * designates the instruction just after the GOTO_W. + */ + if (opcode == Opcodes.GOTO) { + code.putByte(200); // GOTO_W + } else if (opcode == Opcodes.JSR) { + code.putByte(201); // JSR_W + } else { + // if the IF instruction is transformed into IFNOT GOTO_W the + // next instruction becomes the target of the IFNOT instruction + if (nextInsn != null) { + nextInsn.status |= Label.TARGET; + } + code.putByte(opcode <= 166 ? ((opcode + 1) ^ 1) - 1 + : opcode ^ 1); + code.putShort(8); // jump offset + code.putByte(200); // GOTO_W + } + label.put(this, code, code.length - 1, true); + } else { + /* + * case of a backward jump with an offset >= -32768, or of a forward + * jump with, of course, an unknown offset. In these cases we store + * the offset in 2 bytes (which will be increased in + * resizeInstructions, if needed). + */ + code.putByte(opcode); + label.put(this, code, code.length - 1, false); + } + if (currentBlock != null) { + if (nextInsn != null) { + // if the jump instruction is not a GOTO, the next instruction + // is also a successor of this instruction. Calling visitLabel + // adds the label of this next instruction as a successor of the + // current block, and starts a new basic block + visitLabel(nextInsn); + } + if (opcode == Opcodes.GOTO) { + noSuccessor(); + } + } + } + + @Override + public void visitLabel(final Label label) { + // resolves previous forward references to label, if any + resize |= label.resolve(this, code.length, code.data); + // updates currentBlock + if ((label.status & Label.DEBUG) != 0) { + return; + } + if (compute == FRAMES) { + if (currentBlock != null) { + if (label.position == currentBlock.position) { + // successive labels, do not start a new basic block + currentBlock.status |= (label.status & Label.TARGET); + label.frame = currentBlock.frame; + return; + } + // ends current block (with one new successor) + addSuccessor(Edge.NORMAL, label); + } + // begins a new current block + currentBlock = label; + if (label.frame == null) { + label.frame = new Frame(); + label.frame.owner = label; + } + // updates the basic block list + if (previousBlock != null) { + if (label.position == previousBlock.position) { + previousBlock.status |= (label.status & Label.TARGET); + label.frame = previousBlock.frame; + currentBlock = previousBlock; + return; + } + previousBlock.successor = label; + } + previousBlock = label; + } else if (compute == MAXS) { + if (currentBlock != null) { + // ends current block (with one new successor) + currentBlock.outputStackMax = maxStackSize; + addSuccessor(stackSize, label); + } + // begins a new current block + currentBlock = label; + // resets the relative current and max stack sizes + stackSize = 0; + maxStackSize = 0; + // updates the basic block list + if (previousBlock != null) { + previousBlock.successor = label; + } + previousBlock = label; + } + } + + @Override + public void visitLdcInsn(final Object cst) { + lastCodeOffset = code.length; + Item i = cw.newConstItem(cst); + // Label currentBlock = this.currentBlock; + if (currentBlock != null) { + if (compute == FRAMES) { + currentBlock.frame.execute(Opcodes.LDC, 0, cw, i); + } else { + int size; + // computes the stack size variation + if (i.type == ClassWriter.LONG || i.type == ClassWriter.DOUBLE) { + size = stackSize + 2; + } else { + size = stackSize + 1; + } + // updates current and max stack sizes + if (size > maxStackSize) { + maxStackSize = size; + } + stackSize = size; + } + } + // adds the instruction to the bytecode of the method + int index = i.index; + if (i.type == ClassWriter.LONG || i.type == ClassWriter.DOUBLE) { + code.put12(20 /* LDC2_W */, index); + } else if (index >= 256) { + code.put12(19 /* LDC_W */, index); + } else { + code.put11(Opcodes.LDC, index); + } + } + + @Override + public void visitIincInsn(final int var, final int increment) { + lastCodeOffset = code.length; + if (currentBlock != null) { + if (compute == FRAMES) { + currentBlock.frame.execute(Opcodes.IINC, var, null, null); + } + } + if (compute != NOTHING) { + // updates max locals + int n = var + 1; + if (n > maxLocals) { + maxLocals = n; + } + } + // adds the instruction to the bytecode of the method + if ((var > 255) || (increment > 127) || (increment < -128)) { + code.putByte(196 /* WIDE */).put12(Opcodes.IINC, var) + .putShort(increment); + } else { + code.putByte(Opcodes.IINC).put11(var, increment); + } + } + + @Override + public void visitTableSwitchInsn(final int min, final int max, + final Label dflt, final Label... labels) { + lastCodeOffset = code.length; + // adds the instruction to the bytecode of the method + int source = code.length; + code.putByte(Opcodes.TABLESWITCH); + code.putByteArray(null, 0, (4 - code.length % 4) % 4); + dflt.put(this, code, source, true); + code.putInt(min).putInt(max); + for (int i = 0; i < labels.length; ++i) { + labels[i].put(this, code, source, true); + } + // updates currentBlock + visitSwitchInsn(dflt, labels); + } + + @Override + public void visitLookupSwitchInsn(final Label dflt, final int[] keys, + final Label[] labels) { + lastCodeOffset = code.length; + // adds the instruction to the bytecode of the method + int source = code.length; + code.putByte(Opcodes.LOOKUPSWITCH); + code.putByteArray(null, 0, (4 - code.length % 4) % 4); + dflt.put(this, code, source, true); + code.putInt(labels.length); + for (int i = 0; i < labels.length; ++i) { + code.putInt(keys[i]); + labels[i].put(this, code, source, true); + } + // updates currentBlock + visitSwitchInsn(dflt, labels); + } + + private void visitSwitchInsn(final Label dflt, final Label[] labels) { + // Label currentBlock = this.currentBlock; + if (currentBlock != null) { + if (compute == FRAMES) { + currentBlock.frame.execute(Opcodes.LOOKUPSWITCH, 0, null, null); + // adds current block successors + addSuccessor(Edge.NORMAL, dflt); + dflt.getFirst().status |= Label.TARGET; + for (int i = 0; i < labels.length; ++i) { + addSuccessor(Edge.NORMAL, labels[i]); + labels[i].getFirst().status |= Label.TARGET; + } + } else { + // updates current stack size (max stack size unchanged) + --stackSize; + // adds current block successors + addSuccessor(stackSize, dflt); + for (int i = 0; i < labels.length; ++i) { + addSuccessor(stackSize, labels[i]); + } + } + // ends current block + noSuccessor(); + } + } + + @Override + public void visitMultiANewArrayInsn(final String desc, final int dims) { + lastCodeOffset = code.length; + Item i = cw.newClassItem(desc); + // Label currentBlock = this.currentBlock; + if (currentBlock != null) { + if (compute == FRAMES) { + currentBlock.frame.execute(Opcodes.MULTIANEWARRAY, dims, cw, i); + } else { + // updates current stack size (max stack size unchanged because + // stack size variation always negative or null) + stackSize += 1 - dims; + } + } + // adds the instruction to the bytecode of the method + code.put12(Opcodes.MULTIANEWARRAY, i.index).putByte(dims); + } + + @Override + public AnnotationVisitor visitInsnAnnotation(int typeRef, + TypePath typePath, String desc, boolean visible) { + if (!ClassReader.ANNOTATIONS) { + return null; + } + ByteVector bv = new ByteVector(); + // write target_type and target_info + typeRef = (typeRef & 0xFF0000FF) | (lastCodeOffset << 8); + AnnotationWriter.putTarget(typeRef, typePath, bv); + // write type, and reserve space for values count + bv.putShort(cw.newUTF8(desc)).putShort(0); + AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, + bv.length - 2); + if (visible) { + aw.next = ctanns; + ctanns = aw; + } else { + aw.next = ictanns; + ictanns = aw; + } + return aw; + } + + @Override + public void visitTryCatchBlock(final Label start, final Label end, + final Label handler, final String type) { + ++handlerCount; + Handler h = new Handler(); + h.start = start; + h.end = end; + h.handler = handler; + h.desc = type; + h.type = type != null ? cw.newClass(type) : 0; + if (lastHandler == null) { + firstHandler = h; + } else { + lastHandler.next = h; + } + lastHandler = h; + } + + @Override + public AnnotationVisitor visitTryCatchAnnotation(int typeRef, + TypePath typePath, String desc, boolean visible) { + if (!ClassReader.ANNOTATIONS) { + return null; + } + ByteVector bv = new ByteVector(); + // write target_type and target_info + AnnotationWriter.putTarget(typeRef, typePath, bv); + // write type, and reserve space for values count + bv.putShort(cw.newUTF8(desc)).putShort(0); + AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, + bv.length - 2); + if (visible) { + aw.next = ctanns; + ctanns = aw; + } else { + aw.next = ictanns; + ictanns = aw; + } + return aw; + } + + @Override + public void visitLocalVariable(final String name, final String desc, + final String signature, final Label start, final Label end, + final int index) { + if (signature != null) { + if (localVarType == null) { + localVarType = new ByteVector(); + } + ++localVarTypeCount; + localVarType.putShort(start.position) + .putShort(end.position - start.position) + .putShort(cw.newUTF8(name)).putShort(cw.newUTF8(signature)) + .putShort(index); + } + if (localVar == null) { + localVar = new ByteVector(); + } + ++localVarCount; + localVar.putShort(start.position) + .putShort(end.position - start.position) + .putShort(cw.newUTF8(name)).putShort(cw.newUTF8(desc)) + .putShort(index); + if (compute != NOTHING) { + // updates max locals + char c = desc.charAt(0); + int n = index + (c == 'J' || c == 'D' ? 2 : 1); + if (n > maxLocals) { + maxLocals = n; + } + } + } + + @Override + public AnnotationVisitor visitLocalVariableAnnotation(int typeRef, + TypePath typePath, Label[] start, Label[] end, int[] index, + String desc, boolean visible) { + if (!ClassReader.ANNOTATIONS) { + return null; + } + ByteVector bv = new ByteVector(); + // write target_type and target_info + bv.putByte(typeRef >>> 24).putShort(start.length); + for (int i = 0; i < start.length; ++i) { + bv.putShort(start[i].position) + .putShort(end[i].position - start[i].position) + .putShort(index[i]); + } + if (typePath == null) { + bv.putByte(0); + } else { + int length = typePath.b[typePath.offset] * 2 + 1; + bv.putByteArray(typePath.b, typePath.offset, length); + } + // write type, and reserve space for values count + bv.putShort(cw.newUTF8(desc)).putShort(0); + AnnotationWriter aw = new AnnotationWriter(cw, true, bv, bv, + bv.length - 2); + if (visible) { + aw.next = ctanns; + ctanns = aw; + } else { + aw.next = ictanns; + ictanns = aw; + } + return aw; + } + + @Override + public void visitLineNumber(final int line, final Label start) { + if (lineNumber == null) { + lineNumber = new ByteVector(); + } + ++lineNumberCount; + lineNumber.putShort(start.position); + lineNumber.putShort(line); + } + + @Override + public void visitMaxs(final int maxStack, final int maxLocals) { + if (resize) { + // replaces the temporary jump opcodes introduced by Label.resolve. + if (ClassReader.RESIZE) { + resizeInstructions(); + } else { + throw new RuntimeException("Method code too large!"); + } + } + if (ClassReader.FRAMES && compute == FRAMES) { + // completes the control flow graph with exception handler blocks + Handler handler = firstHandler; + while (handler != null) { + Label l = handler.start.getFirst(); + Label h = handler.handler.getFirst(); + Label e = handler.end.getFirst(); + // computes the kind of the edges to 'h' + String t = handler.desc == null ? "java/lang/Throwable" + : handler.desc; + int kind = Frame.OBJECT | cw.addType(t); + // h is an exception handler + h.status |= Label.TARGET; + // adds 'h' as a successor of labels between 'start' and 'end' + while (l != e) { + // creates an edge to 'h' + Edge b = new Edge(); + b.info = kind; + b.successor = h; + // adds it to the successors of 'l' + b.next = l.successors; + l.successors = b; + // goes to the next label + l = l.successor; + } + handler = handler.next; + } + + // creates and visits the first (implicit) frame + Frame f = labels.frame; + Type[] args = Type.getArgumentTypes(descriptor); + f.initInputFrame(cw, access, args, this.maxLocals); + visitFrame(f); + + /* + * fix point algorithm: mark the first basic block as 'changed' + * (i.e. put it in the 'changed' list) and, while there are changed + * basic blocks, choose one, mark it as unchanged, and update its + * successors (which can be changed in the process). + */ + int max = 0; + Label changed = labels; + while (changed != null) { + // removes a basic block from the list of changed basic blocks + Label l = changed; + changed = changed.next; + l.next = null; + f = l.frame; + // a reachable jump target must be stored in the stack map + if ((l.status & Label.TARGET) != 0) { + l.status |= Label.STORE; + } + // all visited labels are reachable, by definition + l.status |= Label.REACHABLE; + // updates the (absolute) maximum stack size + int blockMax = f.inputStack.length + l.outputStackMax; + if (blockMax > max) { + max = blockMax; + } + // updates the successors of the current basic block + Edge e = l.successors; + while (e != null) { + Label n = e.successor.getFirst(); + boolean change = f.merge(cw, n.frame, e.info); + if (change && n.next == null) { + // if n has changed and is not already in the 'changed' + // list, adds it to this list + n.next = changed; + changed = n; + } + e = e.next; + } + } + + // visits all the frames that must be stored in the stack map + Label l = labels; + while (l != null) { + f = l.frame; + if ((l.status & Label.STORE) != 0) { + visitFrame(f); + } + if ((l.status & Label.REACHABLE) == 0) { + // finds start and end of dead basic block + Label k = l.successor; + int start = l.position; + int end = (k == null ? code.length : k.position) - 1; + // if non empty basic block + if (end >= start) { + max = Math.max(max, 1); + // replaces instructions with NOP ... NOP ATHROW + for (int i = start; i < end; ++i) { + code.data[i] = Opcodes.NOP; + } + code.data[end] = (byte) Opcodes.ATHROW; + // emits a frame for this unreachable block + int frameIndex = startFrame(start, 0, 1); + frame[frameIndex] = Frame.OBJECT + | cw.addType("java/lang/Throwable"); + endFrame(); + // removes the start-end range from the exception + // handlers + firstHandler = Handler.remove(firstHandler, l, k); + } + } + l = l.successor; + } + + handler = firstHandler; + handlerCount = 0; + while (handler != null) { + handlerCount += 1; + handler = handler.next; + } + + this.maxStack = max; + } else if (compute == MAXS) { + // completes the control flow graph with exception handler blocks + Handler handler = firstHandler; + while (handler != null) { + Label l = handler.start; + Label h = handler.handler; + Label e = handler.end; + // adds 'h' as a successor of labels between 'start' and 'end' + while (l != e) { + // creates an edge to 'h' + Edge b = new Edge(); + b.info = Edge.EXCEPTION; + b.successor = h; + // adds it to the successors of 'l' + if ((l.status & Label.JSR) == 0) { + b.next = l.successors; + l.successors = b; + } else { + // if l is a JSR block, adds b after the first two edges + // to preserve the hypothesis about JSR block successors + // order (see {@link #visitJumpInsn}) + b.next = l.successors.next.next; + l.successors.next.next = b; + } + // goes to the next label + l = l.successor; + } + handler = handler.next; + } + + if (subroutines > 0) { + // completes the control flow graph with the RET successors + /* + * first step: finds the subroutines. This step determines, for + * each basic block, to which subroutine(s) it belongs. + */ + // finds the basic blocks that belong to the "main" subroutine + int id = 0; + labels.visitSubroutine(null, 1, subroutines); + // finds the basic blocks that belong to the real subroutines + Label l = labels; + while (l != null) { + if ((l.status & Label.JSR) != 0) { + // the subroutine is defined by l's TARGET, not by l + Label subroutine = l.successors.next.successor; + // if this subroutine has not been visited yet... + if ((subroutine.status & Label.VISITED) == 0) { + // ...assigns it a new id and finds its basic blocks + id += 1; + subroutine.visitSubroutine(null, (id / 32L) << 32 + | (1L << (id % 32)), subroutines); + } + } + l = l.successor; + } + // second step: finds the successors of RET blocks + l = labels; + while (l != null) { + if ((l.status & Label.JSR) != 0) { + Label L = labels; + while (L != null) { + L.status &= ~Label.VISITED2; + L = L.successor; + } + // the subroutine is defined by l's TARGET, not by l + Label subroutine = l.successors.next.successor; + subroutine.visitSubroutine(l, 0, subroutines); + } + l = l.successor; + } + } + + /* + * control flow analysis algorithm: while the block stack is not + * empty, pop a block from this stack, update the max stack size, + * compute the true (non relative) begin stack size of the + * successors of this block, and push these successors onto the + * stack (unless they have already been pushed onto the stack). + * Note: by hypothesis, the {@link Label#inputStackTop} of the + * blocks in the block stack are the true (non relative) beginning + * stack sizes of these blocks. + */ + int max = 0; + Label stack = labels; + while (stack != null) { + // pops a block from the stack + Label l = stack; + stack = stack.next; + // computes the true (non relative) max stack size of this block + int start = l.inputStackTop; + int blockMax = start + l.outputStackMax; + // updates the global max stack size + if (blockMax > max) { + max = blockMax; + } + // analyzes the successors of the block + Edge b = l.successors; + if ((l.status & Label.JSR) != 0) { + // ignores the first edge of JSR blocks (virtual successor) + b = b.next; + } + while (b != null) { + l = b.successor; + // if this successor has not already been pushed... + if ((l.status & Label.PUSHED) == 0) { + // computes its true beginning stack size... + l.inputStackTop = b.info == Edge.EXCEPTION ? 1 : start + + b.info; + // ...and pushes it onto the stack + l.status |= Label.PUSHED; + l.next = stack; + stack = l; + } + b = b.next; + } + } + this.maxStack = Math.max(maxStack, max); + } else { + this.maxStack = maxStack; + this.maxLocals = maxLocals; + } + } + + @Override + public void visitEnd() { + } + + // ------------------------------------------------------------------------ + // Utility methods: control flow analysis algorithm + // ------------------------------------------------------------------------ + + /** + * Adds a successor to the {@link #currentBlock currentBlock} block. + * + * @param info + * information about the control flow edge to be added. + * @param successor + * the successor block to be added to the current block. + */ + private void addSuccessor(final int info, final Label successor) { + // creates and initializes an Edge object... + Edge b = new Edge(); + b.info = info; + b.successor = successor; + // ...and adds it to the successor list of the currentBlock block + b.next = currentBlock.successors; + currentBlock.successors = b; + } + + /** + * Ends the current basic block. This method must be used in the case where + * the current basic block does not have any successor. + */ + private void noSuccessor() { + if (compute == FRAMES) { + Label l = new Label(); + l.frame = new Frame(); + l.frame.owner = l; + l.resolve(this, code.length, code.data); + previousBlock.successor = l; + previousBlock = l; + } else { + currentBlock.outputStackMax = maxStackSize; + } + currentBlock = null; + } + + // ------------------------------------------------------------------------ + // Utility methods: stack map frames + // ------------------------------------------------------------------------ + + /** + * Visits a frame that has been computed from scratch. + * + * @param f + * the frame that must be visited. + */ + private void visitFrame(final Frame f) { + int i, t; + int nTop = 0; + int nLocal = 0; + int nStack = 0; + int[] locals = f.inputLocals; + int[] stacks = f.inputStack; + // computes the number of locals (ignores TOP types that are just after + // a LONG or a DOUBLE, and all trailing TOP types) + for (i = 0; i < locals.length; ++i) { + t = locals[i]; + if (t == Frame.TOP) { + ++nTop; + } else { + nLocal += nTop + 1; + nTop = 0; + } + if (t == Frame.LONG || t == Frame.DOUBLE) { + ++i; + } + } + // computes the stack size (ignores TOP types that are just after + // a LONG or a DOUBLE) + for (i = 0; i < stacks.length; ++i) { + t = stacks[i]; + ++nStack; + if (t == Frame.LONG || t == Frame.DOUBLE) { + ++i; + } + } + // visits the frame and its content + int frameIndex = startFrame(f.owner.position, nLocal, nStack); + for (i = 0; nLocal > 0; ++i, --nLocal) { + t = locals[i]; + frame[frameIndex++] = t; + if (t == Frame.LONG || t == Frame.DOUBLE) { + ++i; + } + } + for (i = 0; i < stacks.length; ++i) { + t = stacks[i]; + frame[frameIndex++] = t; + if (t == Frame.LONG || t == Frame.DOUBLE) { + ++i; + } + } + endFrame(); + } + + /** + * Visit the implicit first frame of this method. + */ + private void visitImplicitFirstFrame() { + // There can be at most descriptor.length() + 1 locals + int frameIndex = startFrame(0, descriptor.length() + 1, 0); + if ((access & Opcodes.ACC_STATIC) == 0) { + if ((access & ACC_CONSTRUCTOR) == 0) { + frame[frameIndex++] = Frame.OBJECT | cw.addType(cw.thisName); + } else { + frame[frameIndex++] = 6; // Opcodes.UNINITIALIZED_THIS; + } + } + int i = 1; + loop: while (true) { + int j = i; + switch (descriptor.charAt(i++)) { + case 'Z': + case 'C': + case 'B': + case 'S': + case 'I': + frame[frameIndex++] = 1; // Opcodes.INTEGER; + break; + case 'F': + frame[frameIndex++] = 2; // Opcodes.FLOAT; + break; + case 'J': + frame[frameIndex++] = 4; // Opcodes.LONG; + break; + case 'D': + frame[frameIndex++] = 3; // Opcodes.DOUBLE; + break; + case '[': + while (descriptor.charAt(i) == '[') { + ++i; + } + if (descriptor.charAt(i) == 'L') { + ++i; + while (descriptor.charAt(i) != ';') { + ++i; + } + } + frame[frameIndex++] = Frame.OBJECT + | cw.addType(descriptor.substring(j, ++i)); + break; + case 'L': + while (descriptor.charAt(i) != ';') { + ++i; + } + frame[frameIndex++] = Frame.OBJECT + | cw.addType(descriptor.substring(j + 1, i++)); + break; + default: + break loop; + } + } + frame[1] = frameIndex - 3; + endFrame(); + } + + /** + * Starts the visit of a stack map frame. + * + * @param offset + * the offset of the instruction to which the frame corresponds. + * @param nLocal + * the number of local variables in the frame. + * @param nStack + * the number of stack elements in the frame. + * @return the index of the next element to be written in this frame. + */ + private int startFrame(final int offset, final int nLocal, final int nStack) { + int n = 3 + nLocal + nStack; + if (frame == null || frame.length < n) { + frame = new int[n]; + } + frame[0] = offset; + frame[1] = nLocal; + frame[2] = nStack; + return 3; + } + + /** + * Checks if the visit of the current frame {@link #frame} is finished, and + * if yes, write it in the StackMapTable attribute. + */ + private void endFrame() { + if (previousFrame != null) { // do not write the first frame + if (stackMap == null) { + stackMap = new ByteVector(); + } + writeFrame(); + ++frameCount; + } + previousFrame = frame; + frame = null; + } + + /** + * Compress and writes the current frame {@link #frame} in the StackMapTable + * attribute. + */ + private void writeFrame() { + int clocalsSize = frame[1]; + int cstackSize = frame[2]; + if ((cw.version & 0xFFFF) < Opcodes.V1_6) { + stackMap.putShort(frame[0]).putShort(clocalsSize); + writeFrameTypes(3, 3 + clocalsSize); + stackMap.putShort(cstackSize); + writeFrameTypes(3 + clocalsSize, 3 + clocalsSize + cstackSize); + return; + } + int localsSize = previousFrame[1]; + int type = FULL_FRAME; + int k = 0; + int delta; + if (frameCount == 0) { + delta = frame[0]; + } else { + delta = frame[0] - previousFrame[0] - 1; + } + if (cstackSize == 0) { + k = clocalsSize - localsSize; + switch (k) { + case -3: + case -2: + case -1: + type = CHOP_FRAME; + localsSize = clocalsSize; + break; + case 0: + type = delta < 64 ? SAME_FRAME : SAME_FRAME_EXTENDED; + break; + case 1: + case 2: + case 3: + type = APPEND_FRAME; + break; + } + } else if (clocalsSize == localsSize && cstackSize == 1) { + type = delta < 63 ? SAME_LOCALS_1_STACK_ITEM_FRAME + : SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED; + } + if (type != FULL_FRAME) { + // verify if locals are the same + int l = 3; + for (int j = 0; j < localsSize; j++) { + if (frame[l] != previousFrame[l]) { + type = FULL_FRAME; + break; + } + l++; + } + } + switch (type) { + case SAME_FRAME: + stackMap.putByte(delta); + break; + case SAME_LOCALS_1_STACK_ITEM_FRAME: + stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME + delta); + writeFrameTypes(3 + clocalsSize, 4 + clocalsSize); + break; + case SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED: + stackMap.putByte(SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED).putShort( + delta); + writeFrameTypes(3 + clocalsSize, 4 + clocalsSize); + break; + case SAME_FRAME_EXTENDED: + stackMap.putByte(SAME_FRAME_EXTENDED).putShort(delta); + break; + case CHOP_FRAME: + stackMap.putByte(SAME_FRAME_EXTENDED + k).putShort(delta); + break; + case APPEND_FRAME: + stackMap.putByte(SAME_FRAME_EXTENDED + k).putShort(delta); + writeFrameTypes(3 + localsSize, 3 + clocalsSize); + break; + // case FULL_FRAME: + default: + stackMap.putByte(FULL_FRAME).putShort(delta).putShort(clocalsSize); + writeFrameTypes(3, 3 + clocalsSize); + stackMap.putShort(cstackSize); + writeFrameTypes(3 + clocalsSize, 3 + clocalsSize + cstackSize); + } + } + + /** + * Writes some types of the current frame {@link #frame} into the + * StackMapTableAttribute. This method converts types from the format used + * in {@link Label} to the format used in StackMapTable attributes. In + * particular, it converts type table indexes to constant pool indexes. + * + * @param start + * index of the first type in {@link #frame} to write. + * @param end + * index of last type in {@link #frame} to write (exclusive). + */ + private void writeFrameTypes(final int start, final int end) { + for (int i = start; i < end; ++i) { + int t = frame[i]; + int d = t & Frame.DIM; + if (d == 0) { + int v = t & Frame.BASE_VALUE; + switch (t & Frame.BASE_KIND) { + case Frame.OBJECT: + stackMap.putByte(7).putShort( + cw.newClass(cw.typeTable[v].strVal1)); + break; + case Frame.UNINITIALIZED: + stackMap.putByte(8).putShort(cw.typeTable[v].intVal); + break; + default: + stackMap.putByte(v); + } + } else { + StringBuilder sb = new StringBuilder(); + d >>= 28; + while (d-- > 0) { + sb.append('['); + } + if ((t & Frame.BASE_KIND) == Frame.OBJECT) { + sb.append('L'); + sb.append(cw.typeTable[t & Frame.BASE_VALUE].strVal1); + sb.append(';'); + } else { + switch (t & 0xF) { + case 1: + sb.append('I'); + break; + case 2: + sb.append('F'); + break; + case 3: + sb.append('D'); + break; + case 9: + sb.append('Z'); + break; + case 10: + sb.append('B'); + break; + case 11: + sb.append('C'); + break; + case 12: + sb.append('S'); + break; + default: + sb.append('J'); + } + } + stackMap.putByte(7).putShort(cw.newClass(sb.toString())); + } + } + } + + private void writeFrameType(final Object type) { + if (type instanceof String) { + stackMap.putByte(7).putShort(cw.newClass((String) type)); + } else if (type instanceof Integer) { + stackMap.putByte(((Integer) type).intValue()); + } else { + stackMap.putByte(8).putShort(((Label) type).position); + } + } + + // ------------------------------------------------------------------------ + // Utility methods: dump bytecode array + // ------------------------------------------------------------------------ + + /** + * Returns the size of the bytecode of this method. + * + * @return the size of the bytecode of this method. + */ + final int getSize() { + if (classReaderOffset != 0) { + return 6 + classReaderLength; + } + int size = 8; + if (code.length > 0) { + if (code.length > 65536) { + throw new RuntimeException("Method code too large!"); + } + cw.newUTF8("Code"); + size += 18 + code.length + 8 * handlerCount; + if (localVar != null) { + cw.newUTF8("LocalVariableTable"); + size += 8 + localVar.length; + } + if (localVarType != null) { + cw.newUTF8("LocalVariableTypeTable"); + size += 8 + localVarType.length; + } + if (lineNumber != null) { + cw.newUTF8("LineNumberTable"); + size += 8 + lineNumber.length; + } + if (stackMap != null) { + boolean zip = (cw.version & 0xFFFF) >= Opcodes.V1_6; + cw.newUTF8(zip ? "StackMapTable" : "StackMap"); + size += 8 + stackMap.length; + } + if (ClassReader.ANNOTATIONS && ctanns != null) { + cw.newUTF8("RuntimeVisibleTypeAnnotations"); + size += 8 + ctanns.getSize(); + } + if (ClassReader.ANNOTATIONS && ictanns != null) { + cw.newUTF8("RuntimeInvisibleTypeAnnotations"); + size += 8 + ictanns.getSize(); + } + if (cattrs != null) { + size += cattrs.getSize(cw, code.data, code.length, maxStack, + maxLocals); + } + } + if (exceptionCount > 0) { + cw.newUTF8("Exceptions"); + size += 8 + 2 * exceptionCount; + } + if ((access & Opcodes.ACC_SYNTHETIC) != 0) { + if ((cw.version & 0xFFFF) < Opcodes.V1_5 + || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0) { + cw.newUTF8("Synthetic"); + size += 6; + } + } + if ((access & Opcodes.ACC_DEPRECATED) != 0) { + cw.newUTF8("Deprecated"); + size += 6; + } + if (ClassReader.SIGNATURES && signature != null) { + cw.newUTF8("Signature"); + cw.newUTF8(signature); + size += 8; + } + if (methodParameters != null) { + cw.newUTF8("MethodParameters"); + size += 7 + methodParameters.length; + } + if (ClassReader.ANNOTATIONS && annd != null) { + cw.newUTF8("AnnotationDefault"); + size += 6 + annd.length; + } + if (ClassReader.ANNOTATIONS && anns != null) { + cw.newUTF8("RuntimeVisibleAnnotations"); + size += 8 + anns.getSize(); + } + if (ClassReader.ANNOTATIONS && ianns != null) { + cw.newUTF8("RuntimeInvisibleAnnotations"); + size += 8 + ianns.getSize(); + } + if (ClassReader.ANNOTATIONS && tanns != null) { + cw.newUTF8("RuntimeVisibleTypeAnnotations"); + size += 8 + tanns.getSize(); + } + if (ClassReader.ANNOTATIONS && itanns != null) { + cw.newUTF8("RuntimeInvisibleTypeAnnotations"); + size += 8 + itanns.getSize(); + } + if (ClassReader.ANNOTATIONS && panns != null) { + cw.newUTF8("RuntimeVisibleParameterAnnotations"); + size += 7 + 2 * (panns.length - synthetics); + for (int i = panns.length - 1; i >= synthetics; --i) { + size += panns[i] == null ? 0 : panns[i].getSize(); + } + } + if (ClassReader.ANNOTATIONS && ipanns != null) { + cw.newUTF8("RuntimeInvisibleParameterAnnotations"); + size += 7 + 2 * (ipanns.length - synthetics); + for (int i = ipanns.length - 1; i >= synthetics; --i) { + size += ipanns[i] == null ? 0 : ipanns[i].getSize(); + } + } + if (attrs != null) { + size += attrs.getSize(cw, null, 0, -1, -1); + } + return size; + } + + /** + * Puts the bytecode of this method in the given byte vector. + * + * @param out + * the byte vector into which the bytecode of this method must be + * copied. + */ + final void put(final ByteVector out) { + final int FACTOR = ClassWriter.TO_ACC_SYNTHETIC; + int mask = ACC_CONSTRUCTOR | Opcodes.ACC_DEPRECATED + | ClassWriter.ACC_SYNTHETIC_ATTRIBUTE + | ((access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) / FACTOR); + out.putShort(access & ~mask).putShort(name).putShort(desc); + if (classReaderOffset != 0) { + out.putByteArray(cw.cr.b, classReaderOffset, classReaderLength); + return; + } + int attributeCount = 0; + if (code.length > 0) { + ++attributeCount; + } + if (exceptionCount > 0) { + ++attributeCount; + } + if ((access & Opcodes.ACC_SYNTHETIC) != 0) { + if ((cw.version & 0xFFFF) < Opcodes.V1_5 + || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0) { + ++attributeCount; + } + } + if ((access & Opcodes.ACC_DEPRECATED) != 0) { + ++attributeCount; + } + if (ClassReader.SIGNATURES && signature != null) { + ++attributeCount; + } + if (methodParameters != null) { + ++attributeCount; + } + if (ClassReader.ANNOTATIONS && annd != null) { + ++attributeCount; + } + if (ClassReader.ANNOTATIONS && anns != null) { + ++attributeCount; + } + if (ClassReader.ANNOTATIONS && ianns != null) { + ++attributeCount; + } + if (ClassReader.ANNOTATIONS && tanns != null) { + ++attributeCount; + } + if (ClassReader.ANNOTATIONS && itanns != null) { + ++attributeCount; + } + if (ClassReader.ANNOTATIONS && panns != null) { + ++attributeCount; + } + if (ClassReader.ANNOTATIONS && ipanns != null) { + ++attributeCount; + } + if (attrs != null) { + attributeCount += attrs.getCount(); + } + out.putShort(attributeCount); + if (code.length > 0) { + int size = 12 + code.length + 8 * handlerCount; + if (localVar != null) { + size += 8 + localVar.length; + } + if (localVarType != null) { + size += 8 + localVarType.length; + } + if (lineNumber != null) { + size += 8 + lineNumber.length; + } + if (stackMap != null) { + size += 8 + stackMap.length; + } + if (ClassReader.ANNOTATIONS && ctanns != null) { + size += 8 + ctanns.getSize(); + } + if (ClassReader.ANNOTATIONS && ictanns != null) { + size += 8 + ictanns.getSize(); + } + if (cattrs != null) { + size += cattrs.getSize(cw, code.data, code.length, maxStack, + maxLocals); + } + out.putShort(cw.newUTF8("Code")).putInt(size); + out.putShort(maxStack).putShort(maxLocals); + out.putInt(code.length).putByteArray(code.data, 0, code.length); + out.putShort(handlerCount); + if (handlerCount > 0) { + Handler h = firstHandler; + while (h != null) { + out.putShort(h.start.position).putShort(h.end.position) + .putShort(h.handler.position).putShort(h.type); + h = h.next; + } + } + attributeCount = 0; + if (localVar != null) { + ++attributeCount; + } + if (localVarType != null) { + ++attributeCount; + } + if (lineNumber != null) { + ++attributeCount; + } + if (stackMap != null) { + ++attributeCount; + } + if (ClassReader.ANNOTATIONS && ctanns != null) { + ++attributeCount; + } + if (ClassReader.ANNOTATIONS && ictanns != null) { + ++attributeCount; + } + if (cattrs != null) { + attributeCount += cattrs.getCount(); + } + out.putShort(attributeCount); + if (localVar != null) { + out.putShort(cw.newUTF8("LocalVariableTable")); + out.putInt(localVar.length + 2).putShort(localVarCount); + out.putByteArray(localVar.data, 0, localVar.length); + } + if (localVarType != null) { + out.putShort(cw.newUTF8("LocalVariableTypeTable")); + out.putInt(localVarType.length + 2).putShort(localVarTypeCount); + out.putByteArray(localVarType.data, 0, localVarType.length); + } + if (lineNumber != null) { + out.putShort(cw.newUTF8("LineNumberTable")); + out.putInt(lineNumber.length + 2).putShort(lineNumberCount); + out.putByteArray(lineNumber.data, 0, lineNumber.length); + } + if (stackMap != null) { + boolean zip = (cw.version & 0xFFFF) >= Opcodes.V1_6; + out.putShort(cw.newUTF8(zip ? "StackMapTable" : "StackMap")); + out.putInt(stackMap.length + 2).putShort(frameCount); + out.putByteArray(stackMap.data, 0, stackMap.length); + } + if (ClassReader.ANNOTATIONS && ctanns != null) { + out.putShort(cw.newUTF8("RuntimeVisibleTypeAnnotations")); + ctanns.put(out); + } + if (ClassReader.ANNOTATIONS && ictanns != null) { + out.putShort(cw.newUTF8("RuntimeInvisibleTypeAnnotations")); + ictanns.put(out); + } + if (cattrs != null) { + cattrs.put(cw, code.data, code.length, maxLocals, maxStack, out); + } + } + if (exceptionCount > 0) { + out.putShort(cw.newUTF8("Exceptions")).putInt( + 2 * exceptionCount + 2); + out.putShort(exceptionCount); + for (int i = 0; i < exceptionCount; ++i) { + out.putShort(exceptions[i]); + } + } + if ((access & Opcodes.ACC_SYNTHETIC) != 0) { + if ((cw.version & 0xFFFF) < Opcodes.V1_5 + || (access & ClassWriter.ACC_SYNTHETIC_ATTRIBUTE) != 0) { + out.putShort(cw.newUTF8("Synthetic")).putInt(0); + } + } + if ((access & Opcodes.ACC_DEPRECATED) != 0) { + out.putShort(cw.newUTF8("Deprecated")).putInt(0); + } + if (ClassReader.SIGNATURES && signature != null) { + out.putShort(cw.newUTF8("Signature")).putInt(2) + .putShort(cw.newUTF8(signature)); + } + if (methodParameters != null) { + out.putShort(cw.newUTF8("MethodParameters")); + out.putInt(methodParameters.length + 1).putByte( + methodParametersCount); + out.putByteArray(methodParameters.data, 0, methodParameters.length); + } + if (ClassReader.ANNOTATIONS && annd != null) { + out.putShort(cw.newUTF8("AnnotationDefault")); + out.putInt(annd.length); + out.putByteArray(annd.data, 0, annd.length); + } + if (ClassReader.ANNOTATIONS && anns != null) { + out.putShort(cw.newUTF8("RuntimeVisibleAnnotations")); + anns.put(out); + } + if (ClassReader.ANNOTATIONS && ianns != null) { + out.putShort(cw.newUTF8("RuntimeInvisibleAnnotations")); + ianns.put(out); + } + if (ClassReader.ANNOTATIONS && tanns != null) { + out.putShort(cw.newUTF8("RuntimeVisibleTypeAnnotations")); + tanns.put(out); + } + if (ClassReader.ANNOTATIONS && itanns != null) { + out.putShort(cw.newUTF8("RuntimeInvisibleTypeAnnotations")); + itanns.put(out); + } + if (ClassReader.ANNOTATIONS && panns != null) { + out.putShort(cw.newUTF8("RuntimeVisibleParameterAnnotations")); + AnnotationWriter.put(panns, synthetics, out); + } + if (ClassReader.ANNOTATIONS && ipanns != null) { + out.putShort(cw.newUTF8("RuntimeInvisibleParameterAnnotations")); + AnnotationWriter.put(ipanns, synthetics, out); + } + if (attrs != null) { + attrs.put(cw, null, 0, -1, -1, out); + } + } + + // ------------------------------------------------------------------------ + // Utility methods: instruction resizing (used to handle GOTO_W and JSR_W) + // ------------------------------------------------------------------------ + + /** + * Resizes and replaces the temporary instructions inserted by + * {@link Label#resolve} for wide forward jumps, while keeping jump offsets + * and instruction addresses consistent. This may require to resize other + * existing instructions, or even to introduce new instructions: for + * example, increasing the size of an instruction by 2 at the middle of a + * method can increases the offset of an IFEQ instruction from 32766 to + * 32768, in which case IFEQ 32766 must be replaced with IFNEQ 8 GOTO_W + * 32765. This, in turn, may require to increase the size of another jump + * instruction, and so on... All these operations are handled automatically + * by this method. + *

+ * This method must be called after all the method that is being built + * has been visited. In particular, the {@link Label Label} objects used + * to construct the method are no longer valid after this method has been + * called. + */ + private void resizeInstructions() { + byte[] b = code.data; // bytecode of the method + int u, v, label; // indexes in b + int i, j; // loop indexes + /* + * 1st step: As explained above, resizing an instruction may require to + * resize another one, which may require to resize yet another one, and + * so on. The first step of the algorithm consists in finding all the + * instructions that need to be resized, without modifying the code. + * This is done by the following "fix point" algorithm: + * + * Parse the code to find the jump instructions whose offset will need + * more than 2 bytes to be stored (the future offset is computed from + * the current offset and from the number of bytes that will be inserted + * or removed between the source and target instructions). For each such + * instruction, adds an entry in (a copy of) the indexes and sizes + * arrays (if this has not already been done in a previous iteration!). + * + * If at least one entry has been added during the previous step, go + * back to the beginning, otherwise stop. + * + * In fact the real algorithm is complicated by the fact that the size + * of TABLESWITCH and LOOKUPSWITCH instructions depends on their + * position in the bytecode (because of padding). In order to ensure the + * convergence of the algorithm, the number of bytes to be added or + * removed from these instructions is over estimated during the previous + * loop, and computed exactly only after the loop is finished (this + * requires another pass to parse the bytecode of the method). + */ + int[] allIndexes = new int[0]; // copy of indexes + int[] allSizes = new int[0]; // copy of sizes + boolean[] resize; // instructions to be resized + int newOffset; // future offset of a jump instruction + + resize = new boolean[code.length]; + + // 3 = loop again, 2 = loop ended, 1 = last pass, 0 = done + int state = 3; + do { + if (state == 3) { + state = 2; + } + u = 0; + while (u < b.length) { + int opcode = b[u] & 0xFF; // opcode of current instruction + int insert = 0; // bytes to be added after this instruction + + switch (ClassWriter.TYPE[opcode]) { + case ClassWriter.NOARG_INSN: + case ClassWriter.IMPLVAR_INSN: + u += 1; + break; + case ClassWriter.LABEL_INSN: + if (opcode > 201) { + // converts temporary opcodes 202 to 217, 218 and + // 219 to IFEQ ... JSR (inclusive), IFNULL and + // IFNONNULL + opcode = opcode < 218 ? opcode - 49 : opcode - 20; + label = u + readUnsignedShort(b, u + 1); + } else { + label = u + readShort(b, u + 1); + } + newOffset = getNewOffset(allIndexes, allSizes, u, label); + if (newOffset < Short.MIN_VALUE + || newOffset > Short.MAX_VALUE) { + if (!resize[u]) { + if (opcode == Opcodes.GOTO || opcode == Opcodes.JSR) { + // two additional bytes will be required to + // replace this GOTO or JSR instruction with + // a GOTO_W or a JSR_W + insert = 2; + } else { + // five additional bytes will be required to + // replace this IFxxx instruction with + // IFNOTxxx GOTO_W , where IFNOTxxx + // is the "opposite" opcode of IFxxx (i.e., + // IFNE for IFEQ) and where designates + // the instruction just after the GOTO_W. + insert = 5; + } + resize[u] = true; + } + } + u += 3; + break; + case ClassWriter.LABELW_INSN: + u += 5; + break; + case ClassWriter.TABL_INSN: + if (state == 1) { + // true number of bytes to be added (or removed) + // from this instruction = (future number of padding + // bytes - current number of padding byte) - + // previously over estimated variation = + // = ((3 - newOffset%4) - (3 - u%4)) - u%4 + // = (-newOffset%4 + u%4) - u%4 + // = -(newOffset & 3) + newOffset = getNewOffset(allIndexes, allSizes, 0, u); + insert = -(newOffset & 3); + } else if (!resize[u]) { + // over estimation of the number of bytes to be + // added to this instruction = 3 - current number + // of padding bytes = 3 - (3 - u%4) = u%4 = u & 3 + insert = u & 3; + resize[u] = true; + } + // skips instruction + u = u + 4 - (u & 3); + u += 4 * (readInt(b, u + 8) - readInt(b, u + 4) + 1) + 12; + break; + case ClassWriter.LOOK_INSN: + if (state == 1) { + // like TABL_INSN + newOffset = getNewOffset(allIndexes, allSizes, 0, u); + insert = -(newOffset & 3); + } else if (!resize[u]) { + // like TABL_INSN + insert = u & 3; + resize[u] = true; + } + // skips instruction + u = u + 4 - (u & 3); + u += 8 * readInt(b, u + 4) + 8; + break; + case ClassWriter.WIDE_INSN: + opcode = b[u + 1] & 0xFF; + if (opcode == Opcodes.IINC) { + u += 6; + } else { + u += 4; + } + break; + case ClassWriter.VAR_INSN: + case ClassWriter.SBYTE_INSN: + case ClassWriter.LDC_INSN: + u += 2; + break; + case ClassWriter.SHORT_INSN: + case ClassWriter.LDCW_INSN: + case ClassWriter.FIELDORMETH_INSN: + case ClassWriter.TYPE_INSN: + case ClassWriter.IINC_INSN: + u += 3; + break; + case ClassWriter.ITFMETH_INSN: + case ClassWriter.INDYMETH_INSN: + u += 5; + break; + // case ClassWriter.MANA_INSN: + default: + u += 4; + break; + } + if (insert != 0) { + // adds a new (u, insert) entry in the allIndexes and + // allSizes arrays + int[] newIndexes = new int[allIndexes.length + 1]; + int[] newSizes = new int[allSizes.length + 1]; + System.arraycopy(allIndexes, 0, newIndexes, 0, + allIndexes.length); + System.arraycopy(allSizes, 0, newSizes, 0, allSizes.length); + newIndexes[allIndexes.length] = u; + newSizes[allSizes.length] = insert; + allIndexes = newIndexes; + allSizes = newSizes; + if (insert > 0) { + state = 3; + } + } + } + if (state < 3) { + --state; + } + } while (state != 0); + + // 2nd step: + // copies the bytecode of the method into a new bytevector, updates the + // offsets, and inserts (or removes) bytes as requested. + + ByteVector newCode = new ByteVector(code.length); + + u = 0; + while (u < code.length) { + int opcode = b[u] & 0xFF; + switch (ClassWriter.TYPE[opcode]) { + case ClassWriter.NOARG_INSN: + case ClassWriter.IMPLVAR_INSN: + newCode.putByte(opcode); + u += 1; + break; + case ClassWriter.LABEL_INSN: + if (opcode > 201) { + // changes temporary opcodes 202 to 217 (inclusive), 218 + // and 219 to IFEQ ... JSR (inclusive), IFNULL and + // IFNONNULL + opcode = opcode < 218 ? opcode - 49 : opcode - 20; + label = u + readUnsignedShort(b, u + 1); + } else { + label = u + readShort(b, u + 1); + } + newOffset = getNewOffset(allIndexes, allSizes, u, label); + if (resize[u]) { + // replaces GOTO with GOTO_W, JSR with JSR_W and IFxxx + // with IFNOTxxx GOTO_W , where IFNOTxxx is + // the "opposite" opcode of IFxxx (i.e., IFNE for IFEQ) + // and where designates the instruction just after + // the GOTO_W. + if (opcode == Opcodes.GOTO) { + newCode.putByte(200); // GOTO_W + } else if (opcode == Opcodes.JSR) { + newCode.putByte(201); // JSR_W + } else { + newCode.putByte(opcode <= 166 ? ((opcode + 1) ^ 1) - 1 + : opcode ^ 1); + newCode.putShort(8); // jump offset + newCode.putByte(200); // GOTO_W + // newOffset now computed from start of GOTO_W + newOffset -= 3; + } + newCode.putInt(newOffset); + } else { + newCode.putByte(opcode); + newCode.putShort(newOffset); + } + u += 3; + break; + case ClassWriter.LABELW_INSN: + label = u + readInt(b, u + 1); + newOffset = getNewOffset(allIndexes, allSizes, u, label); + newCode.putByte(opcode); + newCode.putInt(newOffset); + u += 5; + break; + case ClassWriter.TABL_INSN: + // skips 0 to 3 padding bytes + v = u; + u = u + 4 - (v & 3); + // reads and copies instruction + newCode.putByte(Opcodes.TABLESWITCH); + newCode.putByteArray(null, 0, (4 - newCode.length % 4) % 4); + label = v + readInt(b, u); + u += 4; + newOffset = getNewOffset(allIndexes, allSizes, v, label); + newCode.putInt(newOffset); + j = readInt(b, u); + u += 4; + newCode.putInt(j); + j = readInt(b, u) - j + 1; + u += 4; + newCode.putInt(readInt(b, u - 4)); + for (; j > 0; --j) { + label = v + readInt(b, u); + u += 4; + newOffset = getNewOffset(allIndexes, allSizes, v, label); + newCode.putInt(newOffset); + } + break; + case ClassWriter.LOOK_INSN: + // skips 0 to 3 padding bytes + v = u; + u = u + 4 - (v & 3); + // reads and copies instruction + newCode.putByte(Opcodes.LOOKUPSWITCH); + newCode.putByteArray(null, 0, (4 - newCode.length % 4) % 4); + label = v + readInt(b, u); + u += 4; + newOffset = getNewOffset(allIndexes, allSizes, v, label); + newCode.putInt(newOffset); + j = readInt(b, u); + u += 4; + newCode.putInt(j); + for (; j > 0; --j) { + newCode.putInt(readInt(b, u)); + u += 4; + label = v + readInt(b, u); + u += 4; + newOffset = getNewOffset(allIndexes, allSizes, v, label); + newCode.putInt(newOffset); + } + break; + case ClassWriter.WIDE_INSN: + opcode = b[u + 1] & 0xFF; + if (opcode == Opcodes.IINC) { + newCode.putByteArray(b, u, 6); + u += 6; + } else { + newCode.putByteArray(b, u, 4); + u += 4; + } + break; + case ClassWriter.VAR_INSN: + case ClassWriter.SBYTE_INSN: + case ClassWriter.LDC_INSN: + newCode.putByteArray(b, u, 2); + u += 2; + break; + case ClassWriter.SHORT_INSN: + case ClassWriter.LDCW_INSN: + case ClassWriter.FIELDORMETH_INSN: + case ClassWriter.TYPE_INSN: + case ClassWriter.IINC_INSN: + newCode.putByteArray(b, u, 3); + u += 3; + break; + case ClassWriter.ITFMETH_INSN: + case ClassWriter.INDYMETH_INSN: + newCode.putByteArray(b, u, 5); + u += 5; + break; + // case MANA_INSN: + default: + newCode.putByteArray(b, u, 4); + u += 4; + break; + } + } + + // updates the stack map frame labels + if (compute == FRAMES) { + Label l = labels; + while (l != null) { + /* + * Detects the labels that are just after an IF instruction that + * has been resized with the IFNOT GOTO_W pattern. These labels + * are now the target of a jump instruction (the IFNOT + * instruction). Note that we need the original label position + * here. getNewOffset must therefore never have been called for + * this label. + */ + u = l.position - 3; + if (u >= 0 && resize[u]) { + l.status |= Label.TARGET; + } + getNewOffset(allIndexes, allSizes, l); + l = l.successor; + } + // Update the offsets in the uninitialized types + if (cw.typeTable != null) { + for (i = 0; i < cw.typeTable.length; ++i) { + Item item = cw.typeTable[i]; + if (item != null && item.type == ClassWriter.TYPE_UNINIT) { + item.intVal = getNewOffset(allIndexes, allSizes, 0, + item.intVal); + } + } + } + // The stack map frames are not serialized yet, so we don't need + // to update them. They will be serialized in visitMaxs. + } else if (frameCount > 0) { + /* + * Resizing an existing stack map frame table is really hard. Not + * only the table must be parsed to update the offets, but new + * frames may be needed for jump instructions that were inserted by + * this method. And updating the offsets or inserting frames can + * change the format of the following frames, in case of packed + * frames. In practice the whole table must be recomputed. For this + * the frames are marked as potentially invalid. This will cause the + * whole class to be reread and rewritten with the COMPUTE_FRAMES + * option (see the ClassWriter.toByteArray method). This is not very + * efficient but is much easier and requires much less code than any + * other method I can think of. + */ + cw.invalidFrames = true; + } + // updates the exception handler block labels + Handler h = firstHandler; + while (h != null) { + getNewOffset(allIndexes, allSizes, h.start); + getNewOffset(allIndexes, allSizes, h.end); + getNewOffset(allIndexes, allSizes, h.handler); + h = h.next; + } + // updates the instructions addresses in the + // local var and line number tables + for (i = 0; i < 2; ++i) { + ByteVector bv = i == 0 ? localVar : localVarType; + if (bv != null) { + b = bv.data; + u = 0; + while (u < bv.length) { + label = readUnsignedShort(b, u); + newOffset = getNewOffset(allIndexes, allSizes, 0, label); + writeShort(b, u, newOffset); + label += readUnsignedShort(b, u + 2); + newOffset = getNewOffset(allIndexes, allSizes, 0, label) + - newOffset; + writeShort(b, u + 2, newOffset); + u += 10; + } + } + } + if (lineNumber != null) { + b = lineNumber.data; + u = 0; + while (u < lineNumber.length) { + writeShort( + b, + u, + getNewOffset(allIndexes, allSizes, 0, + readUnsignedShort(b, u))); + u += 4; + } + } + // updates the labels of the other attributes + Attribute attr = cattrs; + while (attr != null) { + Label[] labels = attr.getLabels(); + if (labels != null) { + for (i = labels.length - 1; i >= 0; --i) { + getNewOffset(allIndexes, allSizes, labels[i]); + } + } + attr = attr.next; + } + + // replaces old bytecodes with new ones + code = newCode; + } + + /** + * Reads an unsigned short value in the given byte array. + * + * @param b + * a byte array. + * @param index + * the start index of the value to be read. + * @return the read value. + */ + static int readUnsignedShort(final byte[] b, final int index) { + return ((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF); + } + + /** + * Reads a signed short value in the given byte array. + * + * @param b + * a byte array. + * @param index + * the start index of the value to be read. + * @return the read value. + */ + static short readShort(final byte[] b, final int index) { + return (short) (((b[index] & 0xFF) << 8) | (b[index + 1] & 0xFF)); + } + + /** + * Reads a signed int value in the given byte array. + * + * @param b + * a byte array. + * @param index + * the start index of the value to be read. + * @return the read value. + */ + static int readInt(final byte[] b, final int index) { + return ((b[index] & 0xFF) << 24) | ((b[index + 1] & 0xFF) << 16) + | ((b[index + 2] & 0xFF) << 8) | (b[index + 3] & 0xFF); + } + + /** + * Writes a short value in the given byte array. + * + * @param b + * a byte array. + * @param index + * where the first byte of the short value must be written. + * @param s + * the value to be written in the given byte array. + */ + static void writeShort(final byte[] b, final int index, final int s) { + b[index] = (byte) (s >>> 8); + b[index + 1] = (byte) s; + } + + /** + * Computes the future value of a bytecode offset. + *

+ * Note: it is possible to have several entries for the same instruction in + * the indexes and sizes: two entries (index=a,size=b) and + * (index=a,size=b') are equivalent to a single entry (index=a,size=b+b'). + * + * @param indexes + * current positions of the instructions to be resized. Each + * instruction must be designated by the index of its last + * byte, plus one (or, in other words, by the index of the + * first byte of the next instruction). + * @param sizes + * the number of bytes to be added to the above + * instructions. More precisely, for each i < len, + * sizes[i] bytes will be added at the end of the + * instruction designated by indexes[i] or, if + * sizes[i] is negative, the last | + * sizes[i]| bytes of the instruction will be removed + * (the instruction size must not become negative or + * null). + * @param begin + * index of the first byte of the source instruction. + * @param end + * index of the first byte of the target instruction. + * @return the future value of the given bytecode offset. + */ + static int getNewOffset(final int[] indexes, final int[] sizes, + final int begin, final int end) { + int offset = end - begin; + for (int i = 0; i < indexes.length; ++i) { + if (begin < indexes[i] && indexes[i] <= end) { + // forward jump + offset += sizes[i]; + } else if (end < indexes[i] && indexes[i] <= begin) { + // backward jump + offset -= sizes[i]; + } + } + return offset; + } + + /** + * Updates the offset of the given label. + * + * @param indexes + * current positions of the instructions to be resized. Each + * instruction must be designated by the index of its last + * byte, plus one (or, in other words, by the index of the + * first byte of the next instruction). + * @param sizes + * the number of bytes to be added to the above + * instructions. More precisely, for each i < len, + * sizes[i] bytes will be added at the end of the + * instruction designated by indexes[i] or, if + * sizes[i] is negative, the last | + * sizes[i]| bytes of the instruction will be removed + * (the instruction size must not become negative or + * null). + * @param label + * the label whose offset must be updated. + */ + static void getNewOffset(final int[] indexes, final int[] sizes, + final Label label) { + if ((label.status & Label.RESIZED) == 0) { + label.position = getNewOffset(indexes, sizes, 0, label.position); + label.status |= Label.RESIZED; + } + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Opcodes.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Opcodes.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Opcodes.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Opcodes.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,361 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +/** + * Defines the JVM opcodes, access flags and array type codes. This interface + * does not define all the JVM opcodes because some opcodes are automatically + * handled. For example, the xLOAD and xSTORE opcodes are automatically replaced + * by xLOAD_n and xSTORE_n opcodes when possible. The xLOAD_n and xSTORE_n + * opcodes are therefore not defined in this interface. Likewise for LDC, + * automatically replaced by LDC_W or LDC2_W when necessary, WIDE, GOTO_W and + * JSR_W. + * + * @author Eric Bruneton + * @author Eugene Kuleshov + */ +public interface Opcodes { + + // ASM API versions + + int ASM4 = 4 << 16 | 0 << 8 | 0; + int ASM5 = 5 << 16 | 0 << 8 | 0; + + // versions + + int V1_1 = 3 << 16 | 45; + int V1_2 = 0 << 16 | 46; + int V1_3 = 0 << 16 | 47; + int V1_4 = 0 << 16 | 48; + int V1_5 = 0 << 16 | 49; + int V1_6 = 0 << 16 | 50; + int V1_7 = 0 << 16 | 51; + int V1_8 = 0 << 16 | 52; + + // access flags + + int ACC_PUBLIC = 0x0001; // class, field, method + int ACC_PRIVATE = 0x0002; // class, field, method + int ACC_PROTECTED = 0x0004; // class, field, method + int ACC_STATIC = 0x0008; // field, method + int ACC_FINAL = 0x0010; // class, field, method, parameter + int ACC_SUPER = 0x0020; // class + int ACC_SYNCHRONIZED = 0x0020; // method + int ACC_VOLATILE = 0x0040; // field + int ACC_BRIDGE = 0x0040; // method + int ACC_VARARGS = 0x0080; // method + int ACC_TRANSIENT = 0x0080; // field + int ACC_NATIVE = 0x0100; // method + int ACC_INTERFACE = 0x0200; // class + int ACC_ABSTRACT = 0x0400; // class, method + int ACC_STRICT = 0x0800; // method + int ACC_SYNTHETIC = 0x1000; // class, field, method, parameter + int ACC_ANNOTATION = 0x2000; // class + int ACC_ENUM = 0x4000; // class(?) field inner + int ACC_MANDATED = 0x8000; // parameter + + // ASM specific pseudo access flags + + int ACC_DEPRECATED = 0x20000; // class, field, method + + // types for NEWARRAY + + int T_BOOLEAN = 4; + int T_CHAR = 5; + int T_FLOAT = 6; + int T_DOUBLE = 7; + int T_BYTE = 8; + int T_SHORT = 9; + int T_INT = 10; + int T_LONG = 11; + + // tags for Handle + + int H_GETFIELD = 1; + int H_GETSTATIC = 2; + int H_PUTFIELD = 3; + int H_PUTSTATIC = 4; + int H_INVOKEVIRTUAL = 5; + int H_INVOKESTATIC = 6; + int H_INVOKESPECIAL = 7; + int H_NEWINVOKESPECIAL = 8; + int H_INVOKEINTERFACE = 9; + + // stack map frame types + + /** + * Represents an expanded frame. See {@link ClassReader#EXPAND_FRAMES}. + */ + int F_NEW = -1; + + /** + * Represents a compressed frame with complete frame data. + */ + int F_FULL = 0; + + /** + * Represents a compressed frame where locals are the same as the locals in + * the previous frame, except that additional 1-3 locals are defined, and + * with an empty stack. + */ + int F_APPEND = 1; + + /** + * Represents a compressed frame where locals are the same as the locals in + * the previous frame, except that the last 1-3 locals are absent and with + * an empty stack. + */ + int F_CHOP = 2; + + /** + * Represents a compressed frame with exactly the same locals as the + * previous frame and with an empty stack. + */ + int F_SAME = 3; + + /** + * Represents a compressed frame with exactly the same locals as the + * previous frame and with a single value on the stack. + */ + int F_SAME1 = 4; + + Integer TOP = new Integer(0); + Integer INTEGER = new Integer(1); + Integer FLOAT = new Integer(2); + Integer DOUBLE = new Integer(3); + Integer LONG = new Integer(4); + Integer NULL = new Integer(5); + Integer UNINITIALIZED_THIS = new Integer(6); + + // opcodes // visit method (- = idem) + + int NOP = 0; // visitInsn + int ACONST_NULL = 1; // - + int ICONST_M1 = 2; // - + int ICONST_0 = 3; // - + int ICONST_1 = 4; // - + int ICONST_2 = 5; // - + int ICONST_3 = 6; // - + int ICONST_4 = 7; // - + int ICONST_5 = 8; // - + int LCONST_0 = 9; // - + int LCONST_1 = 10; // - + int FCONST_0 = 11; // - + int FCONST_1 = 12; // - + int FCONST_2 = 13; // - + int DCONST_0 = 14; // - + int DCONST_1 = 15; // - + int BIPUSH = 16; // visitIntInsn + int SIPUSH = 17; // - + int LDC = 18; // visitLdcInsn + // int LDC_W = 19; // - + // int LDC2_W = 20; // - + int ILOAD = 21; // visitVarInsn + int LLOAD = 22; // - + int FLOAD = 23; // - + int DLOAD = 24; // - + int ALOAD = 25; // - + // int ILOAD_0 = 26; // - + // int ILOAD_1 = 27; // - + // int ILOAD_2 = 28; // - + // int ILOAD_3 = 29; // - + // int LLOAD_0 = 30; // - + // int LLOAD_1 = 31; // - + // int LLOAD_2 = 32; // - + // int LLOAD_3 = 33; // - + // int FLOAD_0 = 34; // - + // int FLOAD_1 = 35; // - + // int FLOAD_2 = 36; // - + // int FLOAD_3 = 37; // - + // int DLOAD_0 = 38; // - + // int DLOAD_1 = 39; // - + // int DLOAD_2 = 40; // - + // int DLOAD_3 = 41; // - + // int ALOAD_0 = 42; // - + // int ALOAD_1 = 43; // - + // int ALOAD_2 = 44; // - + // int ALOAD_3 = 45; // - + int IALOAD = 46; // visitInsn + int LALOAD = 47; // - + int FALOAD = 48; // - + int DALOAD = 49; // - + int AALOAD = 50; // - + int BALOAD = 51; // - + int CALOAD = 52; // - + int SALOAD = 53; // - + int ISTORE = 54; // visitVarInsn + int LSTORE = 55; // - + int FSTORE = 56; // - + int DSTORE = 57; // - + int ASTORE = 58; // - + // int ISTORE_0 = 59; // - + // int ISTORE_1 = 60; // - + // int ISTORE_2 = 61; // - + // int ISTORE_3 = 62; // - + // int LSTORE_0 = 63; // - + // int LSTORE_1 = 64; // - + // int LSTORE_2 = 65; // - + // int LSTORE_3 = 66; // - + // int FSTORE_0 = 67; // - + // int FSTORE_1 = 68; // - + // int FSTORE_2 = 69; // - + // int FSTORE_3 = 70; // - + // int DSTORE_0 = 71; // - + // int DSTORE_1 = 72; // - + // int DSTORE_2 = 73; // - + // int DSTORE_3 = 74; // - + // int ASTORE_0 = 75; // - + // int ASTORE_1 = 76; // - + // int ASTORE_2 = 77; // - + // int ASTORE_3 = 78; // - + int IASTORE = 79; // visitInsn + int LASTORE = 80; // - + int FASTORE = 81; // - + int DASTORE = 82; // - + int AASTORE = 83; // - + int BASTORE = 84; // - + int CASTORE = 85; // - + int SASTORE = 86; // - + int POP = 87; // - + int POP2 = 88; // - + int DUP = 89; // - + int DUP_X1 = 90; // - + int DUP_X2 = 91; // - + int DUP2 = 92; // - + int DUP2_X1 = 93; // - + int DUP2_X2 = 94; // - + int SWAP = 95; // - + int IADD = 96; // - + int LADD = 97; // - + int FADD = 98; // - + int DADD = 99; // - + int ISUB = 100; // - + int LSUB = 101; // - + int FSUB = 102; // - + int DSUB = 103; // - + int IMUL = 104; // - + int LMUL = 105; // - + int FMUL = 106; // - + int DMUL = 107; // - + int IDIV = 108; // - + int LDIV = 109; // - + int FDIV = 110; // - + int DDIV = 111; // - + int IREM = 112; // - + int LREM = 113; // - + int FREM = 114; // - + int DREM = 115; // - + int INEG = 116; // - + int LNEG = 117; // - + int FNEG = 118; // - + int DNEG = 119; // - + int ISHL = 120; // - + int LSHL = 121; // - + int ISHR = 122; // - + int LSHR = 123; // - + int IUSHR = 124; // - + int LUSHR = 125; // - + int IAND = 126; // - + int LAND = 127; // - + int IOR = 128; // - + int LOR = 129; // - + int IXOR = 130; // - + int LXOR = 131; // - + int IINC = 132; // visitIincInsn + int I2L = 133; // visitInsn + int I2F = 134; // - + int I2D = 135; // - + int L2I = 136; // - + int L2F = 137; // - + int L2D = 138; // - + int F2I = 139; // - + int F2L = 140; // - + int F2D = 141; // - + int D2I = 142; // - + int D2L = 143; // - + int D2F = 144; // - + int I2B = 145; // - + int I2C = 146; // - + int I2S = 147; // - + int LCMP = 148; // - + int FCMPL = 149; // - + int FCMPG = 150; // - + int DCMPL = 151; // - + int DCMPG = 152; // - + int IFEQ = 153; // visitJumpInsn + int IFNE = 154; // - + int IFLT = 155; // - + int IFGE = 156; // - + int IFGT = 157; // - + int IFLE = 158; // - + int IF_ICMPEQ = 159; // - + int IF_ICMPNE = 160; // - + int IF_ICMPLT = 161; // - + int IF_ICMPGE = 162; // - + int IF_ICMPGT = 163; // - + int IF_ICMPLE = 164; // - + int IF_ACMPEQ = 165; // - + int IF_ACMPNE = 166; // - + int GOTO = 167; // - + int JSR = 168; // - + int RET = 169; // visitVarInsn + int TABLESWITCH = 170; // visiTableSwitchInsn + int LOOKUPSWITCH = 171; // visitLookupSwitch + int IRETURN = 172; // visitInsn + int LRETURN = 173; // - + int FRETURN = 174; // - + int DRETURN = 175; // - + int ARETURN = 176; // - + int RETURN = 177; // - + int GETSTATIC = 178; // visitFieldInsn + int PUTSTATIC = 179; // - + int GETFIELD = 180; // - + int PUTFIELD = 181; // - + int INVOKEVIRTUAL = 182; // visitMethodInsn + int INVOKESPECIAL = 183; // - + int INVOKESTATIC = 184; // - + int INVOKEINTERFACE = 185; // - + int INVOKEDYNAMIC = 186; // visitInvokeDynamicInsn + int NEW = 187; // visitTypeInsn + int NEWARRAY = 188; // visitIntInsn + int ANEWARRAY = 189; // visitTypeInsn + int ARRAYLENGTH = 190; // visitInsn + int ATHROW = 191; // - + int CHECKCAST = 192; // visitTypeInsn + int INSTANCEOF = 193; // - + int MONITORENTER = 194; // visitInsn + int MONITOREXIT = 195; // - + // int WIDE = 196; // NOT VISITED + int MULTIANEWARRAY = 197; // visitMultiANewArrayInsn + int IFNULL = 198; // visitJumpInsn + int IFNONNULL = 199; // - + // int GOTO_W = 200; // - + // int JSR_W = 201; // - +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Type.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Type.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/Type.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/Type.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,896 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2011 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ +package org.objectweb.asm; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; + +/** + * A Java field or method type. This class can be used to make it easier to + * manipulate type and method descriptors. + * + * @author Eric Bruneton + * @author Chris Nokleberg + */ +public class Type { + + /** + * The sort of the void type. See {@link #getSort getSort}. + */ + public static final int VOID = 0; + + /** + * The sort of the boolean type. See {@link #getSort getSort}. + */ + public static final int BOOLEAN = 1; + + /** + * The sort of the char type. See {@link #getSort getSort}. + */ + public static final int CHAR = 2; + + /** + * The sort of the byte type. See {@link #getSort getSort}. + */ + public static final int BYTE = 3; + + /** + * The sort of the short type. See {@link #getSort getSort}. + */ + public static final int SHORT = 4; + + /** + * The sort of the int type. See {@link #getSort getSort}. + */ + public static final int INT = 5; + + /** + * The sort of the float type. See {@link #getSort getSort}. + */ + public static final int FLOAT = 6; + + /** + * The sort of the long type. See {@link #getSort getSort}. + */ + public static final int LONG = 7; + + /** + * The sort of the double type. See {@link #getSort getSort}. + */ + public static final int DOUBLE = 8; + + /** + * The sort of array reference types. See {@link #getSort getSort}. + */ + public static final int ARRAY = 9; + + /** + * The sort of object reference types. See {@link #getSort getSort}. + */ + public static final int OBJECT = 10; + + /** + * The sort of method types. See {@link #getSort getSort}. + */ + public static final int METHOD = 11; + + /** + * The void type. + */ + public static final Type VOID_TYPE = new Type(VOID, null, ('V' << 24) + | (5 << 16) | (0 << 8) | 0, 1); + + /** + * The boolean type. + */ + public static final Type BOOLEAN_TYPE = new Type(BOOLEAN, null, ('Z' << 24) + | (0 << 16) | (5 << 8) | 1, 1); + + /** + * The char type. + */ + public static final Type CHAR_TYPE = new Type(CHAR, null, ('C' << 24) + | (0 << 16) | (6 << 8) | 1, 1); + + /** + * The byte type. + */ + public static final Type BYTE_TYPE = new Type(BYTE, null, ('B' << 24) + | (0 << 16) | (5 << 8) | 1, 1); + + /** + * The short type. + */ + public static final Type SHORT_TYPE = new Type(SHORT, null, ('S' << 24) + | (0 << 16) | (7 << 8) | 1, 1); + + /** + * The int type. + */ + public static final Type INT_TYPE = new Type(INT, null, ('I' << 24) + | (0 << 16) | (0 << 8) | 1, 1); + + /** + * The float type. + */ + public static final Type FLOAT_TYPE = new Type(FLOAT, null, ('F' << 24) + | (2 << 16) | (2 << 8) | 1, 1); + + /** + * The long type. + */ + public static final Type LONG_TYPE = new Type(LONG, null, ('J' << 24) + | (1 << 16) | (1 << 8) | 2, 1); + + /** + * The double type. + */ + public static final Type DOUBLE_TYPE = new Type(DOUBLE, null, ('D' << 24) + | (3 << 16) | (3 << 8) | 2, 1); + + // ------------------------------------------------------------------------ + // Fields + // ------------------------------------------------------------------------ + + /** + * The sort of this Java type. + */ + private final int sort; + + /** + * A buffer containing the internal name of this Java type. This field is + * only used for reference types. + */ + private final char[] buf; + + /** + * The offset of the internal name of this Java type in {@link #buf buf} or, + * for primitive types, the size, descriptor and getOpcode offsets for this + * type (byte 0 contains the size, byte 1 the descriptor, byte 2 the offset + * for IALOAD or IASTORE, byte 3 the offset for all other instructions). + */ + private final int off; + + /** + * The length of the internal name of this Java type. + */ + private final int len; + + // ------------------------------------------------------------------------ + // Constructors + // ------------------------------------------------------------------------ + + /** + * Constructs a reference type. + * + * @param sort + * the sort of the reference type to be constructed. + * @param buf + * a buffer containing the descriptor of the previous type. + * @param off + * the offset of this descriptor in the previous buffer. + * @param len + * the length of this descriptor. + */ + private Type(final int sort, final char[] buf, final int off, final int len) { + this.sort = sort; + this.buf = buf; + this.off = off; + this.len = len; + } + + /** + * Returns the Java type corresponding to the given type descriptor. + * + * @param typeDescriptor + * a field or method type descriptor. + * @return the Java type corresponding to the given type descriptor. + */ + public static Type getType(final String typeDescriptor) { + return getType(typeDescriptor.toCharArray(), 0); + } + + /** + * Returns the Java type corresponding to the given internal name. + * + * @param internalName + * an internal name. + * @return the Java type corresponding to the given internal name. + */ + public static Type getObjectType(final String internalName) { + char[] buf = internalName.toCharArray(); + return new Type(buf[0] == '[' ? ARRAY : OBJECT, buf, 0, buf.length); + } + + /** + * Returns the Java type corresponding to the given method descriptor. + * Equivalent to Type.getType(methodDescriptor). + * + * @param methodDescriptor + * a method descriptor. + * @return the Java type corresponding to the given method descriptor. + */ + public static Type getMethodType(final String methodDescriptor) { + return getType(methodDescriptor.toCharArray(), 0); + } + + /** + * Returns the Java method type corresponding to the given argument and + * return types. + * + * @param returnType + * the return type of the method. + * @param argumentTypes + * the argument types of the method. + * @return the Java type corresponding to the given argument and return + * types. + */ + public static Type getMethodType(final Type returnType, + final Type... argumentTypes) { + return getType(getMethodDescriptor(returnType, argumentTypes)); + } + + /** + * Returns the Java type corresponding to the given class. + * + * @param c + * a class. + * @return the Java type corresponding to the given class. + */ + public static Type getType(final Class c) { + if (c.isPrimitive()) { + if (c == Integer.TYPE) { + return INT_TYPE; + } else if (c == Void.TYPE) { + return VOID_TYPE; + } else if (c == Boolean.TYPE) { + return BOOLEAN_TYPE; + } else if (c == Byte.TYPE) { + return BYTE_TYPE; + } else if (c == Character.TYPE) { + return CHAR_TYPE; + } else if (c == Short.TYPE) { + return SHORT_TYPE; + } else if (c == Double.TYPE) { + return DOUBLE_TYPE; + } else if (c == Float.TYPE) { + return FLOAT_TYPE; + } else /* if (c == Long.TYPE) */{ + return LONG_TYPE; + } + } else { + return getType(getDescriptor(c)); + } + } + + /** + * Returns the Java method type corresponding to the given constructor. + * + * @param c + * a {@link Constructor Constructor} object. + * @return the Java method type corresponding to the given constructor. + */ + public static Type getType(final Constructor c) { + return getType(getConstructorDescriptor(c)); + } + + /** + * Returns the Java method type corresponding to the given method. + * + * @param m + * a {@link Method Method} object. + * @return the Java method type corresponding to the given method. + */ + public static Type getType(final Method m) { + return getType(getMethodDescriptor(m)); + } + + /** + * Returns the Java types corresponding to the argument types of the given + * method descriptor. + * + * @param methodDescriptor + * a method descriptor. + * @return the Java types corresponding to the argument types of the given + * method descriptor. + */ + public static Type[] getArgumentTypes(final String methodDescriptor) { + char[] buf = methodDescriptor.toCharArray(); + int off = 1; + int size = 0; + while (true) { + char car = buf[off++]; + if (car == ')') { + break; + } else if (car == 'L') { + while (buf[off++] != ';') { + } + ++size; + } else if (car != '[') { + ++size; + } + } + Type[] args = new Type[size]; + off = 1; + size = 0; + while (buf[off] != ')') { + args[size] = getType(buf, off); + off += args[size].len + (args[size].sort == OBJECT ? 2 : 0); + size += 1; + } + return args; + } + + /** + * Returns the Java types corresponding to the argument types of the given + * method. + * + * @param method + * a method. + * @return the Java types corresponding to the argument types of the given + * method. + */ + public static Type[] getArgumentTypes(final Method method) { + Class[] classes = method.getParameterTypes(); + Type[] types = new Type[classes.length]; + for (int i = classes.length - 1; i >= 0; --i) { + types[i] = getType(classes[i]); + } + return types; + } + + /** + * Returns the Java type corresponding to the return type of the given + * method descriptor. + * + * @param methodDescriptor + * a method descriptor. + * @return the Java type corresponding to the return type of the given + * method descriptor. + */ + public static Type getReturnType(final String methodDescriptor) { + char[] buf = methodDescriptor.toCharArray(); + return getType(buf, methodDescriptor.indexOf(')') + 1); + } + + /** + * Returns the Java type corresponding to the return type of the given + * method. + * + * @param method + * a method. + * @return the Java type corresponding to the return type of the given + * method. + */ + public static Type getReturnType(final Method method) { + return getType(method.getReturnType()); + } + + /** + * Computes the size of the arguments and of the return value of a method. + * + * @param desc + * the descriptor of a method. + * @return the size of the arguments of the method (plus one for the + * implicit this argument), argSize, and the size of its return + * value, retSize, packed into a single int i = + * (argSize << 2) | retSize (argSize is therefore equal to + * i >> 2, and retSize to i & 0x03). + */ + public static int getArgumentsAndReturnSizes(final String desc) { + int n = 1; + int c = 1; + while (true) { + char car = desc.charAt(c++); + if (car == ')') { + car = desc.charAt(c); + return n << 2 + | (car == 'V' ? 0 : (car == 'D' || car == 'J' ? 2 : 1)); + } else if (car == 'L') { + while (desc.charAt(c++) != ';') { + } + n += 1; + } else if (car == '[') { + while ((car = desc.charAt(c)) == '[') { + ++c; + } + if (car == 'D' || car == 'J') { + n -= 1; + } + } else if (car == 'D' || car == 'J') { + n += 2; + } else { + n += 1; + } + } + } + + /** + * Returns the Java type corresponding to the given type descriptor. For + * method descriptors, buf is supposed to contain nothing more than the + * descriptor itself. + * + * @param buf + * a buffer containing a type descriptor. + * @param off + * the offset of this descriptor in the previous buffer. + * @return the Java type corresponding to the given type descriptor. + */ + private static Type getType(final char[] buf, final int off) { + int len; + switch (buf[off]) { + case 'V': + return VOID_TYPE; + case 'Z': + return BOOLEAN_TYPE; + case 'C': + return CHAR_TYPE; + case 'B': + return BYTE_TYPE; + case 'S': + return SHORT_TYPE; + case 'I': + return INT_TYPE; + case 'F': + return FLOAT_TYPE; + case 'J': + return LONG_TYPE; + case 'D': + return DOUBLE_TYPE; + case '[': + len = 1; + while (buf[off + len] == '[') { + ++len; + } + if (buf[off + len] == 'L') { + ++len; + while (buf[off + len] != ';') { + ++len; + } + } + return new Type(ARRAY, buf, off, len + 1); + case 'L': + len = 1; + while (buf[off + len] != ';') { + ++len; + } + return new Type(OBJECT, buf, off + 1, len - 1); + // case '(': + default: + return new Type(METHOD, buf, off, buf.length - off); + } + } + + // ------------------------------------------------------------------------ + // Accessors + // ------------------------------------------------------------------------ + + /** + * Returns the sort of this Java type. + * + * @return {@link #VOID VOID}, {@link #BOOLEAN BOOLEAN}, {@link #CHAR CHAR}, + * {@link #BYTE BYTE}, {@link #SHORT SHORT}, {@link #INT INT}, + * {@link #FLOAT FLOAT}, {@link #LONG LONG}, {@link #DOUBLE DOUBLE}, + * {@link #ARRAY ARRAY}, {@link #OBJECT OBJECT} or {@link #METHOD + * METHOD}. + */ + public int getSort() { + return sort; + } + + /** + * Returns the number of dimensions of this array type. This method should + * only be used for an array type. + * + * @return the number of dimensions of this array type. + */ + public int getDimensions() { + int i = 1; + while (buf[off + i] == '[') { + ++i; + } + return i; + } + + /** + * Returns the type of the elements of this array type. This method should + * only be used for an array type. + * + * @return Returns the type of the elements of this array type. + */ + public Type getElementType() { + return getType(buf, off + getDimensions()); + } + + /** + * Returns the binary name of the class corresponding to this type. This + * method must not be used on method types. + * + * @return the binary name of the class corresponding to this type. + */ + public String getClassName() { + switch (sort) { + case VOID: + return "void"; + case BOOLEAN: + return "boolean"; + case CHAR: + return "char"; + case BYTE: + return "byte"; + case SHORT: + return "short"; + case INT: + return "int"; + case FLOAT: + return "float"; + case LONG: + return "long"; + case DOUBLE: + return "double"; + case ARRAY: + StringBuilder sb = new StringBuilder(getElementType().getClassName()); + for (int i = getDimensions(); i > 0; --i) { + sb.append("[]"); + } + return sb.toString(); + case OBJECT: + return new String(buf, off, len).replace('/', '.'); + default: + return null; + } + } + + /** + * Returns the internal name of the class corresponding to this object or + * array type. The internal name of a class is its fully qualified name (as + * returned by Class.getName(), where '.' are replaced by '/'. This method + * should only be used for an object or array type. + * + * @return the internal name of the class corresponding to this object type. + */ + public String getInternalName() { + return new String(buf, off, len); + } + + /** + * Returns the argument types of methods of this type. This method should + * only be used for method types. + * + * @return the argument types of methods of this type. + */ + public Type[] getArgumentTypes() { + return getArgumentTypes(getDescriptor()); + } + + /** + * Returns the return type of methods of this type. This method should only + * be used for method types. + * + * @return the return type of methods of this type. + */ + public Type getReturnType() { + return getReturnType(getDescriptor()); + } + + /** + * Returns the size of the arguments and of the return value of methods of + * this type. This method should only be used for method types. + * + * @return the size of the arguments (plus one for the implicit this + * argument), argSize, and the size of the return value, retSize, + * packed into a single + * int i = (argSize << 2) | retSize + * (argSize is therefore equal to i >> 2, + * and retSize to i & 0x03). + */ + public int getArgumentsAndReturnSizes() { + return getArgumentsAndReturnSizes(getDescriptor()); + } + + // ------------------------------------------------------------------------ + // Conversion to type descriptors + // ------------------------------------------------------------------------ + + /** + * Returns the descriptor corresponding to this Java type. + * + * @return the descriptor corresponding to this Java type. + */ + public String getDescriptor() { + StringBuffer buf = new StringBuffer(); + getDescriptor(buf); + return buf.toString(); + } + + /** + * Returns the descriptor corresponding to the given argument and return + * types. + * + * @param returnType + * the return type of the method. + * @param argumentTypes + * the argument types of the method. + * @return the descriptor corresponding to the given argument and return + * types. + */ + public static String getMethodDescriptor(final Type returnType, + final Type... argumentTypes) { + StringBuffer buf = new StringBuffer(); + buf.append('('); + for (int i = 0; i < argumentTypes.length; ++i) { + argumentTypes[i].getDescriptor(buf); + } + buf.append(')'); + returnType.getDescriptor(buf); + return buf.toString(); + } + + /** + * Appends the descriptor corresponding to this Java type to the given + * string buffer. + * + * @param buf + * the string buffer to which the descriptor must be appended. + */ + private void getDescriptor(final StringBuffer buf) { + if (this.buf == null) { + // descriptor is in byte 3 of 'off' for primitive types (buf == + // null) + buf.append((char) ((off & 0xFF000000) >>> 24)); + } else if (sort == OBJECT) { + buf.append('L'); + buf.append(this.buf, off, len); + buf.append(';'); + } else { // sort == ARRAY || sort == METHOD + buf.append(this.buf, off, len); + } + } + + // ------------------------------------------------------------------------ + // Direct conversion from classes to type descriptors, + // without intermediate Type objects + // ------------------------------------------------------------------------ + + /** + * Returns the internal name of the given class. The internal name of a + * class is its fully qualified name, as returned by Class.getName(), where + * '.' are replaced by '/'. + * + * @param c + * an object or array class. + * @return the internal name of the given class. + */ + public static String getInternalName(final Class c) { + return c.getName().replace('.', '/'); + } + + /** + * Returns the descriptor corresponding to the given Java type. + * + * @param c + * an object class, a primitive class or an array class. + * @return the descriptor corresponding to the given class. + */ + public static String getDescriptor(final Class c) { + StringBuffer buf = new StringBuffer(); + getDescriptor(buf, c); + return buf.toString(); + } + + /** + * Returns the descriptor corresponding to the given constructor. + * + * @param c + * a {@link Constructor Constructor} object. + * @return the descriptor of the given constructor. + */ + public static String getConstructorDescriptor(final Constructor c) { + Class[] parameters = c.getParameterTypes(); + StringBuffer buf = new StringBuffer(); + buf.append('('); + for (int i = 0; i < parameters.length; ++i) { + getDescriptor(buf, parameters[i]); + } + return buf.append(")V").toString(); + } + + /** + * Returns the descriptor corresponding to the given method. + * + * @param m + * a {@link Method Method} object. + * @return the descriptor of the given method. + */ + public static String getMethodDescriptor(final Method m) { + Class[] parameters = m.getParameterTypes(); + StringBuffer buf = new StringBuffer(); + buf.append('('); + for (int i = 0; i < parameters.length; ++i) { + getDescriptor(buf, parameters[i]); + } + buf.append(')'); + getDescriptor(buf, m.getReturnType()); + return buf.toString(); + } + + /** + * Appends the descriptor of the given class to the given string buffer. + * + * @param buf + * the string buffer to which the descriptor must be appended. + * @param c + * the class whose descriptor must be computed. + */ + private static void getDescriptor(final StringBuffer buf, final Class c) { + Class d = c; + while (true) { + if (d.isPrimitive()) { + char car; + if (d == Integer.TYPE) { + car = 'I'; + } else if (d == Void.TYPE) { + car = 'V'; + } else if (d == Boolean.TYPE) { + car = 'Z'; + } else if (d == Byte.TYPE) { + car = 'B'; + } else if (d == Character.TYPE) { + car = 'C'; + } else if (d == Short.TYPE) { + car = 'S'; + } else if (d == Double.TYPE) { + car = 'D'; + } else if (d == Float.TYPE) { + car = 'F'; + } else /* if (d == Long.TYPE) */{ + car = 'J'; + } + buf.append(car); + return; + } else if (d.isArray()) { + buf.append('['); + d = d.getComponentType(); + } else { + buf.append('L'); + String name = d.getName(); + int len = name.length(); + for (int i = 0; i < len; ++i) { + char car = name.charAt(i); + buf.append(car == '.' ? '/' : car); + } + buf.append(';'); + return; + } + } + } + + // ------------------------------------------------------------------------ + // Corresponding size and opcodes + // ------------------------------------------------------------------------ + + /** + * Returns the size of values of this type. This method must not be used for + * method types. + * + * @return the size of values of this type, i.e., 2 for long and + * double, 0 for void and 1 otherwise. + */ + public int getSize() { + // the size is in byte 0 of 'off' for primitive types (buf == null) + return buf == null ? (off & 0xFF) : 1; + } + + /** + * Returns a JVM instruction opcode adapted to this Java type. This method + * must not be used for method types. + * + * @param opcode + * a JVM instruction opcode. This opcode must be one of ILOAD, + * ISTORE, IALOAD, IASTORE, IADD, ISUB, IMUL, IDIV, IREM, INEG, + * ISHL, ISHR, IUSHR, IAND, IOR, IXOR and IRETURN. + * @return an opcode that is similar to the given opcode, but adapted to + * this Java type. For example, if this type is float and + * opcode is IRETURN, this method returns FRETURN. + */ + public int getOpcode(final int opcode) { + if (opcode == Opcodes.IALOAD || opcode == Opcodes.IASTORE) { + // the offset for IALOAD or IASTORE is in byte 1 of 'off' for + // primitive types (buf == null) + return opcode + (buf == null ? (off & 0xFF00) >> 8 : 4); + } else { + // the offset for other instructions is in byte 2 of 'off' for + // primitive types (buf == null) + return opcode + (buf == null ? (off & 0xFF0000) >> 16 : 4); + } + } + + // ------------------------------------------------------------------------ + // Equals, hashCode and toString + // ------------------------------------------------------------------------ + + /** + * Tests if the given object is equal to this type. + * + * @param o + * the object to be compared to this type. + * @return true if the given object is equal to this type. + */ + @Override + public boolean equals(final Object o) { + if (this == o) { + return true; + } + if (!(o instanceof Type)) { + return false; + } + Type t = (Type) o; + if (sort != t.sort) { + return false; + } + if (sort >= ARRAY) { + if (len != t.len) { + return false; + } + for (int i = off, j = t.off, end = i + len; i < end; i++, j++) { + if (buf[i] != t.buf[j]) { + return false; + } + } + } + return true; + } + + /** + * Returns a hash code value for this type. + * + * @return a hash code value for this type. + */ + @Override + public int hashCode() { + int hc = 13 * sort; + if (sort >= ARRAY) { + for (int i = off, end = i + len; i < end; i++) { + hc = 17 * (hc + buf[i]); + } + } + return hc; + } + + /** + * Returns a string representation of this type. + * + * @return the descriptor of this type. + */ + @Override + public String toString() { + return getDescriptor(); + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/TypePath.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/TypePath.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/TypePath.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/TypePath.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,196 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2013 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.objectweb.asm; + +/** + * The path to a type argument, wildcard bound, array element type, or static + * inner type within an enclosing type. + * + * @author Eric Bruneton + */ +public class TypePath { + + /** + * A type path step that steps into the element type of an array type. See + * {@link #getStep getStep}. + */ + public final static int ARRAY_ELEMENT = 0; + + /** + * A type path step that steps into the nested type of a class type. See + * {@link #getStep getStep}. + */ + public final static int INNER_TYPE = 1; + + /** + * A type path step that steps into the bound of a wildcard type. See + * {@link #getStep getStep}. + */ + public final static int WILDCARD_BOUND = 2; + + /** + * A type path step that steps into a type argument of a generic type. See + * {@link #getStep getStep}. + */ + public final static int TYPE_ARGUMENT = 3; + + /** + * The byte array where the path is stored, in Java class file format. + */ + byte[] b; + + /** + * The offset of the first byte of the type path in 'b'. + */ + int offset; + + /** + * Creates a new type path. + * + * @param b + * the byte array containing the type path in Java class file + * format. + * @param offset + * the offset of the first byte of the type path in 'b'. + */ + TypePath(byte[] b, int offset) { + this.b = b; + this.offset = offset; + } + + /** + * Returns the length of this path. + * + * @return the length of this path. + */ + public int getLength() { + return b[offset]; + } + + /** + * Returns the value of the given step of this path. + * + * @param index + * an index between 0 and {@link #getLength()}, exclusive. + * @return {@link #ARRAY_ELEMENT ARRAY_ELEMENT}, {@link #INNER_TYPE + * INNER_TYPE}, {@link #WILDCARD_BOUND WILDCARD_BOUND}, or + * {@link #TYPE_ARGUMENT TYPE_ARGUMENT}. + */ + public int getStep(int index) { + return b[offset + 2 * index + 1]; + } + + /** + * Returns the index of the type argument that the given step is stepping + * into. This method should only be used for steps whose value is + * {@link #TYPE_ARGUMENT TYPE_ARGUMENT}. + * + * @param index + * an index between 0 and {@link #getLength()}, exclusive. + * @return the index of the type argument that the given step is stepping + * into. + */ + public int getStepArgument(int index) { + return b[offset + 2 * index + 2]; + } + + /** + * Converts a type path in string form, in the format used by + * {@link #toString()}, into a TypePath object. + * + * @param typePath + * a type path in string form, in the format used by + * {@link #toString()}. May be null or empty. + * @return the corresponding TypePath object, or null if the path is empty. + */ + public static TypePath fromString(final String typePath) { + if (typePath == null || typePath.length() == 0) { + return null; + } + int n = typePath.length(); + ByteVector out = new ByteVector(n); + out.putByte(0); + for (int i = 0; i < n;) { + char c = typePath.charAt(i++); + if (c == '[') { + out.put11(ARRAY_ELEMENT, 0); + } else if (c == '.') { + out.put11(INNER_TYPE, 0); + } else if (c == '*') { + out.put11(WILDCARD_BOUND, 0); + } else if (c >= '0' && c <= '9') { + int typeArg = c - '0'; + while (i < n && (c = typePath.charAt(i)) >= '0' && c <= '9') { + typeArg = typeArg * 10 + c - '0'; + i += 1; + } + if (i < n && typePath.charAt(i) == ';') { + i += 1; + } + out.put11(TYPE_ARGUMENT, typeArg); + } + } + out.data[0] = (byte) (out.length / 2); + return new TypePath(out.data, 0); + } + + /** + * Returns a string representation of this type path. {@link #ARRAY_ELEMENT + * ARRAY_ELEMENT} steps are represented with '[', {@link #INNER_TYPE + * INNER_TYPE} steps with '.', {@link #WILDCARD_BOUND WILDCARD_BOUND} steps + * with '*' and {@link #TYPE_ARGUMENT TYPE_ARGUMENT} steps with their type + * argument index in decimal form followed by ';'. + */ + @Override + public String toString() { + int length = getLength(); + StringBuilder result = new StringBuilder(length * 2); + for (int i = 0; i < length; ++i) { + switch (getStep(i)) { + case ARRAY_ELEMENT: + result.append('['); + break; + case INNER_TYPE: + result.append('.'); + break; + case WILDCARD_BOUND: + result.append('*'); + break; + case TYPE_ARGUMENT: + result.append(getStepArgument(i)).append(';'); + break; + default: + result.append('_'); + } + } + return result.toString(); + } +} diff -Nru libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/TypeReference.java libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/TypeReference.java --- libbluray-0.8.1/contrib/asm/src/org/objectweb/asm/TypeReference.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/contrib/asm/src/org/objectweb/asm/TypeReference.java 2017-06-23 13:35:18.000000000 +0000 @@ -0,0 +1,452 @@ +/*** + * ASM: a very small and fast Java bytecode manipulation framework + * Copyright (c) 2000-2013 INRIA, France Telecom + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.objectweb.asm; + +/** + * A reference to a type appearing in a class, field or method declaration, or + * on an instruction. Such a reference designates the part of the class where + * the referenced type is appearing (e.g. an 'extends', 'implements' or 'throws' + * clause, a 'new' instruction, a 'catch' clause, a type cast, a local variable + * declaration, etc). + * + * @author Eric Bruneton + */ +public class TypeReference { + + /** + * The sort of type references that target a type parameter of a generic + * class. See {@link #getSort getSort}. + */ + public final static int CLASS_TYPE_PARAMETER = 0x00; + + /** + * The sort of type references that target a type parameter of a generic + * method. See {@link #getSort getSort}. + */ + public final static int METHOD_TYPE_PARAMETER = 0x01; + + /** + * The sort of type references that target the super class of a class or one + * of the interfaces it implements. See {@link #getSort getSort}. + */ + public final static int CLASS_EXTENDS = 0x10; + + /** + * The sort of type references that target a bound of a type parameter of a + * generic class. See {@link #getSort getSort}. + */ + public final static int CLASS_TYPE_PARAMETER_BOUND = 0x11; + + /** + * The sort of type references that target a bound of a type parameter of a + * generic method. See {@link #getSort getSort}. + */ + public final static int METHOD_TYPE_PARAMETER_BOUND = 0x12; + + /** + * The sort of type references that target the type of a field. See + * {@link #getSort getSort}. + */ + public final static int FIELD = 0x13; + + /** + * The sort of type references that target the return type of a method. See + * {@link #getSort getSort}. + */ + public final static int METHOD_RETURN = 0x14; + + /** + * The sort of type references that target the receiver type of a method. + * See {@link #getSort getSort}. + */ + public final static int METHOD_RECEIVER = 0x15; + + /** + * The sort of type references that target the type of a formal parameter of + * a method. See {@link #getSort getSort}. + */ + public final static int METHOD_FORMAL_PARAMETER = 0x16; + + /** + * The sort of type references that target the type of an exception declared + * in the throws clause of a method. See {@link #getSort getSort}. + */ + public final static int THROWS = 0x17; + + /** + * The sort of type references that target the type of a local variable in a + * method. See {@link #getSort getSort}. + */ + public final static int LOCAL_VARIABLE = 0x40; + + /** + * The sort of type references that target the type of a resource variable + * in a method. See {@link #getSort getSort}. + */ + public final static int RESOURCE_VARIABLE = 0x41; + + /** + * The sort of type references that target the type of the exception of a + * 'catch' clause in a method. See {@link #getSort getSort}. + */ + public final static int EXCEPTION_PARAMETER = 0x42; + + /** + * The sort of type references that target the type declared in an + * 'instanceof' instruction. See {@link #getSort getSort}. + */ + public final static int INSTANCEOF = 0x43; + + /** + * The sort of type references that target the type of the object created by + * a 'new' instruction. See {@link #getSort getSort}. + */ + public final static int NEW = 0x44; + + /** + * The sort of type references that target the receiver type of a + * constructor reference. See {@link #getSort getSort}. + */ + public final static int CONSTRUCTOR_REFERENCE = 0x45; + + /** + * The sort of type references that target the receiver type of a method + * reference. See {@link #getSort getSort}. + */ + public final static int METHOD_REFERENCE = 0x46; + + /** + * The sort of type references that target the type declared in an explicit + * or implicit cast instruction. See {@link #getSort getSort}. + */ + public final static int CAST = 0x47; + + /** + * The sort of type references that target a type parameter of a generic + * constructor in a constructor call. See {@link #getSort getSort}. + */ + public final static int CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT = 0x48; + + /** + * The sort of type references that target a type parameter of a generic + * method in a method call. See {@link #getSort getSort}. + */ + public final static int METHOD_INVOCATION_TYPE_ARGUMENT = 0x49; + + /** + * The sort of type references that target a type parameter of a generic + * constructor in a constructor reference. See {@link #getSort getSort}. + */ + public final static int CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT = 0x4A; + + /** + * The sort of type references that target a type parameter of a generic + * method in a method reference. See {@link #getSort getSort}. + */ + public final static int METHOD_REFERENCE_TYPE_ARGUMENT = 0x4B; + + /** + * The type reference value in Java class file format. + */ + private int value; + + /** + * Creates a new TypeReference. + * + * @param typeRef + * the int encoded value of the type reference, as received in a + * visit method related to type annotations, like + * visitTypeAnnotation. + */ + public TypeReference(int typeRef) { + this.value = typeRef; + } + + /** + * Returns a type reference of the given sort. + * + * @param sort + * {@link #FIELD FIELD}, {@link #METHOD_RETURN METHOD_RETURN}, + * {@link #METHOD_RECEIVER METHOD_RECEIVER}, + * {@link #LOCAL_VARIABLE LOCAL_VARIABLE}, + * {@link #RESOURCE_VARIABLE RESOURCE_VARIABLE}, + * {@link #INSTANCEOF INSTANCEOF}, {@link #NEW NEW}, + * {@link #CONSTRUCTOR_REFERENCE CONSTRUCTOR_REFERENCE}, or + * {@link #METHOD_REFERENCE METHOD_REFERENCE}. + * @return a type reference of the given sort. + */ + public static TypeReference newTypeReference(int sort) { + return new TypeReference(sort << 24); + } + + /** + * Returns a reference to a type parameter of a generic class or method. + * + * @param sort + * {@link #CLASS_TYPE_PARAMETER CLASS_TYPE_PARAMETER} or + * {@link #METHOD_TYPE_PARAMETER METHOD_TYPE_PARAMETER}. + * @param paramIndex + * the type parameter index. + * @return a reference to the given generic class or method type parameter. + */ + public static TypeReference newTypeParameterReference(int sort, + int paramIndex) { + return new TypeReference((sort << 24) | (paramIndex << 16)); + } + + /** + * Returns a reference to a type parameter bound of a generic class or + * method. + * + * @param sort + * {@link #CLASS_TYPE_PARAMETER CLASS_TYPE_PARAMETER} or + * {@link #METHOD_TYPE_PARAMETER METHOD_TYPE_PARAMETER}. + * @param paramIndex + * the type parameter index. + * @param boundIndex + * the type bound index within the above type parameters. + * @return a reference to the given generic class or method type parameter + * bound. + */ + public static TypeReference newTypeParameterBoundReference(int sort, + int paramIndex, int boundIndex) { + return new TypeReference((sort << 24) | (paramIndex << 16) + | (boundIndex << 8)); + } + + /** + * Returns a reference to the super class or to an interface of the + * 'implements' clause of a class. + * + * @param itfIndex + * the index of an interface in the 'implements' clause of a + * class, or -1 to reference the super class of the class. + * @return a reference to the given super type of a class. + */ + public static TypeReference newSuperTypeReference(int itfIndex) { + itfIndex &= 0xFFFF; + return new TypeReference((CLASS_EXTENDS << 24) | (itfIndex << 8)); + } + + /** + * Returns a reference to the type of a formal parameter of a method. + * + * @param paramIndex + * the formal parameter index. + * + * @return a reference to the type of the given method formal parameter. + */ + public static TypeReference newFormalParameterReference(int paramIndex) { + return new TypeReference((METHOD_FORMAL_PARAMETER << 24) + | (paramIndex << 16)); + } + + /** + * Returns a reference to the type of an exception, in a 'throws' clause of + * a method. + * + * @param exceptionIndex + * the index of an exception in a 'throws' clause of a method. + * + * @return a reference to the type of the given exception. + */ + public static TypeReference newExceptionReference(int exceptionIndex) { + return new TypeReference((THROWS << 24) | (exceptionIndex << 8)); + } + + /** + * Returns a reference to the type of the exception declared in a 'catch' + * clause of a method. + * + * @param tryCatchBlockIndex + * the index of a try catch block (using the order in which they + * are visited with visitTryCatchBlock). + * + * @return a reference to the type of the given exception. + */ + public static TypeReference newTryCatchReference(int tryCatchBlockIndex) { + return new TypeReference((EXCEPTION_PARAMETER << 24) + | (tryCatchBlockIndex << 8)); + } + + /** + * Returns a reference to the type of a type argument in a constructor or + * method call or reference. + * + * @param sort + * {@link #CAST CAST}, + * {@link #CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT + * CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT}, + * {@link #METHOD_INVOCATION_TYPE_ARGUMENT + * METHOD_INVOCATION_TYPE_ARGUMENT}, + * {@link #CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT + * CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT}, or + * {@link #METHOD_REFERENCE_TYPE_ARGUMENT + * METHOD_REFERENCE_TYPE_ARGUMENT}. + * @param argIndex + * the type argument index. + * + * @return a reference to the type of the given type argument. + */ + public static TypeReference newTypeArgumentReference(int sort, int argIndex) { + return new TypeReference((sort << 24) | argIndex); + } + + /** + * Returns the sort of this type reference. + * + * @return {@link #CLASS_TYPE_PARAMETER CLASS_TYPE_PARAMETER}, + * {@link #METHOD_TYPE_PARAMETER METHOD_TYPE_PARAMETER}, + * {@link #CLASS_EXTENDS CLASS_EXTENDS}, + * {@link #CLASS_TYPE_PARAMETER_BOUND CLASS_TYPE_PARAMETER_BOUND}, + * {@link #METHOD_TYPE_PARAMETER_BOUND METHOD_TYPE_PARAMETER_BOUND}, + * {@link #FIELD FIELD}, {@link #METHOD_RETURN METHOD_RETURN}, + * {@link #METHOD_RECEIVER METHOD_RECEIVER}, + * {@link #METHOD_FORMAL_PARAMETER METHOD_FORMAL_PARAMETER}, + * {@link #THROWS THROWS}, {@link #LOCAL_VARIABLE LOCAL_VARIABLE}, + * {@link #RESOURCE_VARIABLE RESOURCE_VARIABLE}, + * {@link #EXCEPTION_PARAMETER EXCEPTION_PARAMETER}, + * {@link #INSTANCEOF INSTANCEOF}, {@link #NEW NEW}, + * {@link #CONSTRUCTOR_REFERENCE CONSTRUCTOR_REFERENCE}, + * {@link #METHOD_REFERENCE METHOD_REFERENCE}, {@link #CAST CAST}, + * {@link #CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT + * CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT}, + * {@link #METHOD_INVOCATION_TYPE_ARGUMENT + * METHOD_INVOCATION_TYPE_ARGUMENT}, + * {@link #CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT + * CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT}, or + * {@link #METHOD_REFERENCE_TYPE_ARGUMENT + * METHOD_REFERENCE_TYPE_ARGUMENT}. + */ + public int getSort() { + return value >>> 24; + } + + /** + * Returns the index of the type parameter referenced by this type + * reference. This method must only be used for type references whose sort + * is {@link #CLASS_TYPE_PARAMETER CLASS_TYPE_PARAMETER}, + * {@link #METHOD_TYPE_PARAMETER METHOD_TYPE_PARAMETER}, + * {@link #CLASS_TYPE_PARAMETER_BOUND CLASS_TYPE_PARAMETER_BOUND} or + * {@link #METHOD_TYPE_PARAMETER_BOUND METHOD_TYPE_PARAMETER_BOUND}. + * + * @return a type parameter index. + */ + public int getTypeParameterIndex() { + return (value & 0x00FF0000) >> 16; + } + + /** + * Returns the index of the type parameter bound, within the type parameter + * {@link #getTypeParameterIndex}, referenced by this type reference. This + * method must only be used for type references whose sort is + * {@link #CLASS_TYPE_PARAMETER_BOUND CLASS_TYPE_PARAMETER_BOUND} or + * {@link #METHOD_TYPE_PARAMETER_BOUND METHOD_TYPE_PARAMETER_BOUND}. + * + * @return a type parameter bound index. + */ + public int getTypeParameterBoundIndex() { + return (value & 0x0000FF00) >> 8; + } + + /** + * Returns the index of the "super type" of a class that is referenced by + * this type reference. This method must only be used for type references + * whose sort is {@link #CLASS_EXTENDS CLASS_EXTENDS}. + * + * @return the index of an interface in the 'implements' clause of a class, + * or -1 if this type reference references the type of the super + * class. + */ + public int getSuperTypeIndex() { + return (short) ((value & 0x00FFFF00) >> 8); + } + + /** + * Returns the index of the formal parameter whose type is referenced by + * this type reference. This method must only be used for type references + * whose sort is {@link #METHOD_FORMAL_PARAMETER METHOD_FORMAL_PARAMETER}. + * + * @return a formal parameter index. + */ + public int getFormalParameterIndex() { + return (value & 0x00FF0000) >> 16; + } + + /** + * Returns the index of the exception, in a 'throws' clause of a method, + * whose type is referenced by this type reference. This method must only be + * used for type references whose sort is {@link #THROWS THROWS}. + * + * @return the index of an exception in the 'throws' clause of a method. + */ + public int getExceptionIndex() { + return (value & 0x00FFFF00) >> 8; + } + + /** + * Returns the index of the try catch block (using the order in which they + * are visited with visitTryCatchBlock), whose 'catch' type is referenced by + * this type reference. This method must only be used for type references + * whose sort is {@link #EXCEPTION_PARAMETER EXCEPTION_PARAMETER} . + * + * @return the index of an exception in the 'throws' clause of a method. + */ + public int getTryCatchBlockIndex() { + return (value & 0x00FFFF00) >> 8; + } + + /** + * Returns the index of the type argument referenced by this type reference. + * This method must only be used for type references whose sort is + * {@link #CAST CAST}, {@link #CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT + * CONSTRUCTOR_INVOCATION_TYPE_ARGUMENT}, + * {@link #METHOD_INVOCATION_TYPE_ARGUMENT METHOD_INVOCATION_TYPE_ARGUMENT}, + * {@link #CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT + * CONSTRUCTOR_REFERENCE_TYPE_ARGUMENT}, or + * {@link #METHOD_REFERENCE_TYPE_ARGUMENT METHOD_REFERENCE_TYPE_ARGUMENT}. + * + * @return a type parameter index. + */ + public int getTypeArgumentIndex() { + return value & 0xFF; + } + + /** + * Returns the int encoded value of this type reference, suitable for use in + * visit methods related to type annotations, like visitTypeAnnotation. + * + * @return the int encoded value of this type reference. + */ + public int getValue() { + return value; + } +} diff -Nru libbluray-0.8.1/contrib/libudfread/src/blockinput.h libbluray-1.0.1/contrib/libudfread/src/blockinput.h --- libbluray-0.8.1/contrib/libudfread/src/blockinput.h 2015-02-18 09:40:47.000000000 +0000 +++ libbluray-1.0.1/contrib/libudfread/src/blockinput.h 2017-06-23 13:35:19.000000000 +0000 @@ -40,9 +40,12 @@ typedef struct udfread_block_input udfread_block_input; struct udfread_block_input { + /* Close input. Optional. */ int (*close) (udfread_block_input *); + /* Read block(s) from input. Mandatory. */ int (*read) (udfread_block_input *, uint32_t lba, void *buf, uint32_t nblocks, int flags); - uint32_t (*size) (udfread_block_input *); /* size in blocks */ + /* Input size in blocks. Optional. */ + uint32_t (*size) (udfread_block_input *); }; diff -Nru libbluray-0.8.1/contrib/libudfread/src/default_blockinput.c libbluray-1.0.1/contrib/libudfread/src/default_blockinput.c --- libbluray-0.8.1/contrib/libudfread/src/default_blockinput.c 2015-04-06 16:44:35.000000000 +0000 +++ libbluray-1.0.1/contrib/libudfread/src/default_blockinput.c 2017-06-23 13:35:19.000000000 +0000 @@ -1,6 +1,6 @@ /* * This file is part of libudfread - * Copyright (C) 2014-2015 VLC authors and VideoLAN + * Copyright (C) 2014-2017 VLC authors and VideoLAN * * Authors: Petri Hintukainen * @@ -28,7 +28,6 @@ #include #include -#include #ifdef HAVE_UNISTD_H #include #endif @@ -38,9 +37,22 @@ #ifdef _WIN32 #include +#ifndef HAVE_UNISTD_H +#include +#endif #include +# undef lseek +# define lseek _lseeki64 +# undef off_t +# define off_t int64_t #endif +#ifdef __ANDROID__ +# undef lseek +# define lseek lseek64 +# undef off_t +# define off_t off64_t +#endif #ifdef _WIN32 static ssize_t pread(int fd, void *buf, size_t count, off_t offset) @@ -54,14 +66,38 @@ return -1; } - ov.Offset = offset; + memset(&ov, 0, sizeof(ov)); + ov.Offset = (DWORD)offset; ov.OffsetHigh = (offset >> 32); if (!ReadFile(handle, buf, count, &got, &ov)) { return -1; } return got; } -#endif + +#elif defined (NEED_PREAD_IMPL) + +#include +static ssize_t pread_impl(int fd, void *buf, size_t count, off_t offset) +{ + static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; + ssize_t result; + + pthread_mutex_lock(&lock); + + if (lseek(fd, offset, SEEK_SET) != offset) { + result = -1; + } else { + result = read(fd, buf, count); + } + + pthread_mutex_unlock(&lock); + return result; +} + +#define pread(a,b,c,d) pread_impl(a,b,c,d) + +#endif /* _WIN32 || NEED_PREAD_IMPL */ typedef struct default_block_input { @@ -100,12 +136,12 @@ static int _def_read(udfread_block_input *p_gen, uint32_t lba, void *buf, uint32_t nblocks, int flags) { - (void)flags; default_block_input *p = (default_block_input *)p_gen; - size_t bytes, got; off_t pos; + (void)flags; + bytes = (size_t)nblocks * UDF_BLOCK_SIZE; got = 0; pos = (off_t)lba * UDF_BLOCK_SIZE; diff -Nru libbluray-0.8.1/contrib/libudfread/src/ecma167.c libbluray-1.0.1/contrib/libudfread/src/ecma167.c --- libbluray-0.8.1/contrib/libudfread/src/ecma167.c 2015-02-28 19:15:40.000000000 +0000 +++ libbluray-1.0.1/contrib/libudfread/src/ecma167.c 2017-06-23 13:35:19.000000000 +0000 @@ -19,6 +19,10 @@ * . */ +#if HAVE_CONFIG_H +#include "config.h" +#endif + #include "ecma167.h" #include @@ -33,14 +37,21 @@ */ /* fixed-length dstring, ECMA 1/7.2.12 */ -static int _decode_dstring(const uint8_t *p, int field_length, uint8_t *str) +static uint8_t _decode_dstring(const uint8_t *p, size_t field_length, uint8_t *str) { - int length = _get_u8(p + field_length - 1); - if (length > field_length - 1) { - length = field_length - 1; + size_t length; + + if (field_length < 1) { + return 0; + } + field_length--; + + length = _get_u8(p + field_length); + if (length > field_length) { + length = field_length; } memcpy(str, p, length); - return length; + return (uint8_t)length; } /* Extent Descriptor (ECMA 167, 3/7.1) */ @@ -61,8 +72,6 @@ * Part 3: Volume Structure */ -#define AD_LENGTH_MASK 0x3fffffff - /* Descriptor Tag (ECMA 167, 3/7.2) */ enum tag_identifier decode_descriptor_tag(const uint8_t *buf) { @@ -76,10 +85,10 @@ /* calculate tag checksum */ for (i = 0; i < 4; i++) { - checksum += buf[i]; + checksum = (uint8_t)(checksum + buf[i]); } for (i = 5; i < 16; i++) { - checksum += buf[i]; + checksum = (uint8_t)(checksum + buf[i]); } if (checksum != buf[4]) { @@ -118,6 +127,8 @@ /* Logical Volume Descriptor (ECMA 167 3/10.6) */ void decode_logical_volume(const uint8_t *p, struct logical_volume_descriptor *lvd) { + size_t map_size; + lvd->block_size = _get_u32(p + 212); decode_entity_id(p + 216, &lvd->domain_id); @@ -128,7 +139,7 @@ lvd->num_partition_maps = _get_u32(p + 268); /* XXX cut long maps */ - uint32_t map_size = lvd->partition_map_lable_length; + map_size = lvd->partition_map_lable_length; if (map_size > sizeof(lvd->partition_map_table)) { map_size = sizeof(lvd->partition_map_table); } @@ -149,7 +160,7 @@ /* File Identifier (ECMA 167 4/14.4) */ size_t decode_file_identifier(const uint8_t *p, struct file_identifier *fi) { - uint16_t l_iu; /* length of implementation use field */ + size_t l_iu; /* length of implementation use field */ fi->characteristic = _get_u8(p + 18); fi->filename_len = _get_u8(p + 19); @@ -166,7 +177,7 @@ * padding size 4 * ip((L_FI+L_IU+38+3)/4) - (L_FI+L_IU+38) * => padded to dwords */ - return 4 * ((38 + fi->filename_len + l_iu + 3) / 4); + return 4 * ((38 + (size_t)fi->filename_len + l_iu + 3) / 4); } /* ICB Tag (ECMA 167 4/14.6) */ @@ -184,10 +195,17 @@ tag->flags = _get_u16(p + 18); } +/* Allocation Descriptors */ + +#define AD_LENGTH_MASK 0x3fffffff +#define AD_TYPE(length) ((length) >> 30) + /* Short Allocation Descriptor (ECMA 167, 4/14.14.1) */ static void _decode_short_ad(const uint8_t *buf, uint16_t partition, struct long_ad *ad) { - ad->length = _get_u32(buf + 0) & AD_LENGTH_MASK; + uint32_t u32 = _get_u32(buf + 0); + ad->extent_type = AD_TYPE(u32); + ad->length = u32 & AD_LENGTH_MASK; ad->lba = _get_u32(buf + 4); ad->partition = partition; } @@ -195,7 +213,9 @@ /* Long Allocation Descriptor (ECMA 167, 4/14.14.2) */ void decode_long_ad(const uint8_t *buf, struct long_ad *ad) { - ad->length = _get_u32(buf + 0) & AD_LENGTH_MASK; + uint32_t u32 = _get_u32(buf + 0); + ad->extent_type = AD_TYPE(u32); + ad->length = u32 & AD_LENGTH_MASK; ad->lba = _get_u32(buf + 4); ad->partition = _get_u16(buf + 8); } @@ -203,30 +223,32 @@ /* Exrtended Allocation Descriptor (ECMA 167, 4/14.14.3) */ static void _decode_extended_ad(const uint8_t *buf, struct long_ad *ad) { - ad->length = _get_u32(buf + 0) & AD_LENGTH_MASK; + uint32_t u32 = _get_u32(buf + 0); + ad->extent_type = AD_TYPE(u32); + ad->length = u32 & AD_LENGTH_MASK; ad->lba = _get_u32(buf + 12); ad->partition = _get_u16(buf + 16); } /* File Entry */ -static void _decode_file_ads(const uint8_t *p, int flags, uint16_t partition, struct file_entry *fe) +static void _decode_file_ads(const uint8_t *p, int ad_type, uint16_t partition, + struct long_ad *ad, unsigned num_ad) { uint32_t i; - flags &= 7; - for (i = 0; i < fe->num_ad; i++) { - switch (flags) { + for (i = 0; i < num_ad; i++) { + switch (ad_type) { case 0: - _decode_short_ad(p, partition, &fe->data.ad[i]); + _decode_short_ad(p, partition, &ad[i]); p += 8; break; case 1: - decode_long_ad(p, &fe->data.ad[i]); + decode_long_ad(p, &ad[i]); p += 16; break; case 2: - _decode_extended_ad(p, &fe->data.ad[i]); + _decode_extended_ad(p, &ad[i]); p += 20; break; } @@ -238,7 +260,7 @@ { struct file_entry *fe; struct icb_tag tag; - int num_ad; + uint32_t num_ad; int content_inline = 0; if (p_ad + l_ad > size) { @@ -266,7 +288,7 @@ return NULL; } - if (content_inline) { + if (num_ad < 1) { fe = (struct file_entry *)calloc(1, sizeof(struct file_entry) + l_ad); } else { fe = (struct file_entry *)calloc(1, sizeof(struct file_entry) + sizeof(struct long_ad) * (num_ad - 1)); @@ -279,6 +301,7 @@ fe->file_type = tag.file_type; fe->length = _get_u64(p + 56); fe->num_ad = num_ad; + fe->ad_type = tag.flags & 7; if (content_inline) { /* data of small files can be embedded in file entry */ @@ -286,12 +309,55 @@ fe->content_inline = 1; memcpy(fe->data.content, p + p_ad, l_ad); } else { - _decode_file_ads(p + p_ad, tag.flags, partition, fe); + _decode_file_ads(p + p_ad, fe->ad_type, partition, &fe->data.ad[0], num_ad); } return fe; } +int decode_allocation_extent(struct file_entry **p_fe, const uint8_t *p, size_t size, uint16_t partition) +{ + struct file_entry *fe = *p_fe; + uint32_t l_ad, num_ad; + + l_ad = _get_u32(p + 20); + if (size < 24 || size - 24 < l_ad) { + ecma_error("decode_allocation_extent: invalid allocation extent (l_ad)\n"); + return -1; + } + + switch (fe->ad_type) { + case 0: num_ad = l_ad / 8; break; + case 1: num_ad = l_ad / 16; break; + case 2: num_ad = l_ad / 20; break; + default: + return -1; + } + + if (num_ad < 1) { + ecma_error("decode_allocation_extent: empty allocation extent\n"); + return 0; + } + + fe = (struct file_entry *)realloc(fe, sizeof(struct file_entry) + sizeof(struct long_ad) * (fe->num_ad + num_ad - 1)); + if (!fe) { + return -1; + } + *p_fe = fe; + + /* drop pointer to this extent from the end of ads */ + if (fe->data.ad[fe->num_ad - 1].extent_type != ECMA_AD_EXTENT_AD) { + ecma_error("decode_allocation_extent: missing link ad\n"); + } + fe->num_ad--; + + /* decode new allocation descriptors */ + _decode_file_ads(p + 24, fe->ad_type, partition, &fe->data.ad[fe->num_ad], num_ad); + fe->num_ad += num_ad; + + return 0; +} + /* File Entry (ECMA 167, 4/14.9) */ struct file_entry *decode_file_entry(const uint8_t *p, size_t size, uint16_t partition) { @@ -300,6 +366,12 @@ l_ea = _get_u32(p + 168); l_ad = _get_u32(p + 172); + /* check for integer overflow */ + if ((uint64_t)l_ea + (uint64_t)l_ad + (uint64_t)176 >= (uint64_t)1<<32) { + ecma_error("invalid file entry\n"); + return NULL; + } + return _decode_file_entry(p, size, partition, l_ad, 176 + l_ea); } @@ -311,6 +383,12 @@ l_ea = _get_u32(p + 208); l_ad = _get_u32(p + 212); + /* check for integer overflow */ + if ((uint64_t)l_ea + (uint64_t)l_ad + (uint64_t)216 >= (uint64_t)1<<32) { + ecma_error("invalid file entry\n"); + return NULL; + } + return _decode_file_entry(p, size, partition, l_ad, 216 + l_ea); } diff -Nru libbluray-0.8.1/contrib/libudfread/src/ecma167.h libbluray-1.0.1/contrib/libudfread/src/ecma167.h --- libbluray-0.8.1/contrib/libudfread/src/ecma167.h 2015-02-12 09:58:48.000000000 +0000 +++ libbluray-1.0.1/contrib/libudfread/src/ecma167.h 2017-06-23 13:35:19.000000000 +0000 @@ -94,6 +94,7 @@ /* ECMA 167, 4/7.2.1 */ ECMA_FileSetDescriptor = 256, ECMA_FileIdentifierDescriptor = 257, + ECMA_AllocationExtentDescriptor = 258, ECMA_FileEntry = 261, ECMA_ExtendedFileEntry = 266, @@ -149,12 +150,21 @@ * Part 4: File Structure */ +enum { + ECMA_AD_EXTENT_NORMAL = 0, /* allocated and recorded file data */ + ECMA_AD_EXTENT_NOT_RECORDED = 1, + ECMA_AD_EXTENT_NOT_ALLOCATED = 2, + ECMA_AD_EXTENT_AD = 3, /* pointer to next extent of allocation descriptors */ +}; + + /* Short/Long/Extended Allocation Descriptor (ECMA 167, 4/14.14.[1,2,3]) */ struct long_ad { uint32_t lba; /* start block, relative to partition start */ uint32_t length; /* in bytes */ uint16_t partition; + uint8_t extent_type; }; void decode_long_ad(const uint8_t *p, struct long_ad *ad); @@ -202,6 +212,7 @@ uint64_t length; /* in bytes */ uint8_t file_type; /* ECMA_FT_* */ uint8_t content_inline; /* 1 if file data is embedded in file entry */ + uint8_t ad_type; /* from icb_flags; used when parsing allocation extents */ uint32_t num_ad; union { @@ -214,5 +225,6 @@ struct file_entry *decode_ext_file_entry(const uint8_t *p, size_t size, uint16_t partition); void free_file_entry (struct file_entry **p_fe); +int decode_allocation_extent(struct file_entry **p_fe, const uint8_t *p, size_t size, uint16_t partition); #endif /* UDFREAD_ECMA167_H_ */ diff -Nru libbluray-0.8.1/contrib/libudfread/src/udfread.c libbluray-1.0.1/contrib/libudfread/src/udfread.c --- libbluray-0.8.1/contrib/libudfread/src/udfread.c 2015-05-15 09:37:59.000000000 +0000 +++ libbluray-1.0.1/contrib/libudfread/src/udfread.c 2017-06-23 13:35:19.000000000 +0000 @@ -25,6 +25,10 @@ #include "udfread.h" +#ifdef HAVE_UDFREAD_VERSION_H +#include "udfread-version.h" +#endif + #include "blockinput.h" #include "default_blockinput.h" #include "ecma167.h" @@ -139,7 +143,7 @@ #define utf16lo_to_utf8(out, out_pos, out_size, ch) \ do { \ if (ch < 0x80) { \ - out[out_pos++] = ch; \ + out[out_pos++] = (uint8_t)ch; \ } else { \ out_size++; \ out = (uint8_t *)_safe_realloc(out, out_size);\ @@ -283,7 +287,7 @@ } if (!memcmp(buf, bea, sizeof(bea))) { udf_trace("ECMA 167 Volume, BEA01\n"); - bea_seen++; + bea_seen = 1; } if (bea_seen) { @@ -508,7 +512,11 @@ continue; } - if (fe->file_type == UDF_FT_METADATA) { + if (fe->content_inline) { + udf_error("invalid metadata file (content inline)\n"); + } else if (!fe->num_ad) { + udf_error("invalid metadata file (no allocation descriptors)\n"); + } else if (fe->file_type == UDF_FT_METADATA) { part->p[1].lba = pd->start_block + fe->data.ad[0].lba; udf_log("metadata file at lba %u\n", part->p[1].lba); } else if (fe->file_type == UDF_FT_METADATA_MIRROR) { @@ -693,6 +701,10 @@ enable_log = 1; } +#ifdef HAVE_UDFREAD_VERSION_H + udf_log("libudfread " UDFREAD_VERSION_STRING "\n"); +#endif + return (udfread *)calloc(1, sizeof(udfread)); } @@ -771,15 +783,11 @@ return tag_id; } -static struct file_entry *_read_file_entry(udfread *udf, - const struct long_ad *icb) +static uint8_t *_read_metadata(udfread *udf, const struct long_ad *icb, int *tag_id) { - struct file_entry *fe = NULL; uint32_t num_blocks = (icb->length + UDF_BLOCK_SIZE - 1) / UDF_BLOCK_SIZE; uint8_t *buf; - int tag_id; - udf_trace("file entry size %u bytes\n", icb->length); if (num_blocks < 1) { return NULL; } @@ -790,13 +798,31 @@ return NULL; } - tag_id = _read_metadata_blocks(udf, buf, icb); - if (tag_id < 0) { - udf_error("reading file entry failed\n"); + *tag_id = _read_metadata_blocks(udf, buf, icb); + if (*tag_id < 0) { + udf_log("reading icb blocks failed\n"); free(buf); return NULL; } + return buf; +} + +static struct file_entry *_read_file_entry(udfread *udf, + const struct long_ad *icb) +{ + struct file_entry *fe = NULL; + uint8_t *buf; + int tag_id; + + udf_trace("file entry size %u bytes\n", icb->length); + + buf = _read_metadata(udf, icb, &tag_id); + if (!buf) { + udf_error("reading file entry failed\n"); + return NULL; + } + switch (tag_id) { case ECMA_FileEntry: fe = decode_file_entry(buf, UDF_BLOCK_SIZE, icb->partition); @@ -810,6 +836,40 @@ } free(buf); + + /* read possible additional allocation extents */ + if (fe) { + while (fe->num_ad > 0 && + fe->data.ad[fe->num_ad - 1].extent_type == ECMA_AD_EXTENT_AD) { + + icb = &fe->data.ad[fe->num_ad - 1]; + udf_log("_read_file_entry: reading allocation extent @%u\n", icb->lba); + + buf = _read_metadata(udf, icb, &tag_id); + if (!buf) { + udf_error("_read_file_entry: reading allocation extent @%u failed\n", icb->lba); + break; + } + + if (tag_id != ECMA_AllocationExtentDescriptor) { + free(buf); + udf_error("_read_file_entry: unexpected tag %d (expected ECMA_AllocationExtentDescriptor)\n", tag_id); + break; + } + + if (decode_allocation_extent(&fe, buf, icb->length, icb->partition) < 0) { + free(buf); + udf_error("_read_file_entry: decode_allocation_extent() failed\n"); + break; + } + + /* failure before this point will cause an error when reading the file past extent point. + (extent ad is left in file ad list). */ + + free(buf); + } + } + return fe; } @@ -857,28 +917,18 @@ static struct udf_dir *_read_dir_file(udfread *udf, const struct long_ad *loc) { - uint32_t num_blocks = (loc->length + UDF_BLOCK_SIZE - 1) / UDF_BLOCK_SIZE; - uint8_t *data; struct udf_dir *dir = NULL; + uint8_t *data; + int tag_id; - if (num_blocks < 1) { - return NULL; - } + udf_trace("directory size %u bytes\n", loc->length); - data = (uint8_t *)malloc(num_blocks * UDF_BLOCK_SIZE); + data = _read_metadata(udf, loc, &tag_id); if (!data) { - udf_error("out of memory\n"); - return NULL; - } - - if (_read_metadata_blocks(udf, data, loc) < 0) { udf_error("reading directory file failed\n"); - free(data); return NULL; } - udf_trace("directory size %u bytes\n", loc->length); - dir = (struct udf_dir *)calloc(1, sizeof(struct udf_dir)); if (dir) { if (_parse_dir(data, loc->length, dir) < 0) { @@ -1089,7 +1139,7 @@ struct volume_descriptor_set vds; struct long_ad fsd_location; - if (!udf || !input) { + if (!udf || !input || !input->read) { return -1; } @@ -1133,6 +1183,10 @@ udfread_block_input *input; int result; + if (!path) { + return -1; + } + input = block_input_new(path); if (!input) { return -1; @@ -1140,7 +1194,9 @@ result = udfread_open_input(udf, input); if (result < 0) { - input->close(input); + if (input->close) { + input->close(input); + } } return result; @@ -1150,7 +1206,9 @@ { if (udf) { if (udf->input) { - udf->input->close(udf->input); + if (udf->input->close) { + udf->input->close(udf->input); + } udf->input = NULL; } @@ -1216,7 +1274,7 @@ struct udfread_dirent *udfread_readdir(UDFDIR *p, struct udfread_dirent *entry) { - const struct udf_file_identifier *fe; + const struct udf_file_identifier *fi; if (!p || !entry || !p->dir) { return NULL; @@ -1226,14 +1284,14 @@ return NULL; } - fe = &p->dir->files[p->current_file]; + fi = &p->dir->files[p->current_file]; - entry->d_name = fe->filename; + entry->d_name = fi->filename; - if (fe->characteristic & CHAR_FLAG_PARENT) { + if (fi->characteristic & CHAR_FLAG_PARENT) { entry->d_type = UDF_DT_DIR; entry->d_name = ".."; - } else if (fe->characteristic & CHAR_FLAG_DIR) { + } else if (fi->characteristic & CHAR_FLAG_DIR) { entry->d_type = UDF_DT_DIR; } else { entry->d_type = UDF_DT_REG; @@ -1331,26 +1389,26 @@ * block access */ -uint32_t udfread_file_lba(UDFFILE *p, uint32_t file_block) +static uint32_t _file_lba(UDFFILE *p, uint32_t file_block) { const struct file_entry *fe; unsigned int i; uint32_t ad_size; - if (!p) { - return 0; - } - fe = p->fe; - if (fe->content_inline) { - udf_error("can't map lba for inline file\n"); - return 0; - } for (i = 0; i < fe->num_ad; i++) { const struct long_ad *ad = &fe->data.ad[0]; ad_size = (ad[i].length + UDF_BLOCK_SIZE - 1) / UDF_BLOCK_SIZE; if (file_block < ad_size) { + + if (ad[i].extent_type != ECMA_AD_EXTENT_NORMAL) { + if (ad[i].extent_type == ECMA_AD_EXTENT_AD) { + udf_error("unsupported allocation descriptor: extent type %u\n", ad[i].extent_type); + } + return 0; + } + if (!ad[i].lba) { /* empty file / no allocated space */ return 0; @@ -1368,21 +1426,59 @@ return 0; } +static int _file_lba_exists(UDFFILE *p) +{ + if (!p) { + return 0; + } + + if (p->fe->content_inline) { + udf_error("can't map lba for inline file\n"); + return 0; + } + + return 1; +} + +uint32_t udfread_file_lba(UDFFILE *p, uint32_t file_block) +{ + if (!_file_lba_exists(p)) { + return 0; + } + + return _file_lba(p, file_block); +} + uint32_t udfread_read_blocks(UDFFILE *p, void *buf, uint32_t file_block, uint32_t num_blocks, int flags) { uint32_t i; - if (!p || !num_blocks || !buf) { + if (!num_blocks || !buf) { + return 0; + } + + if (!_file_lba_exists(p)) { return 0; } for (i = 0; i < num_blocks; i++) { - uint32_t lba = udfread_file_lba(p, file_block + i); + uint32_t lba = _file_lba(p, file_block + i); uint8_t *block = (uint8_t *)buf + UDF_BLOCK_SIZE * i; + udf_trace("map block %u to lba %u\n", file_block + i, lba); + if (!lba) { + /* unallocated/unwritten block or EOF */ + uint32_t file_blocks = (udfread_file_size(p) + UDF_BLOCK_SIZE - 1) / UDF_BLOCK_SIZE; + if (file_block + i < file_blocks) { + udf_trace("zero-fill unallocated / unwritten block %u\n", file_block + i); + memset(block, 0, UDF_BLOCK_SIZE); + continue; + } + udf_error("block %u outside of file (size %u blocks)\n", file_block + i, file_blocks); break; } + if (_read_blocks(p->udf->input, lba, block, 1, flags) != 1) { break; } @@ -1396,28 +1492,32 @@ static ssize_t _read(UDFFILE *p, void *buf, size_t bytes) { - /* start from middle of block ? */ - int64_t pos_off = p->pos % UDF_BLOCK_SIZE; + /* start from middle of block ? + * maximal file size, i.e. position, is 2^32 * block size + */ + + size_t pos_off = p->pos % UDF_BLOCK_SIZE; + uint32_t file_block = (uint32_t)(p->pos / UDF_BLOCK_SIZE); if (pos_off) { - int64_t chunk_size = UDF_BLOCK_SIZE - pos_off; + size_t chunk_size = UDF_BLOCK_SIZE - pos_off; if (!p->block_valid) { - if (udfread_read_blocks(p, p->block, p->pos / UDF_BLOCK_SIZE, 1, 0) != 1) { + if (udfread_read_blocks(p, p->block, file_block, 1, 0) != 1) { return -1; } p->block_valid = 1; } - if (chunk_size > (int64_t)bytes) { + if (chunk_size > bytes) { chunk_size = bytes; } memcpy(buf, p->block + pos_off, chunk_size); - p->pos += chunk_size; + p->pos += (int64_t)chunk_size; return chunk_size; } /* read full block(s) ? */ if (bytes >= UDF_BLOCK_SIZE) { uint32_t num_blocks = bytes / UDF_BLOCK_SIZE; - num_blocks = udfread_read_blocks(p, buf, p->pos / UDF_BLOCK_SIZE, num_blocks, 0); + num_blocks = udfread_read_blocks(p, buf, file_block, num_blocks, 0); if (num_blocks < 1) { return -1; } @@ -1426,7 +1526,7 @@ } /* read beginning of a block */ - if (udfread_read_blocks(p, p->block, p->pos / UDF_BLOCK_SIZE, 1, 0) != 1) { + if (udfread_read_blocks(p, p->block, file_block, 1, 0) != 1) { return -1; } p->block_valid = 1; @@ -1470,7 +1570,7 @@ /* read chunks */ while (bytes > 0) { - int64_t r = _read(p, bufpt, bytes); + ssize_t r = _read(p, bufpt, bytes); if (r < 0) { if (bufpt != buf) { /* got some bytes */ @@ -1502,7 +1602,7 @@ pos += p->pos; break; case UDF_SEEK_END: - pos = udfread_file_size(p) - pos; + pos = udfread_file_size(p) + pos; break; case UDF_SEEK_SET: default: diff -Nru libbluray-0.8.1/debian/changelog libbluray-1.0.1/debian/changelog --- libbluray-0.8.1/debian/changelog 2015-09-02 11:15:52.000000000 +0000 +++ libbluray-1.0.1/debian/changelog 2017-06-23 14:08:26.000000000 +0000 @@ -1,8 +1,243 @@ -libbluray (1:0.8.1-1~trusty) trusty; urgency=medium +libbluray (1:1.0.1-2~trusty) trusty; urgency=medium - * new upstream release + * backport to trusty + * always enable bd-j - -- wsnipex Wed, 02 Sep 2015 10:14:00 +0200 + -- wsnipex Fri, 23 Jun 2017 15:18:58 +0200 + +libbluray (1:1.0.1.deb1-1) experimental; urgency=medium + + * Re-import 1.0.1 upstream release. + - Fixed SONAME issues. + - Fixed copy of libudfread. + * debian/copyright: Update copyright years. + + -- Sebastian Ramacher Thu, 15 Jun 2017 12:26:15 +0200 + +libbluray (1:1.0.1-1) experimental; urgency=medium + + * New upstream release. + * debian/rules: Remove obsolete flags. + * debian/patches: + - Refresh patches. + - Revert accidental SONAME decrease. + * debian/copyright: Update copyright years. + * debian/control: Use libasm-java. (Closes: #839720) + + -- Sebastian Ramacher Wed, 14 Jun 2017 21:39:03 +0200 + +libbluray (1:1.0.0-2) experimental; urgency=medium + + * debian/copyright: Add missing attributions and update copyright years. + (Closes: #856647) + + -- Sebastian Ramacher Sat, 04 Mar 2017 11:08:30 +0100 + +libbluray (1:1.0.0-1) experimental; urgency=medium + + * New upstream release. + * Bump SONAME: libbluray1 -> libbluray2. + * debian/{rules,libbluray-docs*}: Do not use incompatible jquery.js. + * debian/patches: Refreshed. + + -- Sebastian Ramacher Thu, 02 Mar 2017 19:55:21 +0100 + +libbluray (1:0.9.3-3) unstable; urgency=medium + + [ Sebastian Ramacher ] + * debian/{control,rules,compat}: Bump to debhelper compat 10. + * debian/{control,rules}: Demote javahelper to B-D-I (Closes: #841711) + + [ Dylan Aïssi ] + * Add a patch to fix spelling error. + + -- Sebastian Ramacher Wed, 16 Nov 2016 20:24:17 +0100 + +libbluray (1:0.9.3-2) unstable; urgency=medium + + * debian/rules: + - Explicitly disable JAR builds if not required. + - Fix -arch/-indep rules split. + + -- Sebastian Ramacher Wed, 18 May 2016 02:28:31 +0200 + +libbluray (1:0.9.3-1) unstable; urgency=medium + + [ Alessio Treglia ] + * Remove myself from the Uploaders list + + [ Sebastian Ramacher ] + * New upstream release. + * debian/rules: Remove no longer needed dh_strip override. + * debian/patches/03_split-jar-build-for-arch-all.patch: Removed, included + upstream. + * debian/libbluray1.symbols: Add new symbol. + * debian/control: + - Bump Standards-Version. + - Update Vcs-*. + * debian/copyright: + - Update copyright years. + - Update a path. + + -- Sebastian Ramacher Tue, 17 May 2016 23:16:39 +0200 + +libbluray (1:0.9.2-2) unstable; urgency=medium + + * Migrate to automatic dbg packages. + - debian/control: + + B-D on debhelper >= 9.20151219 + + Remove libbluray1-dbg. + - debian/rules: Run dh_strip with --ddeb-migration. + * debian/patches: + - 01_java-compat.patch: Removed, no longer needed. + - 05_use-system-asm.patch: Refreshed. + + -- Sebastian Ramacher Sun, 20 Dec 2015 20:57:50 +0100 + +libbluray (1:0.9.2-1) unstable; urgency=medium + + * New upstream release. + + -- Sebastian Ramacher Tue, 01 Dec 2015 23:08:29 +0100 + +libbluray (1:0.9.1-1) unstable; urgency=medium + + * New upstream release. + * debian/copyright: Add contrib/asm. + * debian/patches/05_use-system-asm.patch: Use system copy of libasm4-java. + * debian/control: Add libasm4-java to B-D-I. + + -- Sebastian Ramacher Wed, 04 Nov 2015 20:05:43 +0100 + +libbluray (1:0.9.0-1) unstable; urgency=medium + + * New upstream release. + * debian/libbluray1.symbols: Add new symbols. + + -- Sebastian Ramacher Sun, 04 Oct 2015 17:39:07 +0200 + +libbluray (1:0.8.1-1) unstable; urgency=medium + + * New upstream release. + * debian/patches/05_bd_open-return-NULL-if-disc-root-is-NULL.patch: Removed, + included upstream. + + -- Sebastian Ramacher Sat, 23 May 2015 16:58:44 +0200 + +libbluray (1:0.8.0-2) unstable; urgency=medium + + * debian/patches/05_bd_open-return-NULL-if-disc-root-is-NULL.patch: Fix + crash when accessing empty discs. (Closes: #785159) + + -- Sebastian Ramacher Wed, 13 May 2015 23:14:05 +0200 + +libbluray (1:0.8.0-1) unstable; urgency=medium + + * New upstream release. + * debian/patches: Refresh patches. + * debian/libbluray1.symbols: Add new symbols. + * debian/copyright: Add copyright information for libudfread. + * debian/rules: Build with --enable-udf. + + -- Sebastian Ramacher Sun, 03 May 2015 01:39:41 +0200 + +libbluray (1:0.7.0-2) unstable; urgency=medium + + * Upload to unstable. + + -- Sebastian Ramacher Sat, 25 Apr 2015 10:48:28 +0200 + +libbluray (1:0.7.0-1) experimental; urgency=medium + + * New upstream release. + * debian/patches: Refresh patches. + * debian/control: + - Add libfontconfig-dev to Build-Depends. + - Bump Standards-Version. + * debian/libbluray1.symbols: Add new symbols. + * debian/copyright: Update copyright years. + + -- Sebastian Ramacher Wed, 28 Jan 2015 01:48:57 +0100 + +libbluray (1:0.6.2-1) unstable; urgency=medium + + * New upstream release. + * debian/control: Add graphviz to Build-Depends-Indep for doxygen + documentation. + * debian/patches: Refreshed. + + -- Sebastian Ramacher Thu, 04 Sep 2014 19:11:51 +0200 + +libbluray (1:0.6.1-2) unstable; urgency=medium + + * debian/patches/03_split-jar-build-for-arch-all.patch: Don't fail if ant is + not there and we don't build the jar. + * debian/rules: Build with --disable-silent-rules. + + -- Sebastian Ramacher Mon, 04 Aug 2014 21:28:27 +0200 + +libbluray (1:0.6.1-1) unstable; urgency=medium + + * New upstream release. + * debian/copyright: Remove Files-Excluded again. Upstream no longer includes + the files we had to remove. + * debian/patches/04_kfreebsd-include.patch: Refreshed. + + -- Sebastian Ramacher Mon, 04 Aug 2014 19:13:20 +0200 + +libbluray (1:0.6.0+dfsg-2) unstable; urgency=medium + + * debian/patches/04_kfreebsd-include.patch: Add a workaround for #751532. + (Closes: #751433). + + -- Sebastian Ramacher Sat, 28 Jun 2014 02:27:46 +0200 + +libbluray (1:0.6.0+dfsg-1) unstable; urgency=medium + + [ Sebastian Ramacher ] + * debian/control: Remove Andres Meja from Uploaders. Andres is MIA according + to the MIA team. Thank you for maintaining libbluray, Andres! (Closes: + #743571) + * debian/watch: Mangle Debian version. + * debian/copyright: + - Add myself. + - Update copyright years. + - Document excluded files. + - Add license information for JNI headers. + + [ Rico Tzschichholz ] + * New upstream release (0.6.0) + - Improved BD-J support (Most BD-J discs are correctly played). + - Mark BD-J titles supported in BLURAY_DISC_INFO if BD-J is functional. + - Install .jar files to datadir (/usr/share/java/) instead of libdir. + (LP: #1302319) + - Added version number to .jar file names. + - Added JNI headers for BD-J (cross) compilation. + - Added HDMV/BD-J title information to BLURAY_DISC_INFO. + - Added disc application info to BLURAY_DISC_INFO. + - Added bd_set_rate(). + - Added color keys (RED, GREEN, YELLOW, BLUE). + - Improved error resilence. + - Fix build without libxml. + - Fix build failures with OpenJDK 8. (Closes: #746729) + * Repacked tarball to drop prebuilt binaries + * Upstream installs libbluray-.jar properly now + * Update symbols file + + -- Sebastian Ramacher Thu, 12 Jun 2014 14:34:26 +0200 + +libbluray (1:0.5.0-2) unstable; urgency=medium + + * Build JAR file only if we're building Architecture: all packages. + - debian/patches/03_split-jar-build-for-arch-all.patch: Add option to + selectively build JAR file. + - debian/rules: + + Only build JAR file if we are building libbluray-bdj. + + Build with BD-J support on all architectures. + - debian/control: Move ant to Build-Depends-Indep. + * debian/libbluray-doc.examples: Provide example source. + + -- Sebastian Ramacher Sun, 09 Feb 2014 22:11:25 +0100 libbluray (1:0.5.0-1) unstable; urgency=low diff -Nru libbluray-0.8.1/debian/compat libbluray-1.0.1/debian/compat --- libbluray-0.8.1/debian/compat 2015-09-02 08:11:04.000000000 +0000 +++ libbluray-1.0.1/debian/compat 2017-06-23 13:35:16.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru libbluray-0.8.1/debian/control libbluray-1.0.1/debian/control --- libbluray-0.8.1/debian/control 2015-09-02 11:11:06.000000000 +0000 +++ libbluray-1.0.1/debian/control 2017-06-23 14:06:53.000000000 +0000 @@ -1,39 +1,36 @@ Source: libbluray Section: libs Priority: optional -Maintainer: Debian Multimedia Maintainers -Uploaders: Andres Mejia , - Rico Tzschichholz , - Reinhard Tartler , - Alessio Treglia , - Sebastian Ramacher +Maintainer: wsnipex Build-Depends: debhelper (>= 9), - dh-autoreconf, + autoconf, + automake, + libtool, pkg-config, - javahelper [linux-any], - default-jdk [linux-any], - ant [linux-any], - libfontconfig1-dev, + default-jdk, libfreetype6-dev, - libxml2-dev -Build-Depends-Indep: doxygen, - texlive-latex-base, - texlive-latex-recommended, - texlive-latex-extra, - latex-xcolor, - texlive-fonts-recommended, -Standards-Version: 3.9.5 + libfontconfig-dev, + libxml2-dev, + ant, + doxygen, + graphviz, + javahelper, + texlive-latex-base, + texlive-latex-recommended, + texlive-latex-extra, + latex-xcolor, + texlive-fonts-recommended, +Standards-Version: 3.9.8 Homepage: http://www.videolan.org/developers/libbluray.html -Vcs-Git: git://anonscm.debian.org/pkg-multimedia/libbluray.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/libbluray.git +Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/libbluray.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/libbluray.git Package: libbluray-dev Multi-Arch: same Architecture: any Section: libdevel -Depends: libbluray1 (= ${binary:Version}), +Depends: libbluray2 (= ${binary:Version}), ${misc:Depends} -Suggests: libbluray-bdj Description: Blu-ray disc playback support library (development files) libbluray is an open-source library designed for Blu-Ray Discs playback for media players, like VLC or MPlayer. This research project is developed by an @@ -45,7 +42,7 @@ . This package provides the necessary files needed for development. -Package: libbluray1 +Package: libbluray2 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -63,29 +60,11 @@ . This package provides the shared library. -Package: libbluray1-dbg -Section: debug -Priority: extra -Architecture: any -Depends: libbluray1 (= ${binary:Version}), - ${misc:Depends} -Multi-Arch: same -Description: Blu-ray disc playback support library (debug symbols) - libbluray is an open-source library designed for Blu-Ray Discs playback for - media players, like VLC or MPlayer. This research project is developed by an - international team of developers from Doom9. libbluray integrates navigation, - playlist parsing, menus, and BD-J. - . - NB: Most commercial Blu-Ray are restricted by AACS or BD+ technologies and this - library is not enough to playback those discs. - . - This package provides debug symbols for the shared library. - Package: libbluray-bdj Multi-Arch: foreign Architecture: all -Depends: libbluray1 (>= ${source:Version}), - libbluray1 (<< ${source:Version}.1~), +Depends: libbluray2 (>= ${source:Version}), + libbluray2 (<< ${source:Version}.1~), default-jre-headless | java2-runtime-headless, ${java:Depends}, ${misc:Depends} @@ -107,7 +86,7 @@ Package: libbluray-bin Architecture: any Section: utils -Depends: libbluray1 (= ${binary:Version}), +Depends: libbluray2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Blu-ray disc playback support library (tools) @@ -123,8 +102,9 @@ Package: libbluray-doc Section: doc +Multi-Arch: foreign Architecture: all -Depends: libjs-jquery, ${misc:Depends} +Depends: ${misc:Depends} Description: Blu-ray disc playback support library (documentation) libbluray is an open-source library designed for Blu-Ray Discs playback for media players, like VLC or MPlayer. This research project is developed by an diff -Nru libbluray-0.8.1/debian/copyright libbluray-1.0.1/debian/copyright --- libbluray-0.8.1/debian/copyright 2015-09-02 08:11:04.000000000 +0000 +++ libbluray-1.0.1/debian/copyright 2017-06-23 13:35:16.000000000 +0000 @@ -3,46 +3,80 @@ Source: http://git.videolan.org/?p=libbluray.git Files: * -Copyright: - 2009-2010, hpi1 - 2010, fraxinas - 2009-2010, John Stebbins - 2010, Joakim - 2009-2010, Obliter0n - 2010, William Hahne - 2003,2011-2013, the VideoLAN team - 2010-2013, Petri Hintukainen - 2012, Konstantin Pavlov -License: LGPL-2.1 +Copyright: 2009-2010, hpi1 + 2010, fraxinas + 2009-2010, John Stebbins + 2010, Joakim + 2009-2010, Obliter0n + 2010, William Hahne + 2003,2011-2014, the VideoLAN team + 2010-2017, Petri Hintukainen + 2012, Konstantin Pavlov +License: LGPL-2.1+ + +Files: contrib/libudfread/src/* +Copyright: 2014-2017, VLC authors and VideoLAN +License: LGPL-2.1+ + +Files: doxygen-include.am + m4/ax_prog_doxygen.m4 +Copyright: 2009, Oren Ben-Kiki +License: custom + Copying and distribution of this file, with or without modification, are + permitted in any medium without royalty provided the copyright notice + and this notice are preserved. + +Files: m4/attributes.m4 + m4/pkg.m4 + player_wrappers/* +Copyright: 2006-2007, Diego Pettenò + 2000-2007, xine project + 2009-2013, Petri Hintukainen + 2004, Scott James Remnant +License: GPL-2+ + +Files: contrib/asm/* +Copyright: 2000-2011 INRIA, France Telecom +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + THE POSSIBILITY OF SUCH DAMAGE. + +Files: jni/* +Copyright: 1993-1996 Netscape Communications Corporation and Sun Microsystems, Inc. +License: MPL-1.0 or GPL-2+ or LGPL-2.1+ -Files: src/examples/bdj_test.c +Files: src/devtools/bdj_test.c Copyright: 2010, William Hahne License: GPL-2+ Files: debian/* -Copyright: - 2010-2011 Andres Mejia - 2011, Rico Tzschichholz - 2013 Alessio Treglia +Copyright: 2010-2011, Andres Mejia + 2011, Rico Tzschichholz + 2013, Alessio Treglia + 2014-2017, Sebastian Ramacher License: LGPL-2.1+ -License: LGPL-2.1 - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation, - version 2.1 of the License. - . - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. -Comment: You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . - . - On Debian systems, the full text of the GNU Lesser General Public - License version 2.1 can be found in the file - '/usr/share/common-licenses/LGPL-2.1'. - License: LGPL-2.1+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -53,8 +87,6 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. -Comment: You should have received a copy of the GNU Lesser General Public - License along with this program. If not, see . . On Debian systems, the full text of the GNU Lesser General Public License version 2.1 can be found in the file '/usr/share/common-licenses/LGPL-2.1'. @@ -84,3 +116,322 @@ . On Debian systems, the full text of the GNU General Public License version 2 can be found in the file '/usr/share/common-licenses/GPL-2'. + +License: MPL-1.0 + Mozilla Public License Version 1.0 + . + 1. Definitions. + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the + Modifications made by that particular Contributor. + 1.3. "Covered Code" means the Original Code or Modifications or + the combination of the Original Code and Modifications, in each + case including portions thereof. + 1.4. "Electronic Distribution Mechanism" means a mechanism + generally accepted in the software development community for the + electronic transfer of data. + 1.5. "Executable" means Covered Code in any form other than Source + Code. + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by + Exhibit A. + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this + License. + 1.8. "License" means this document. + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, + a Modification is: + . + A. Any addition to or deletion from the contents of a file containing + Original Code or previous Modifications. + B. Any new file that contains any part of the Original Code or + previous Modifications. + . + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + . + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or a list of source + code differential comparisons against either the Original Code or + another well known, available Covered Code of the Contributor's + choice. The Source Code can be in a compressed or archival form, + provided the appropriate decompression or de-archiving software is + widely available for no charge. + . + 1.12. "You" means an individual or a legal entity exercising rights + under, and complying with all of the terms of, this License or a + future version of this License issued under Section 6.1. For legal + entities, "You" includes any entity which controls, is controlled by, + or is under common control with You. For purposes of this definition, + "control" means (a) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (b) ownership of fifty percent (50%) or more of the + outstanding shares or beneficial ownership of such entity. + 2. Source Code License. + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, + royalty-free, non-exclusive license, subject to third party + intellectual property claims: + . + (a) to use, reproduce, modify, display, perform, sublicense and + distribute the Original Code (or portions thereof) with or without + Modifications, or as part of a Larger Work; and + (b) under patents now or hereafter owned or controlled by Initial + Developer, to make, have made, use and sell ("Utilize") the + Original Code (or portions thereof), but solely to the extent that + any such patent is reasonably necessary to enable You to Utilize + the Original Code (or portions thereof) and not to any greater + extent that may be necessary to Utilize further Modifications or + combinations. + . + 2.2. Contributor Grant. + Each Contributor hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) to use, reproduce, modify, display, perform, sublicense and + distribute the Modifications created by such Contributor (or + portions thereof) either on an unmodified basis, with other + Modifications, as Covered Code or as part of a Larger Work; and + (b) under patents now or hereafter owned or controlled by + Contributor, to Utilize the Contributor Version (or portions + thereof), but solely to the extent that any such patent is + reasonably necessary to enable You to Utilize the Contributor + Version (or portions thereof), and not to any greater extent that + may be necessary to Utilize further Modifications or combinations. + . + 3. Distribution Obligations. + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without + limitation Section 2.2. The Source Code version of Covered Code + may be distributed only under the terms of this License or a + future version of this License released under Section 6.1, and You + must include a copy of this License with every copy of the Source + Code You distribute. You may not offer or impose any terms on any + Source Code version that alters or restricts the applicable + version of this License or the recipients' rights hereunder. + However, You may include an additional document offering the + additional rights described in Section 3.5. + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must + be made available in Source Code form under the terms of this + License either on the same media as an Executable version or via + an accepted Electronic Distribution Mechanism to anyone to whom + you made an Executable version available; and if made available + via Electronic Distribution Mechanism, must remain available for + at least twelve (12) months after the date it initially became + available, or at least six (6) months after a subsequent version + of that particular Modification has been made available to such + recipients. You are responsible for ensuring that the Source Code + version remains available even if the Electronic Distribution + Mechanism is maintained by a third party. + 3.3. Description of Modifications. + You must cause all Covered Code to which you contribute to contain + a file documenting the changes You made to create that Covered + Code and the date of any change. You must include a prominent + statement that the Modification is derived, directly or + indirectly, from Original Code provided by the Initial Developer + and including the name of the Initial Developer in (a) the Source + Code, and (b) in any notice in an Executable version or related + documentation in which You describe the origin or ownership of the + Covered Code. + 3.4. Intellectual Property Matters + . + (a) Third Party Claims. + If You have knowledge that a party claims an intellectual property + right in particular functionality or code (or its utilization + under this License), you must include a text file with the source + code distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If you obtain such knowledge after You make + Your Modification available as described in Section 3.2, You shall + promptly modify the LEGAL file in all copies You make available + thereafter and shall take other steps (such as notifying + appropriate mailing lists or newsgroups) reasonably calculated to + inform those who received the Covered Code that new knowledge has + been obtained. + (b) Contributor APIs. + If Your Modification is an application programming interface and + You own or control patents which are reasonably necessary to + implement that API, you must also include this information in the + LEGAL file. + . + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code, and this License in any documentation for the Source Code, where + You describe recipients' rights relating to Covered Code. If You + created one or more Modification(s), You may add your name as a + Contributor to the notice described in Exhibit A. If it is not + possible to put such notice in a particular Source Code file due to + its structure, then you must include such notice in a location (such + as a relevant directory file) where a user would be likely to look for + such a notice. You may choose to offer, and to charge a fee for, + warranty, support, indemnity or liability obligations to one or more + recipients of Covered Code. However, You may do so only on Your own + behalf, and not on behalf of the Initial Developer or any Contributor. + You must make it absolutely clear than any such warranty, support, + indemnity or liability obligation is offered by You alone, and You + hereby agree to indemnify the Initial Developer and every Contributor + for any liability incurred by the Initial Developer or such + Contributor as a result of warranty, support, indemnity or liability + terms You offer. + . + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code under a license of Your choice, which may contain terms different + from this License, provided that You are in compliance with the terms + of this License and that the license for the Executable version does + not attempt to limit or alter the recipient's rights in the Source + Code version from the rights set forth in this License. If You + distribute the Executable version under a different license You must + make it absolutely clear that any terms which differ from this License + are offered by You alone, not by the Initial Developer or any + Contributor. You hereby agree to indemnify the Initial Developer and + every Contributor for any liability incurred by the Initial Developer + or such Contributor as a result of any such terms You offer. + . + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + 4. Inability to Comply Due to Statute or Regulation. + If it is impossible for You to comply with any of the terms of + this License with respect to some or all of the Covered Code due + to statute or regulation then You must: (a) comply with the terms + of this License to the maximum extent possible; and (b) describe + the limitations and the code they affect. Such description must be + included in the LEGAL file described in Section 3.4 and must be + included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must + be sufficiently detailed for a recipient of ordinary skill to be + able to understand it. + . + 5. Application of this License. + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A, and to related Covered Code. + . + 6. Versions of the License. + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish + revised and/or new versions of the License from time to time. Each + version will be given a distinguishing version number. + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of + the License, You may always continue to use it under the terms of + that version. You may also choose to use such Covered Code under + the terms of any subsequent version of the License published by + Netscape. No one other than Netscape has the right to modify the + terms applicable to Covered Code created under this License. + 6.3. Derivative Works. + If you create or use a modified version of this License (which you + may only do in order to apply it to code which is not already + Covered Code governed by this License), you must (a) rename Your + license so that the phrases "Mozilla", "MOZILLAPL", "MOZPL", + "Netscape", "NPL" or any confusingly similar phrase do not appear + anywhere in your license and (b) otherwise make it clear that your + version of the license contains terms which differ from the + Mozilla Public License and Netscape Public License. (Filling in + the name of the Initial Developer, Original Code or Contributor in + the notice described in Exhibit A shall not of themselves be + deemed to be modifications of this License.) + . + 7. DISCLAIMER OF WARRANTY. + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, + INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS + FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR + NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE + OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE + DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY + OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, + REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN + ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS + AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + . + 8. TERMINATION. + This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to + cure such breach within 30 days of becoming aware of the breach. + All sublicenses to the Covered Code which are properly granted + shall survive any termination of this License. Provisions which, + by their nature, must remain in effect beyond the termination of + this License shall survive. + . + 9. LIMITATION OF LIABILITY. + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED + CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR + ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR + CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT + LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER + FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR + LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE + POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL + NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM + SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS + SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR + LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT + EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + . + 10. U.S. GOVERNMENT END USERS. + The Covered Code is a "commercial item," as that term is defined in 48 + C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as + such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent + with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 + (June 1995), all U.S. Government End Users acquire Covered Code + with only those rights set forth herein. + . + 11. MISCELLANEOUS. + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed + by California law provisions (except to the extent applicable law, + if any, provides otherwise), excluding its conflict-of-law + provisions. With respect to disputes in which at least one party + is a citizen of, or an entity chartered or registered to do + business in, the United States of America: (a) unless otherwise + agreed in writing, all disputes relating to this License + (excepting any dispute relating to intellectual property rights) + shall be subject to final and binding arbitration, with the losing + party paying all costs of arbitration; (b) any arbitration + relating to this Agreement shall be held in Santa Clara County, + California, under the auspices of JAMS/EndDispute; and (c) any + litigation relating to this Agreement shall be subject to the + jurisdiction of the Federal Courts of the Northern District of + California, with venue lying in Santa Clara County, California, + with the losing party responsible for costs, including without + limitation, court costs and reasonable attorneys fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly + excluded. Any law or regulation which provides that the language + of a contract shall be construed against the drafter shall not + apply to this License. + . + 12. RESPONSIBILITY FOR CLAIMS. + Except in cases where another Contributor has failed to comply with + Section 3.4, You are responsible for damages arising, directly or + indirectly, out of Your utilization of rights under this License, + based on the number of copies of Covered Code you made available, + the revenues you received from utilizing such rights, and other + relevant factors. You agree to work with affected parties to + distribute responsibility on an equitable basis. diff -Nru libbluray-0.8.1/debian/libbluray1.install libbluray-1.0.1/debian/libbluray1.install --- libbluray-0.8.1/debian/libbluray1.install 2015-09-02 08:11:04.000000000 +0000 +++ libbluray-1.0.1/debian/libbluray1.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libbluray.so.* diff -Nru libbluray-0.8.1/debian/libbluray1.symbols libbluray-1.0.1/debian/libbluray1.symbols --- libbluray-0.8.1/debian/libbluray1.symbols 2015-09-02 08:11:04.000000000 +0000 +++ libbluray-1.0.1/debian/libbluray1.symbols 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -libbluray.so.1 libbluray1 #MINVER# -* Build-Depends-Package: libbluray-dev - bd_chapter_pos@Base 1:0.2.2 - bd_close@Base 1:0.2.2 - bd_free_clpi@Base 1:0.2.2 - bd_free_title_info@Base 1:0.2.2 - bd_get_clpi@Base 1:0.2.2 - bd_get_current_angle@Base 1:0.2.2 - bd_get_current_chapter@Base 1:0.2.2 - bd_get_current_title@Base 1:0.2.2 - bd_get_debug_mask@Base 1:0.2.2 - bd_get_disc_info@Base 1:0.2.2 - bd_get_event@Base 1:0.2.2 - bd_get_main_title@Base 1:0.5.0 - bd_get_meta@Base 1:0.2.2 - bd_get_playlist_info@Base 1:0.2.2 - bd_get_sound_effect@Base 1:0.2.2 - bd_get_title_info@Base 1:0.2.2 - bd_get_title_size@Base 1:0.2.2 - bd_get_titles@Base 1:0.2.2 - bd_get_version@Base 1:0.2.2 - bd_gpr_read@Base 1:0.2.2 - bd_gpr_write@Base 1:0.2.2 - bd_menu_call@Base 1:0.2.2 - bd_mouse_select@Base 1:0.2.2 - bd_open@Base 1:0.2.2 - bd_play@Base 1:0.2.2 - bd_play_title@Base 1:0.2.2 - bd_psr_lock@Base 1:0.2.2 - bd_psr_read@Base 1:0.2.2 - bd_psr_register_cb@Base 1:0.2.2 - bd_psr_reset_backup_registers@Base 1:0.2.2 - bd_psr_restore_state@Base 1:0.2.2 - bd_psr_save_state@Base 1:0.2.2 - bd_psr_setting_write@Base 1:0.2.2 - bd_psr_unlock@Base 1:0.2.2 - bd_psr_unregister_cb@Base 1:0.2.2 - bd_psr_write@Base 1:0.2.2 - bd_read@Base 1:0.2.2 - bd_read_clpi@Base 1:0.4.0 - bd_read_ext@Base 1:0.2.2 - bd_read_skip_still@Base 1:0.2.2 - bd_refcnt_dec@Base 1:0.4.0 - bd_refcnt_inc@Base 1:0.4.0 - bd_register_argb_overlay_proc@Base 1:0.3.0 - bd_register_dir@Base 1:0.2.2 - bd_register_file@Base 1:0.2.2 - bd_register_overlay_proc@Base 1:0.2.2 - bd_seamless_angle_change@Base 1:0.2.2 - bd_seek@Base 1:0.2.2 - bd_seek_chapter@Base 1:0.2.2 - bd_seek_mark@Base 1:0.2.2 - bd_seek_playitem@Base 1:0.3.0 - bd_seek_time@Base 1:0.2.2 - bd_select_angle@Base 1:0.2.2 - bd_select_playlist@Base 1:0.2.2 - bd_select_stream@Base 1:0.4.0 - bd_select_title@Base 1:0.2.2 - bd_set_debug_handler@Base 1:0.2.2 - bd_set_debug_mask@Base 1:0.2.2 - bd_set_player_setting@Base 1:0.2.2 - bd_set_player_setting_str@Base 1:0.2.2 - bd_set_scr@Base 1:0.3.0 - bd_start_bdj@Base 1:0.2.2 - bd_stop_bdj@Base 1:0.2.2 - bd_tell@Base 1:0.2.2 - bd_tell_time@Base 1:0.2.2 - bd_user_input@Base 1:0.4.0 diff -Nru libbluray-0.8.1/debian/libbluray2.install libbluray-1.0.1/debian/libbluray2.install --- libbluray-0.8.1/debian/libbluray2.install 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/debian/libbluray2.install 2017-06-23 13:35:16.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/libbluray.so.* diff -Nru libbluray-0.8.1/debian/libbluray2.symbols libbluray-1.0.1/debian/libbluray2.symbols --- libbluray-0.8.1/debian/libbluray2.symbols 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/debian/libbluray2.symbols 2017-06-23 13:35:16.000000000 +0000 @@ -0,0 +1,75 @@ +libbluray.so.2 libbluray2 #MINVER# +* Build-Depends-Package: libbluray-dev + bd_chapter_pos@Base 1:0.2.2 + bd_close@Base 1:0.2.2 + bd_free_bdjo@Base 1:0.7.0 + bd_free_clpi@Base 1:0.2.2 + bd_free_mobj@Base 1:0.7.0 + bd_free_mpls@Base 1:0.6.0 + bd_free_title_info@Base 1:0.2.2 + bd_get_clpi@Base 1:0.2.2 + bd_get_current_angle@Base 1:0.2.2 + bd_get_current_chapter@Base 1:0.2.2 + bd_get_current_title@Base 1:0.2.2 + bd_get_debug_mask@Base 1:0.2.2 + bd_get_disc_info@Base 1:0.2.2 + bd_get_event@Base 1:0.2.2 + bd_get_main_title@Base 1:0.5.0 + bd_get_meta@Base 1:0.2.2 + bd_get_meta_file@Base 1:0.9.0 + bd_get_playlist_info@Base 1:0.2.2 + bd_get_sound_effect@Base 1:0.2.2 + bd_get_title_info@Base 1:0.2.2 + bd_get_title_size@Base 1:0.2.2 + bd_get_titles@Base 1:0.2.2 + bd_get_version@Base 1:0.2.2 + bd_gpr_read@Base 1:0.2.2 + bd_gpr_write@Base 1:0.2.2 + bd_init@Base 1:0.8.0 + bd_menu_call@Base 1:0.2.2 + bd_mouse_select@Base 1:0.2.2 + bd_open@Base 1:0.2.2 + bd_open_disc@Base 1:0.8.0 + bd_open_files@Base 1:0.9.3 + bd_open_stream@Base 1:0.8.0 + bd_play@Base 1:0.2.2 + bd_play_title@Base 1:0.2.2 + bd_psr_read@Base 1:0.2.2 + bd_psr_register_cb@Base 1:0.2.2 + bd_psr_unregister_cb@Base 1:0.2.2 + bd_psr_write@Base 1:0.2.2 + bd_read@Base 1:0.2.2 + bd_read_bdjo@Base 1:0.7.0 + bd_read_clpi@Base 1:0.4.0 + bd_read_ext@Base 1:0.2.2 + bd_read_file@Base 1:0.9.0 + bd_read_mobj@Base 1:0.7.0 + bd_read_mpls@Base 1:0.6.0 + bd_read_skip_still@Base 1:0.2.2 + bd_refcnt_dec@Base 1:0.4.0 + bd_refcnt_inc@Base 1:0.4.0 + bd_register_argb_overlay_proc@Base 1:0.3.0 + bd_register_dir@Base 1:0.2.2 + bd_register_file@Base 1:0.2.2 + bd_register_overlay_proc@Base 1:0.2.2 + bd_seamless_angle_change@Base 1:0.2.2 + bd_seek@Base 1:0.2.2 + bd_seek_chapter@Base 1:0.2.2 + bd_seek_mark@Base 1:0.2.2 + bd_seek_playitem@Base 1:0.3.0 + bd_seek_time@Base 1:0.2.2 + bd_select_angle@Base 1:0.2.2 + bd_select_playlist@Base 1:0.2.2 + bd_select_stream@Base 1:0.4.0 + bd_select_title@Base 1:0.2.2 + bd_set_debug_handler@Base 1:0.2.2 + bd_set_debug_mask@Base 1:0.2.2 + bd_set_player_setting@Base 1:0.2.2 + bd_set_player_setting_str@Base 1:0.2.2 + bd_set_rate@Base 1:1.0.0 + bd_set_scr@Base 1:0.3.0 + bd_start_bdj@Base 1:0.2.2 + bd_stop_bdj@Base 1:0.2.2 + bd_tell@Base 1:0.2.2 + bd_tell_time@Base 1:0.2.2 + bd_user_input@Base 1:0.4.0 diff -Nru libbluray-0.8.1/debian/libbluray-bdj.install libbluray-1.0.1/debian/libbluray-bdj.install --- libbluray-0.8.1/debian/libbluray-bdj.install 2015-09-02 09:29:55.000000000 +0000 +++ libbluray-1.0.1/debian/libbluray-bdj.install 2017-06-23 13:35:16.000000000 +0000 @@ -1 +1 @@ -usr/share/java/libbluray-j2se-*.jar +.libs/libbluray-*.jar usr/share/java diff -Nru libbluray-0.8.1/debian/libbluray-bdj.jlibs.dis libbluray-1.0.1/debian/libbluray-bdj.jlibs.dis --- libbluray-0.8.1/debian/libbluray-bdj.jlibs.dis 2015-09-02 10:46:41.000000000 +0000 +++ libbluray-1.0.1/debian/libbluray-bdj.jlibs.dis 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -.libs/libbluray-*.jar diff -Nru libbluray-0.8.1/debian/libbluray-bdj.links libbluray-1.0.1/debian/libbluray-bdj.links --- libbluray-0.8.1/debian/libbluray-bdj.links 2015-09-02 10:53:18.000000000 +0000 +++ libbluray-1.0.1/debian/libbluray-bdj.links 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/java/libbluray-j2se-0.8.1.jar usr/share/java/libbluray.jar diff -Nru libbluray-0.8.1/debian/libbluray-doc.examples libbluray-1.0.1/debian/libbluray-doc.examples --- libbluray-0.8.1/debian/libbluray-doc.examples 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/debian/libbluray-doc.examples 2017-06-23 13:35:16.000000000 +0000 @@ -0,0 +1 @@ +src/examples/*.c diff -Nru libbluray-0.8.1/debian/libbluray-doc.links libbluray-1.0.1/debian/libbluray-doc.links --- libbluray-0.8.1/debian/libbluray-doc.links 2015-09-02 08:11:04.000000000 +0000 +++ libbluray-1.0.1/debian/libbluray-doc.links 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/javascript/jquery/jquery.js usr/share/doc/libbluray-doc/html/jquery.js diff -Nru libbluray-0.8.1/debian/libbluray-doc.lintian-overrides libbluray-1.0.1/debian/libbluray-doc.lintian-overrides --- libbluray-0.8.1/debian/libbluray-doc.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/debian/libbluray-doc.lintian-overrides 2017-06-23 13:35:16.000000000 +0000 @@ -0,0 +1,2 @@ +# no, it isn't jquery +libbluray-doc: embedded-javascript-library usr/share/doc/libbluray-doc/html/jquery.js please use libjs-jquery diff -Nru libbluray-0.8.1/debian/patches/0003-Use-system-asm-instead-of-embedded-copy.patch libbluray-1.0.1/debian/patches/0003-Use-system-asm-instead-of-embedded-copy.patch --- libbluray-0.8.1/debian/patches/0003-Use-system-asm-instead-of-embedded-copy.patch 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/debian/patches/0003-Use-system-asm-instead-of-embedded-copy.patch 2017-06-23 13:35:16.000000000 +0000 @@ -0,0 +1,43 @@ +From: Sebastian Ramacher +Date: Wed, 14 Jun 2017 20:22:27 +0200 +Subject: Use system asm instead of embedded copy + +--- + src/libbluray/bdj/build.xml | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/src/libbluray/bdj/build.xml b/src/libbluray/bdj/build.xml +index 938cd44..1b5b0e6 100644 +--- a/src/libbluray/bdj/build.xml ++++ b/src/libbluray/bdj/build.xml +@@ -19,22 +19,23 @@ + + +- +- +- +- + + + ++ ++ ++ + + + +- ++ ++ ++ ++ ++ + + + -Forwarded: no - ---- - src/libbluray/bdj/build.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- libbluray.orig/src/libbluray/bdj/build.xml -+++ libbluray/src/libbluray/bdj/build.xml -@@ -19,7 +19,7 @@ - description="compile the source " > - -+ source="1.5" target="1.5" /> - - diff -Nru libbluray-0.8.1/debian/patches/02_online-image.patch libbluray-1.0.1/debian/patches/02_online-image.patch --- libbluray-0.8.1/debian/patches/02_online-image.patch 2015-09-02 08:11:04.000000000 +0000 +++ libbluray-1.0.1/debian/patches/02_online-image.patch 2017-06-23 13:35:16.000000000 +0000 @@ -1,7 +1,13 @@ -Description: Do not download image from the web. -Author: Sebastian Ramacher -Last-Update: 2014-02-09 +From: Sebastian Ramacher +Date: Wed, 14 Jun 2017 19:32:24 +0200 +Subject: Do not download image from the web. +--- + doc/doxygen-footer.html | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/doc/doxygen-footer.html b/doc/doxygen-footer.html +index b45f295..11cbc77 100644 --- a/doc/doxygen-footer.html +++ b/doc/doxygen-footer.html @@ -5,7 +5,6 @@ diff -Nru libbluray-0.8.1/debian/patches/04_kfreebsd-include.patch libbluray-1.0.1/debian/patches/04_kfreebsd-include.patch --- libbluray-0.8.1/debian/patches/04_kfreebsd-include.patch 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/debian/patches/04_kfreebsd-include.patch 2017-06-23 13:35:16.000000000 +0000 @@ -0,0 +1,22 @@ +From: Sebastian Ramacher +Date: Wed, 14 Jun 2017 19:32:24 +0200 +Subject: Work around #751532 + +Once #751532 is fixed, this patch should be removed again or adapted +accordingly. +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 98a5226..b080d35 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -206,6 +206,7 @@ case $host_os in + freebsd*) java_os=freebsd ;; + solaris*) java_os=solaris ;; + darwin*) java_os=darwin ;; ++ kfreebsd*) java_os=linux ;; + *) java_os=$host_os ;; + esac + diff -Nru libbluray-0.8.1/debian/patches/series libbluray-1.0.1/debian/patches/series --- libbluray-0.8.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/debian/patches/series 2017-06-23 13:35:16.000000000 +0000 @@ -0,0 +1,2 @@ +02_online-image.patch +04_kfreebsd-include.patch diff -Nru libbluray-0.8.1/debian/patches/series.dis libbluray-1.0.1/debian/patches/series.dis --- libbluray-0.8.1/debian/patches/series.dis 2015-09-02 08:11:04.000000000 +0000 +++ libbluray-1.0.1/debian/patches/series.dis 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -01_java-compat.patch -02_online-image.patch diff -Nru libbluray-0.8.1/debian/rules libbluray-1.0.1/debian/rules --- libbluray-0.8.1/debian/rules 2015-09-02 08:50:35.000000000 +0000 +++ libbluray-1.0.1/debian/rules 2017-06-23 13:57:42.000000000 +0000 @@ -1,53 +1,34 @@ #!/usr/bin/make -f -DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS) - -confflags := --with-libxml2 --with-freetype - -# enable bdjava on linux hosts only -ifneq (,$(findstring linux,$(DEB_BUILD_ARCH_OS))) +confflags = --with-libxml2 +confflags += --with-freetype +confflags += --with-bdj-type=j2se +confflags += --enable-bdjava-jar # Use default java implementation -JAVA_HOME=/usr/lib/jvm/default-java -ifeq (,$(wildcard $(JAVA_HOME))) - $(info "warning: No suitable jni.h was found. Package will most probably FTBFS!") +export JDK_HOME=/usr/lib/jvm/default-java +ifeq (,$(wildcard $(JDK_HOME))) + $(info "warning: No suitable jni.h was found. Package will most probably FTBFS!") endif -export JDK_HOME=$(JAVA_HOME) -$(info Located java at $(JAVA_HOME)) -confflags += --enable-bdjava --with-bdj-type=j2se +ifneq (,$(wildcard /usr/share/javahelper/java-vars.mk)) +DH_ADDONS = --with javahelper endif -# Set CFLAGS to DEB_CFLAGS -CFLAGS=$(shell dpkg-buildflags --get CFLAGS 2>/dev/null | sed -e 's/-O2//g') - -ifneq (,$(findstring linux,$(DEB_BUILD_ARCH_OS))) -%: - dh $@ --parallel --with javahelper,autoreconf -else %: - dh $@ --parallel --with autoreconf -endif + dh $@ $(DH_ADDONS) override_dh_auto_configure: + ./bootstrap dh_auto_configure -- $(confflags) override_dh_auto_build-indep: - make doxygen-doc - -override_dh_strip: - dh_strip -plibbluray1 --dbg-package=libbluray1-dbg - dh_strip + # all-local builds the JAR + $(MAKE) doxygen-doc all-local -override_dh_installdocs: - dh_installdocs --exclude=jquery.js - -#override_dh_install: -# dh_install -X.la -Xlibbluray-j2se-*.jar --fail-missing +# no test/install for indep +override_dh_auto_test-indep override_dh_auto_install-indep: override_dh_clean: dh_clean rm -rf src/libbluray/bdj/build - -get-orig-source: - $(dir $_)libbluray-get-orig-source diff -Nru libbluray-0.8.1/debian/watch libbluray-1.0.1/debian/watch --- libbluray-0.8.1/debian/watch 2015-09-02 08:11:04.000000000 +0000 +++ libbluray-1.0.1/debian/watch 2017-06-23 13:35:17.000000000 +0000 @@ -1,3 +1,4 @@ version=3 +opts=downloadurlmangle=s/^ftp/http/ \ http://www.videolan.org/developers/libbluray.html \ ftp://ftp.videolan.org/pub/videolan/libbluray/.*/libbluray-(.*)\.tar\.bz2 diff -Nru libbluray-0.8.1/doc/doxygen-footer.html libbluray-1.0.1/doc/doxygen-footer.html --- libbluray-0.8.1/doc/doxygen-footer.html 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/doc/doxygen-footer.html 2017-06-23 13:39:37.000000000 +0000 @@ -5,7 +5,6 @@ doxygen 1.7.1
Copyright © 2010 John Stebbins et al.
- Creative Commons License
This documentation is licensed and distributed under the Creative Commons Attribution-ShareAlike 3.0 Unported License.
diff -Nru libbluray-0.8.1/m4/libtool.m4 libbluray-1.0.1/m4/libtool.m4 --- libbluray-0.8.1/m4/libtool.m4 2015-09-02 11:11:16.000000000 +0000 +++ libbluray-1.0.1/m4/libtool.m4 2017-06-23 13:35:17.000000000 +0000 @@ -1,8 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -286,7 +296,7 @@ # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -421,8 +431,8 @@ # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# declaration there will have the same value as in 'configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], [$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) @@ -446,7 +456,7 @@ # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -474,7 +484,7 @@ # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -500,8 +510,8 @@ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -547,7 +557,7 @@ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -560,7 +570,7 @@ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +586,7 @@ # Generate a child script FILE with all initialization necessary to # reuse the environment learned by the parent script, and make the # file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this +# '#!' sequence but before initialization text begins. After this # macro, additional text can be appended to FILE to form the body of # the child script. The macro ends with non-zero status if the # file could not be fully written (such as if the disk is full). @@ -598,7 +608,7 @@ _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -621,7 +631,7 @@ } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -643,7 +653,7 @@ This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -656,10 +666,10 @@ lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -685,7 +695,7 @@ # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. lt_cl_success=: -test "$silent" = yes && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -705,27 +715,30 @@ _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# Generated automatically by $as_me ($PACKAGE) $VERSION # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -733,13 +746,24 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -756,8 +780,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -775,7 +797,6 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -974,7 +995,7 @@ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -992,7 +1013,7 @@ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1010,7 +1031,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1032,7 +1053,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1042,32 +1063,32 @@ ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1087,29 +1108,29 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1129,7 +1150,7 @@ # Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1147,7 +1168,7 @@ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1167,8 +1188,8 @@ # ----------------------- # Find how we can fake an echo command that does not interpret backslash. # In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1196,10 +1217,10 @@ # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1225,16 +1246,17 @@ AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], [], [with_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1244,14 +1266,14 @@ no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_RESULT([$with_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac AC_MSG_RESULT([${lt_sysroot:-no}]) _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1259,31 +1281,33 @@ [AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1312,9 +1336,46 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1333,10 +1394,10 @@ ;; esac ;; - powerpc64le-*) + powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" ;; - powerpc64-*) + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1355,10 +1416,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*) + powerpcle-*linux*) LD="${LD-ld} -m elf64lppc" ;; - powerpc-*) + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1376,19 +1437,20 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1396,7 +1458,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1405,7 +1467,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1421,7 +1483,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1440,11 +1502,11 @@ [echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1452,7 +1514,7 @@ ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1483,7 +1545,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1519,7 +1581,7 @@ [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1546,7 +1608,7 @@ $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1568,7 +1630,7 @@ m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1587,10 +1649,10 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1611,7 +1673,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1651,7 +1713,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1702,22 +1764,22 @@ *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1733,7 +1795,7 @@ ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1761,7 +1823,7 @@ # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1808,9 +1870,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1836,7 +1898,7 @@ return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1857,7 +1919,7 @@ # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1867,44 +1929,52 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1913,21 +1983,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1937,7 +2007,7 @@ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1947,9 +2017,9 @@ ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2041,8 +2111,8 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2052,8 +2122,8 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2080,8 +2150,8 @@ _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2093,15 +2163,15 @@ _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2115,12 +2185,12 @@ fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2144,7 +2214,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2162,6 +2232,47 @@ ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2172,17 +2283,18 @@ m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2198,28 +2310,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2233,7 +2352,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2242,7 +2361,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2259,14 +2378,17 @@ # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2274,41 +2396,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2318,18 +2490,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2337,8 +2509,8 @@ bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2350,7 +2522,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2359,8 +2531,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2376,17 +2548,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -2395,8 +2567,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2423,7 +2595,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2436,8 +2608,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2450,7 +2622,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2463,8 +2635,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2477,8 +2649,8 @@ version_type=linux # correct to gnu/linux during the next big refactor 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' + 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 ;; @@ -2496,12 +2668,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2531,10 +2704,10 @@ need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + 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=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2552,14 +2725,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2567,8 +2741,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2577,8 +2751,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2591,8 +2765,8 @@ version_type=linux # correct to gnu/linux during the next big refactor 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2603,7 +2777,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2611,8 +2785,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2631,8 +2805,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2641,13 +2815,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2672,7 +2866,12 @@ # before this can be enabled. hardcode_into_libs=yes - # Append ld.so.conf contents to the search path + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" @@ -2704,12 +2903,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2719,7 +2918,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2728,58 +2927,68 @@ version_type=qnx 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' + 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='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2790,8 +2999,8 @@ version_type=linux # correct to gnu/linux during the next big refactor 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' + 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=yes hardcode_into_libs=yes @@ -2801,11 +3010,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2813,8 +3022,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + 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 case $host_vendor in sni) @@ -2835,24 +3044,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2870,7 +3079,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2878,8 +3087,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + 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 ;; @@ -2888,20 +3097,30 @@ ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -2934,39 +3153,41 @@ [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -2989,11 +3210,11 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3011,7 +3232,7 @@ # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3038,16 +3259,16 @@ AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3061,7 +3282,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3072,37 +3293,37 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3188,13 +3446,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3221,8 +3479,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3318,8 +3575,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3372,6 +3629,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3412,33 +3672,38 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3449,21 +3714,21 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3471,8 +3736,8 @@ esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3518,8 +3783,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3531,7 +3796,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3558,13 +3823,28 @@ lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3576,11 +3856,11 @@ # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3599,7 +3879,7 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3651,7 +3931,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3684,14 +3964,44 @@ symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3709,21 +4019,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -3763,11 +4076,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3793,7 +4106,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3813,9 +4126,9 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3836,7 +4149,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3863,12 +4176,16 @@ [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3884,17 +4201,18 @@ m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3905,8 +4223,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -3922,6 +4240,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3971,7 +4294,7 @@ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4012,14 +4335,14 @@ case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4056,7 +4379,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4201,17 +4524,18 @@ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4222,8 +4546,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4240,6 +4564,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4310,7 +4639,7 @@ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4318,11 +4647,30 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4338,7 +4686,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4349,7 +4697,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4374,6 +4722,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4471,7 +4825,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4500,7 +4854,7 @@ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4566,17 +4920,21 @@ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4625,9 +4983,9 @@ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4643,7 +5001,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -4651,7 +5009,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; linux* | k*bsd*-gnu | gnu*) @@ -4664,7 +5022,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4686,24 +5044,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4716,7 +5074,7 @@ case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4735,7 +5093,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4751,7 +5109,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4761,7 +5119,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -4769,61 +5127,89 @@ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4834,42 +5220,47 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4883,8 +5274,8 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4902,8 +5293,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4915,7 +5306,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4930,9 +5321,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4949,15 +5340,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4973,7 +5364,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4981,34 +5372,57 @@ ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5027,13 +5441,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5052,62 +5474,80 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5116,7 +5556,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5146,16 +5586,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5164,18 +5605,18 @@ # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -5184,7 +5625,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5234,33 +5675,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5268,25 +5709,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5294,14 +5735,14 @@ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) _LT_LINKER_OPTION([if $CC understands -b], _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) ;; esac fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5312,7 +5753,7 @@ *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5323,16 +5764,16 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_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 -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_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 -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], @@ -5345,21 +5786,32 @@ end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; 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' + LDFLAGS=$save_LDFLAGS]) + 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' + _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' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + 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 @@ -5374,7 +5826,7 @@ newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5382,27 +5834,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5413,33 +5857,53 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_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 -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_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 -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $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_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -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)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5450,24 +5914,24 @@ solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5477,11 +5941,11 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5491,10 +5955,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5543,43 +6007,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -5594,17 +6058,17 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5621,7 +6085,7 @@ # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5701,12 +6165,12 @@ _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5747,10 +6211,10 @@ # ------------------------ # Ensure that the configuration variables for a C compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5790,18 +6254,18 @@ LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5809,8 +6273,12 @@ ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5818,13 +6286,13 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5832,14 +6300,14 @@ # -------------------------- # Ensure that the configuration variables for a C++ compiler are suitably # defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5881,7 +6349,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5923,35 +6391,35 @@ if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5987,18 +6455,30 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -6008,6 +6488,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6026,13 +6513,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6050,64 +6545,84 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' fi _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds its shared - # libraries. - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6117,7 +6632,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6145,57 +6660,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6206,6 +6722,34 @@ _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -6241,14 +6785,14 @@ ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; hpux9*) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6260,7 +6804,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6269,11 +6813,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6283,15 +6827,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6317,13 +6861,13 @@ aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6334,20 +6878,20 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6362,22 +6906,22 @@ interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6386,17 +6930,17 @@ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $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 -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $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 -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; @@ -6409,8 +6953,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6419,10 +6963,10 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6436,59 +6980,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ - $RANLIB $oldlib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ - rm -rf $tpldir~ - $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 6 and above use weak symbols - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6502,18 +7046,18 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' ;; xl* | mpixl* | bgxl*) # IBM XL 8.0 on PPC, with GNU ld - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -6521,10 +7065,10 @@ *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -6582,22 +7126,17 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6613,9 +7152,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6633,17 +7172,17 @@ cxx*) case $host in osf3*) - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -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)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ - echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ - $RM $lib.exp' + echo "-hidden">> $lib.exp~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -6658,21 +7197,21 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $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 -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $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 -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -6718,9 +7257,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6728,7 +7267,7 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -6745,30 +7284,30 @@ ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6776,11 +7315,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6789,52 +7328,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in CC*) - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" + '"$_LT_TAGVAR(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -6865,10 +7404,10 @@ esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6895,7 +7434,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6917,13 +7456,14 @@ AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -7007,13 +7547,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7029,16 +7569,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -7046,9 +7586,9 @@ esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7063,15 +7603,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7102,51 +7642,6 @@ _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -7155,7 +7650,7 @@ esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7175,10 +7670,10 @@ # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_F77_CONFIG], [AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7215,7 +7710,7 @@ # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7237,7 +7732,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7251,21 +7746,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7273,11 +7772,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7294,9 +7793,9 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7306,11 +7805,11 @@ # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_FC_CONFIG], [AC_LANG_PUSH(Fortran) -if test -z "$FC" || test "X$FC" = "Xno"; then +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7347,7 +7846,7 @@ # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7369,7 +7868,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7385,21 +7884,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7407,11 +7910,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7431,7 +7934,7 @@ GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7441,7 +7944,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7475,7 +7978,7 @@ CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7512,7 +8015,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7546,7 +8049,7 @@ CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7583,7 +8086,7 @@ # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7599,7 +8102,7 @@ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7609,7 +8112,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7638,7 +8141,7 @@ [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7749,7 +8252,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7766,9 +8269,9 @@ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7792,27 +8295,7 @@ # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7836,102 +8319,9 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], diff -Nru libbluray-0.8.1/m4/lt~obsolete.m4 libbluray-1.0.1/m4/lt~obsolete.m4 --- libbluray-0.8.1/m4/lt~obsolete.m4 2015-09-02 11:11:16.000000000 +0000 +++ libbluray-1.0.1/m4/lt~obsolete.m4 2017-06-23 13:35:17.000000000 +0000 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff -Nru libbluray-0.8.1/m4/ltoptions.m4 libbluray-1.0.1/m4/ltoptions.m4 --- libbluray-0.8.1/m4/ltoptions.m4 2015-09-02 11:11:16.000000000 +0000 +++ libbluray-1.0.1/m4/ltoptions.m4 2017-06-23 13:35:17.000000000 +0000 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: diff -Nru libbluray-0.8.1/m4/ltsugar.m4 libbluray-1.0.1/m4/ltsugar.m4 --- libbluray-0.8.1/m4/ltsugar.m4 2015-09-02 11:11:16.000000000 +0000 +++ libbluray-1.0.1/m4/ltsugar.m4 2017-06-23 13:35:17.000000000 +0000 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff -Nru libbluray-0.8.1/m4/ltversion.m4 libbluray-1.0.1/m4/ltversion.m4 --- libbluray-0.8.1/m4/ltversion.m4 2015-09-02 11:11:16.000000000 +0000 +++ libbluray-1.0.1/m4/ltversion.m4 2017-06-23 13:35:17.000000000 +0000 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru libbluray-0.8.1/Makefile.am libbluray-1.0.1/Makefile.am --- libbluray-0.8.1/Makefile.am 2015-03-20 10:50:37.000000000 +0000 +++ libbluray-1.0.1/Makefile.am 2017-06-23 13:35:16.000000000 +0000 @@ -1,20 +1,10 @@ include $(top_srcdir)/doxygen-include.am ACLOCAL_AMFLAGS = -I m4 -DISTCHECK_CONFIGURE_FLAGS = --enable-bdjava --enable-udf MOSTLYCLEANFILES = $(DX_CLEANFILES) -if ENABLE_UDF POSIX_C_SOURCE=200809L -else -POSIX_C_SOURCE=200112L -endif - -SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) -D_REENTRANT -SET_INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/libbluray -I$(top_builddir)/src/libbluray $(BDJAVA_CFLAGS) - -AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(UDF_CFLAGS) EXTRA_DIST = \ bootstrap \ @@ -26,9 +16,29 @@ src/libbluray/bdj/build.xml \ src/libbluray/bdj/java \ src/libbluray/bdj/java-j2me \ - src/libbluray/bdj/java-j2se + src/libbluray/bdj/java-j2se \ + contrib/asm + +AM_CFLAGS = \ + -std=c99 + +AM_CPPFLAGS = \ + -D_ISOC99_SOURCE \ + -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) \ + -D_REENTRANT \ + \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/libbluray lib_LTLIBRARIES=libbluray.la +libbluray_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_builddir)/src/libbluray \ + $(BDJAVA_CFLAGS) \ + -I${top_srcdir}/contrib/libudfread/src/ \ + $(LIBXML2_CFLAGS) \ + $(FT2_CFLAGS) \ + $(FONTCONFIG_CFLAGS) libbluray_la_SOURCES = \ src/file/dirs.h \ src/file/dl.h \ @@ -58,11 +68,14 @@ src/libbluray/bdnav/meta_parse.h \ src/libbluray/bdnav/meta_parse.c \ src/libbluray/bdnav/mpls_parse.h \ + src/libbluray/bdnav/mpls_data.h \ src/libbluray/bdnav/mpls_parse.c \ src/libbluray/bdnav/navigation.h \ src/libbluray/bdnav/navigation.c \ src/libbluray/bdnav/sound_parse.h \ src/libbluray/bdnav/sound_parse.c \ + src/libbluray/bdnav/uo_mask.h \ + src/libbluray/bdnav/uo_mask.c \ src/libbluray/bdnav/uo_mask_table.h \ src/libbluray/decoders/graphics_controller.h \ src/libbluray/decoders/graphics_controller.c \ @@ -98,6 +111,8 @@ src/libbluray/disc/disc.h \ src/libbluray/disc/disc.c \ src/libbluray/disc/enc_info.h \ + src/libbluray/disc/properties.h \ + src/libbluray/disc/properties.c \ src/libbluray/hdmv/hdmv_insn.h \ src/libbluray/hdmv/hdmv_vm.h \ src/libbluray/hdmv/hdmv_vm.c \ @@ -111,6 +126,8 @@ src/util/attributes.h \ src/util/bits.h \ src/util/bits.c \ + src/util/event_queue.h \ + src/util/event_queue.c \ src/util/logging.h \ src/util/logging.c \ src/util/log_control.h \ @@ -124,6 +141,41 @@ src/util/time.h \ src/util/time.c +# bd-j +libbluray_la_SOURCES += \ + src/libbluray/bdj/bdj.h \ + src/libbluray/bdj/bdj.c \ + src/libbluray/bdj/bdjo_data.h \ + src/libbluray/bdj/bdjo_parse.h \ + src/libbluray/bdj/bdjo_parse.c \ + src/libbluray/bdj/native/bdjo.h \ + src/libbluray/bdj/native/bdjo.c \ + src/libbluray/bdj/native/java_awt_BDFontMetrics.h \ + src/libbluray/bdj/native/java_awt_BDFontMetrics.c \ + src/libbluray/bdj/native/java_awt_BDGraphics.h \ + src/libbluray/bdj/native/java_awt_BDGraphics.c \ + src/libbluray/bdj/native/org_videolan_Libbluray.h \ + src/libbluray/bdj/native/org_videolan_Libbluray.c \ + src/libbluray/bdj/native/org_videolan_Logger.h \ + src/libbluray/bdj/native/org_videolan_Logger.c \ + src/libbluray/bdj/native/register_native.h \ + src/libbluray/bdj/native/register_native.c \ + src/libbluray/bdj/native/util.h \ + src/libbluray/bdj/native/util.c + +# libudfread +libbluray_la_SOURCES += \ + src/libbluray/disc/udf_fs.h \ + src/libbluray/disc/udf_fs.c\ + \ + contrib/libudfread/src/blockinput.h \ + contrib/libudfread/src/default_blockinput.h \ + contrib/libudfread/src/default_blockinput.c \ + contrib/libudfread/src/ecma167.h \ + contrib/libudfread/src/ecma167.c \ + contrib/libudfread/src/udfread.h \ + contrib/libudfread/src/udfread.c + if HAVE_DARWIN libbluray_la_SOURCES+= \ src/file/dir_posix.c \ @@ -149,7 +201,7 @@ endif endif -libbluray_la_LDFLAGS= -version-info $(LT_VERSION_INFO) -export-symbols-regex "^bd_" +libbluray_la_LDFLAGS= -no-undefined -version-info $(LT_VERSION_INFO) -export-symbols-regex "^bd_" libbluray_la_LIBADD= $(LIBXML2_LIBS) $(FT2_LIBS) $(FONTCONFIG_LIBS) noinst_HEADERS = \ @@ -169,50 +221,13 @@ src/libbluray/decoders/overlay.h \ src/util/log_control.h -if ENABLE_UDF -libbluray_la_SOURCES += \ - src/libbluray/disc/udf_fs.h \ - src/libbluray/disc/udf_fs.c\ - \ - contrib/libudfread/src/blockinput.h \ - contrib/libudfread/src/default_blockinput.h \ - contrib/libudfread/src/default_blockinput.c \ - contrib/libudfread/src/ecma167.h \ - contrib/libudfread/src/ecma167.c \ - contrib/libudfread/src/udfread.h \ - contrib/libudfread/src/udfread.c -endif - -if USING_BDJAVA +if USING_BDJAVA_BUILD_JAR jardir=$(datadir)/java/ jar_DATA=$(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar: all-local -libbluray_la_SOURCES += \ - src/libbluray/bdj/bdj.h \ - src/libbluray/bdj/bdj.c \ - src/libbluray/bdj/bdjo_data.h \ - src/libbluray/bdj/bdjo_parse.h \ - src/libbluray/bdj/bdjo_parse.c \ - src/libbluray/bdj/native/bdjo.h \ - src/libbluray/bdj/native/bdjo.c \ - src/libbluray/bdj/native/java_awt_BDFontMetrics.h \ - src/libbluray/bdj/native/java_awt_BDFontMetrics.c \ - src/libbluray/bdj/native/java_awt_BDGraphics.h \ - src/libbluray/bdj/native/java_awt_BDGraphics.c \ - src/libbluray/bdj/native/org_videolan_Libbluray.h \ - src/libbluray/bdj/native/org_videolan_Libbluray.c \ - src/libbluray/bdj/native/org_videolan_Logger.h \ - src/libbluray/bdj/native/org_videolan_Logger.c \ - src/libbluray/bdj/native/register_native.h \ - src/libbluray/bdj/native/register_native.c \ - src/libbluray/bdj/native/util.h \ - src/libbluray/bdj/native/util.c - -AM_CFLAGS += $(BDJAVA_CFLAGS) - all-local: ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \ -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \ @@ -240,6 +255,7 @@ if USING_EXAMPLES noinst_PROGRAMS = \ + bdj_test \ bdjo_dump \ bdsplice \ clpi_dump \ @@ -251,11 +267,6 @@ mpls_dump \ sound_dump -if USING_BDJAVA -noinst_PROGRAMS += \ - bdj_test -endif - bin_PROGRAMS = \ bd_info @@ -265,20 +276,20 @@ bdsplice_SOURCES = src/examples/bdsplice.c bdsplice_LDADD = libbluray.la -bdj_test_SOURCES = src/examples/bdj_test.c +bdj_test_SOURCES = src/devtools/bdj_test.c bdj_test_LDADD = libbluray.la -bdjo_dump_SOURCES = src/examples/bdjo_dump.c +bdjo_dump_SOURCES = src/devtools/bdjo_dump.c bdjo_dump_LDADD = libbluray.la clpi_dump_CFLAGS = $(AM_CFLAGS) clpi_dump_SOURCES = \ - src/examples/clpi_dump.c \ - src/examples/util.c \ - src/examples/util.h + src/devtools/clpi_dump.c \ + src/devtools/util.c \ + src/devtools/util.h clpi_dump_LDADD = libbluray.la -hdmv_test_SOURCES = src/examples/hdmv_test.c +hdmv_test_SOURCES = src/devtools/hdmv_test.c hdmv_test_LDADD = libbluray.la index_dump_SOURCES = src/examples/index_dump.c @@ -291,15 +302,15 @@ list_titles_LDADD = libbluray.la mobj_dump_CFLAGS = $(AM_CFLAGS) -mobj_dump_SOURCES = src/examples/mobj_dump.c \ +mobj_dump_SOURCES = src/devtools/mobj_dump.c \ src/libbluray/hdmv/mobj_print.c mobj_dump_LDADD = libbluray.la mpls_dump_CFLAGS = $(AM_CFLAGS) mpls_dump_SOURCES = \ - src/examples/mpls_dump.c \ - src/examples/util.c \ - src/examples/util.h + src/devtools/mpls_dump.c \ + src/devtools/util.c \ + src/devtools/util.h mpls_dump_LDADD = libbluray.la sound_dump_SOURCES = src/examples/sound_dump.c diff -Nru libbluray-0.8.1/Makefile.in libbluray-1.0.1/Makefile.in --- libbluray-0.8.1/Makefile.in 2015-09-02 11:11:20.000000000 +0000 +++ libbluray-1.0.1/Makefile.in 2017-06-23 13:35:15.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -60,7 +60,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -123,21 +133,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/doxygen-include.am $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/config.h.in \ - $(top_srcdir)/src/libbluray.pc.in \ - $(top_srcdir)/src/libbluray/bluray-version.h.in \ - $(top_srcdir)/build-aux/depcomp $(noinst_HEADERS) \ - $(pkginclude_HEADERS) COPYING ChangeLog build-aux/compile \ - build-aux/config.guess build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/missing build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/compile \ - $(top_srcdir)/build-aux/config.guess \ - $(top_srcdir)/build-aux/config.sub \ - $(top_srcdir)/build-aux/install-sh \ - $(top_srcdir)/build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/missing @HAVE_DARWIN_TRUE@am__append_1 = \ @HAVE_DARWIN_TRUE@ src/file/dir_posix.c \ @HAVE_DARWIN_TRUE@ src/file/dirs_darwin.c \ @@ -159,50 +154,13 @@ @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/file_posix.c \ @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/mount.c -@ENABLE_UDF_TRUE@am__append_4 = \ -@ENABLE_UDF_TRUE@ src/libbluray/disc/udf_fs.h \ -@ENABLE_UDF_TRUE@ src/libbluray/disc/udf_fs.c\ -@ENABLE_UDF_TRUE@ \ -@ENABLE_UDF_TRUE@ contrib/libudfread/src/blockinput.h \ -@ENABLE_UDF_TRUE@ contrib/libudfread/src/default_blockinput.h \ -@ENABLE_UDF_TRUE@ contrib/libudfread/src/default_blockinput.c \ -@ENABLE_UDF_TRUE@ contrib/libudfread/src/ecma167.h \ -@ENABLE_UDF_TRUE@ contrib/libudfread/src/ecma167.c \ -@ENABLE_UDF_TRUE@ contrib/libudfread/src/udfread.h \ -@ENABLE_UDF_TRUE@ contrib/libudfread/src/udfread.c - -@USING_BDJAVA_TRUE@am__append_5 = \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/bdj.h \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/bdj.c \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/bdjo_data.h \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/bdjo_parse.h \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/bdjo_parse.c \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/bdjo.h \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/bdjo.c \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/java_awt_BDFontMetrics.h \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/java_awt_BDFontMetrics.c \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/java_awt_BDGraphics.h \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/java_awt_BDGraphics.c \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/org_videolan_Libbluray.h \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/org_videolan_Libbluray.c \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/org_videolan_Logger.h \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/org_videolan_Logger.c \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/register_native.h \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/register_native.c \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/util.h \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/util.c - -@USING_BDJAVA_TRUE@am__append_6 = $(BDJAVA_CFLAGS) -@USING_EXAMPLES_TRUE@noinst_PROGRAMS = bdjo_dump$(EXEEXT) \ -@USING_EXAMPLES_TRUE@ bdsplice$(EXEEXT) clpi_dump$(EXEEXT) \ -@USING_EXAMPLES_TRUE@ hdmv_test$(EXEEXT) index_dump$(EXEEXT) \ +@USING_EXAMPLES_TRUE@noinst_PROGRAMS = bdj_test$(EXEEXT) \ +@USING_EXAMPLES_TRUE@ bdjo_dump$(EXEEXT) bdsplice$(EXEEXT) \ +@USING_EXAMPLES_TRUE@ clpi_dump$(EXEEXT) hdmv_test$(EXEEXT) \ +@USING_EXAMPLES_TRUE@ index_dump$(EXEEXT) \ @USING_EXAMPLES_TRUE@ libbluray_test$(EXEEXT) \ @USING_EXAMPLES_TRUE@ list_titles$(EXEEXT) mobj_dump$(EXEEXT) \ -@USING_EXAMPLES_TRUE@ mpls_dump$(EXEEXT) sound_dump$(EXEEXT) \ -@USING_EXAMPLES_TRUE@ $(am__EXEEXT_1) -@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am__append_7 = \ -@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@ bdj_test - +@USING_EXAMPLES_TRUE@ mpls_dump$(EXEEXT) sound_dump$(EXEEXT) @USING_EXAMPLES_TRUE@bin_PROGRAMS = bd_info$(EXEEXT) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -214,6 +172,9 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(noinst_HEADERS) $(pkginclude_HEADERS) \ + $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -272,11 +233,13 @@ src/libbluray/bdnav/meta_parse.h \ src/libbluray/bdnav/meta_parse.c \ src/libbluray/bdnav/mpls_parse.h \ + src/libbluray/bdnav/mpls_data.h \ src/libbluray/bdnav/mpls_parse.c \ src/libbluray/bdnav/navigation.h \ src/libbluray/bdnav/navigation.c \ src/libbluray/bdnav/sound_parse.h \ src/libbluray/bdnav/sound_parse.c \ + src/libbluray/bdnav/uo_mask.h src/libbluray/bdnav/uo_mask.c \ src/libbluray/bdnav/uo_mask_table.h \ src/libbluray/decoders/graphics_controller.h \ src/libbluray/decoders/graphics_controller.c \ @@ -304,33 +267,22 @@ src/libbluray/disc/bdplus.h src/libbluray/disc/bdplus.c \ src/libbluray/disc/dec.h src/libbluray/disc/dec.c \ src/libbluray/disc/disc.h src/libbluray/disc/disc.c \ - src/libbluray/disc/enc_info.h src/libbluray/hdmv/hdmv_insn.h \ + src/libbluray/disc/enc_info.h src/libbluray/disc/properties.h \ + src/libbluray/disc/properties.c src/libbluray/hdmv/hdmv_insn.h \ src/libbluray/hdmv/hdmv_vm.h src/libbluray/hdmv/hdmv_vm.c \ src/libbluray/hdmv/mobj_data.h src/libbluray/hdmv/mobj_parse.h \ src/libbluray/hdmv/mobj_parse.c \ src/libbluray/hdmv/mobj_print.h \ src/libbluray/hdmv/mobj_print.c src/util/array.h \ src/util/array.c src/util/attributes.h src/util/bits.h \ - src/util/bits.c src/util/logging.h src/util/logging.c \ - src/util/log_control.h src/util/macro.h src/util/mutex.h \ - src/util/mutex.c src/util/refcnt.h src/util/refcnt.c \ - src/util/strutl.h src/util/strutl.c src/util/time.h \ - src/util/time.c src/file/dir_posix.c src/file/dirs_darwin.c \ - src/file/dl_posix.c src/file/file_posix.c \ - src/file/mount_darwin.c src/file/dir_win32.c \ - src/file/dirs_win32.c src/file/dl_win32.c \ - src/file/file_win32.c src/file/mount.c src/file/dirs_xdg.c \ - src/libbluray/disc/udf_fs.h src/libbluray/disc/udf_fs.c \ - contrib/libudfread/src/blockinput.h \ - contrib/libudfread/src/default_blockinput.h \ - contrib/libudfread/src/default_blockinput.c \ - contrib/libudfread/src/ecma167.h \ - contrib/libudfread/src/ecma167.c \ - contrib/libudfread/src/udfread.h \ - contrib/libudfread/src/udfread.c src/libbluray/bdj/bdj.h \ - src/libbluray/bdj/bdj.c src/libbluray/bdj/bdjo_data.h \ - src/libbluray/bdj/bdjo_parse.h src/libbluray/bdj/bdjo_parse.c \ - src/libbluray/bdj/native/bdjo.h \ + src/util/bits.c src/util/event_queue.h src/util/event_queue.c \ + src/util/logging.h src/util/logging.c src/util/log_control.h \ + src/util/macro.h src/util/mutex.h src/util/mutex.c \ + src/util/refcnt.h src/util/refcnt.c src/util/strutl.h \ + src/util/strutl.c src/util/time.h src/util/time.c \ + src/libbluray/bdj/bdj.h src/libbluray/bdj/bdj.c \ + src/libbluray/bdj/bdjo_data.h src/libbluray/bdj/bdjo_parse.h \ + src/libbluray/bdj/bdjo_parse.c src/libbluray/bdj/native/bdjo.h \ src/libbluray/bdj/native/bdjo.c \ src/libbluray/bdj/native/java_awt_BDFontMetrics.h \ src/libbluray/bdj/native/java_awt_BDFontMetrics.c \ @@ -343,65 +295,85 @@ src/libbluray/bdj/native/register_native.h \ src/libbluray/bdj/native/register_native.c \ src/libbluray/bdj/native/util.h \ - src/libbluray/bdj/native/util.c + src/libbluray/bdj/native/util.c src/libbluray/disc/udf_fs.h \ + src/libbluray/disc/udf_fs.c \ + contrib/libudfread/src/blockinput.h \ + contrib/libudfread/src/default_blockinput.h \ + contrib/libudfread/src/default_blockinput.c \ + contrib/libudfread/src/ecma167.h \ + contrib/libudfread/src/ecma167.c \ + contrib/libudfread/src/udfread.h \ + contrib/libudfread/src/udfread.c src/file/dir_posix.c \ + src/file/dirs_darwin.c src/file/dl_posix.c \ + src/file/file_posix.c src/file/mount_darwin.c \ + src/file/dir_win32.c src/file/dirs_win32.c src/file/dl_win32.c \ + src/file/file_win32.c src/file/mount.c src/file/dirs_xdg.c am__dirstamp = $(am__leading_dot)dirstamp -@HAVE_DARWIN_TRUE@am__objects_1 = src/file/dir_posix.lo \ -@HAVE_DARWIN_TRUE@ src/file/dirs_darwin.lo src/file/dl_posix.lo \ -@HAVE_DARWIN_TRUE@ src/file/file_posix.lo \ -@HAVE_DARWIN_TRUE@ src/file/mount_darwin.lo -@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@am__objects_2 = \ -@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@ src/file/dir_win32.lo \ -@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@ src/file/dirs_win32.lo \ -@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@ src/file/dl_win32.lo \ -@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@ src/file/file_win32.lo \ -@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@ src/file/mount.lo -@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@am__objects_3 = \ -@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/dir_posix.lo \ -@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/dirs_xdg.lo \ -@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/dl_posix.lo \ -@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/file_posix.lo \ -@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/mount.lo -@ENABLE_UDF_TRUE@am__objects_4 = src/libbluray/disc/udf_fs.lo \ -@ENABLE_UDF_TRUE@ contrib/libudfread/src/default_blockinput.lo \ -@ENABLE_UDF_TRUE@ contrib/libudfread/src/ecma167.lo \ -@ENABLE_UDF_TRUE@ contrib/libudfread/src/udfread.lo -@USING_BDJAVA_TRUE@am__objects_5 = src/libbluray/bdj/bdj.lo \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/bdjo_parse.lo \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/bdjo.lo \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/java_awt_BDFontMetrics.lo \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/java_awt_BDGraphics.lo \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/org_videolan_Libbluray.lo \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/org_videolan_Logger.lo \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/register_native.lo \ -@USING_BDJAVA_TRUE@ src/libbluray/bdj/native/util.lo -am_libbluray_la_OBJECTS = src/file/file.lo src/file/filesystem.lo \ - src/libbluray/bluray.lo src/libbluray/register.lo \ - src/libbluray/bdnav/bdid_parse.lo \ - src/libbluray/bdnav/clpi_parse.lo \ - src/libbluray/bdnav/extdata_parse.lo \ - src/libbluray/bdnav/index_parse.lo \ - src/libbluray/bdnav/meta_parse.lo \ - src/libbluray/bdnav/mpls_parse.lo \ - src/libbluray/bdnav/navigation.lo \ - src/libbluray/bdnav/sound_parse.lo \ - src/libbluray/decoders/graphics_controller.lo \ - src/libbluray/decoders/graphics_processor.lo \ - src/libbluray/decoders/ig_decode.lo \ - src/libbluray/decoders/m2ts_demux.lo \ - src/libbluray/decoders/m2ts_filter.lo \ - src/libbluray/decoders/pg_decode.lo \ - src/libbluray/decoders/pes_buffer.lo \ - src/libbluray/decoders/rle.lo \ - src/libbluray/decoders/textst_decode.lo \ - src/libbluray/decoders/textst_render.lo \ - src/libbluray/disc/aacs.lo src/libbluray/disc/bdplus.lo \ - src/libbluray/disc/dec.lo src/libbluray/disc/disc.lo \ - src/libbluray/hdmv/hdmv_vm.lo src/libbluray/hdmv/mobj_parse.lo \ - src/libbluray/hdmv/mobj_print.lo src/util/array.lo \ - src/util/bits.lo src/util/logging.lo src/util/mutex.lo \ - src/util/refcnt.lo src/util/strutl.lo src/util/time.lo \ - $(am__objects_1) $(am__objects_2) $(am__objects_3) \ - $(am__objects_4) $(am__objects_5) +@HAVE_DARWIN_TRUE@am__objects_1 = src/file/libbluray_la-dir_posix.lo \ +@HAVE_DARWIN_TRUE@ src/file/libbluray_la-dirs_darwin.lo \ +@HAVE_DARWIN_TRUE@ src/file/libbluray_la-dl_posix.lo \ +@HAVE_DARWIN_TRUE@ src/file/libbluray_la-file_posix.lo \ +@HAVE_DARWIN_TRUE@ src/file/libbluray_la-mount_darwin.lo +@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@am__objects_2 = src/file/libbluray_la-dir_win32.lo \ +@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@ src/file/libbluray_la-dirs_win32.lo \ +@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@ src/file/libbluray_la-dl_win32.lo \ +@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@ src/file/libbluray_la-file_win32.lo \ +@HAVE_DARWIN_FALSE@@HAVE_WIN32_TRUE@ src/file/libbluray_la-mount.lo +@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@am__objects_3 = src/file/libbluray_la-dir_posix.lo \ +@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-dirs_xdg.lo \ +@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-dl_posix.lo \ +@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-file_posix.lo \ +@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-mount.lo +am_libbluray_la_OBJECTS = src/file/libbluray_la-file.lo \ + src/file/libbluray_la-filesystem.lo \ + src/libbluray/libbluray_la-bluray.lo \ + src/libbluray/libbluray_la-register.lo \ + src/libbluray/bdnav/libbluray_la-bdid_parse.lo \ + src/libbluray/bdnav/libbluray_la-clpi_parse.lo \ + src/libbluray/bdnav/libbluray_la-extdata_parse.lo \ + src/libbluray/bdnav/libbluray_la-index_parse.lo \ + src/libbluray/bdnav/libbluray_la-meta_parse.lo \ + src/libbluray/bdnav/libbluray_la-mpls_parse.lo \ + src/libbluray/bdnav/libbluray_la-navigation.lo \ + src/libbluray/bdnav/libbluray_la-sound_parse.lo \ + src/libbluray/bdnav/libbluray_la-uo_mask.lo \ + src/libbluray/decoders/libbluray_la-graphics_controller.lo \ + src/libbluray/decoders/libbluray_la-graphics_processor.lo \ + src/libbluray/decoders/libbluray_la-ig_decode.lo \ + src/libbluray/decoders/libbluray_la-m2ts_demux.lo \ + src/libbluray/decoders/libbluray_la-m2ts_filter.lo \ + src/libbluray/decoders/libbluray_la-pg_decode.lo \ + src/libbluray/decoders/libbluray_la-pes_buffer.lo \ + src/libbluray/decoders/libbluray_la-rle.lo \ + src/libbluray/decoders/libbluray_la-textst_decode.lo \ + src/libbluray/decoders/libbluray_la-textst_render.lo \ + src/libbluray/disc/libbluray_la-aacs.lo \ + src/libbluray/disc/libbluray_la-bdplus.lo \ + src/libbluray/disc/libbluray_la-dec.lo \ + src/libbluray/disc/libbluray_la-disc.lo \ + src/libbluray/disc/libbluray_la-properties.lo \ + src/libbluray/hdmv/libbluray_la-hdmv_vm.lo \ + src/libbluray/hdmv/libbluray_la-mobj_parse.lo \ + src/libbluray/hdmv/libbluray_la-mobj_print.lo \ + src/util/libbluray_la-array.lo src/util/libbluray_la-bits.lo \ + src/util/libbluray_la-event_queue.lo \ + src/util/libbluray_la-logging.lo \ + src/util/libbluray_la-mutex.lo src/util/libbluray_la-refcnt.lo \ + src/util/libbluray_la-strutl.lo src/util/libbluray_la-time.lo \ + src/libbluray/bdj/libbluray_la-bdj.lo \ + src/libbluray/bdj/libbluray_la-bdjo_parse.lo \ + src/libbluray/bdj/native/libbluray_la-bdjo.lo \ + src/libbluray/bdj/native/libbluray_la-java_awt_BDFontMetrics.lo \ + src/libbluray/bdj/native/libbluray_la-java_awt_BDGraphics.lo \ + src/libbluray/bdj/native/libbluray_la-org_videolan_Libbluray.lo \ + src/libbluray/bdj/native/libbluray_la-org_videolan_Logger.lo \ + src/libbluray/bdj/native/libbluray_la-register_native.lo \ + src/libbluray/bdj/native/libbluray_la-util.lo \ + src/libbluray/disc/libbluray_la-udf_fs.lo \ + contrib/libudfread/src/libbluray_la-default_blockinput.lo \ + contrib/libudfread/src/libbluray_la-ecma167.lo \ + contrib/libudfread/src/libbluray_la-udfread.lo \ + $(am__objects_1) $(am__objects_2) $(am__objects_3) libbluray_la_OBJECTS = $(am_libbluray_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -410,22 +382,20 @@ libbluray_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libbluray_la_LDFLAGS) $(LDFLAGS) -o $@ -@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@am__EXEEXT_1 = \ -@USING_BDJAVA_TRUE@@USING_EXAMPLES_TRUE@ bdj_test$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am__bd_info_SOURCES_DIST = src/examples/bd_info.c @USING_EXAMPLES_TRUE@am_bd_info_OBJECTS = \ @USING_EXAMPLES_TRUE@ src/examples/bd_info.$(OBJEXT) bd_info_OBJECTS = $(am_bd_info_OBJECTS) @USING_EXAMPLES_TRUE@bd_info_DEPENDENCIES = libbluray.la -am__bdj_test_SOURCES_DIST = src/examples/bdj_test.c +am__bdj_test_SOURCES_DIST = src/devtools/bdj_test.c @USING_EXAMPLES_TRUE@am_bdj_test_OBJECTS = \ -@USING_EXAMPLES_TRUE@ src/examples/bdj_test.$(OBJEXT) +@USING_EXAMPLES_TRUE@ src/devtools/bdj_test.$(OBJEXT) bdj_test_OBJECTS = $(am_bdj_test_OBJECTS) @USING_EXAMPLES_TRUE@bdj_test_DEPENDENCIES = libbluray.la -am__bdjo_dump_SOURCES_DIST = src/examples/bdjo_dump.c +am__bdjo_dump_SOURCES_DIST = src/devtools/bdjo_dump.c @USING_EXAMPLES_TRUE@am_bdjo_dump_OBJECTS = \ -@USING_EXAMPLES_TRUE@ src/examples/bdjo_dump.$(OBJEXT) +@USING_EXAMPLES_TRUE@ src/devtools/bdjo_dump.$(OBJEXT) bdjo_dump_OBJECTS = $(am_bdjo_dump_OBJECTS) @USING_EXAMPLES_TRUE@bdjo_dump_DEPENDENCIES = libbluray.la am__bdsplice_SOURCES_DIST = src/examples/bdsplice.c @@ -433,18 +403,18 @@ @USING_EXAMPLES_TRUE@ src/examples/bdsplice.$(OBJEXT) bdsplice_OBJECTS = $(am_bdsplice_OBJECTS) @USING_EXAMPLES_TRUE@bdsplice_DEPENDENCIES = libbluray.la -am__clpi_dump_SOURCES_DIST = src/examples/clpi_dump.c \ - src/examples/util.c src/examples/util.h -@USING_EXAMPLES_TRUE@am_clpi_dump_OBJECTS = src/examples/clpi_dump-clpi_dump.$(OBJEXT) \ -@USING_EXAMPLES_TRUE@ src/examples/clpi_dump-util.$(OBJEXT) +am__clpi_dump_SOURCES_DIST = src/devtools/clpi_dump.c \ + src/devtools/util.c src/devtools/util.h +@USING_EXAMPLES_TRUE@am_clpi_dump_OBJECTS = src/devtools/clpi_dump-clpi_dump.$(OBJEXT) \ +@USING_EXAMPLES_TRUE@ src/devtools/clpi_dump-util.$(OBJEXT) clpi_dump_OBJECTS = $(am_clpi_dump_OBJECTS) @USING_EXAMPLES_TRUE@clpi_dump_DEPENDENCIES = libbluray.la clpi_dump_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(clpi_dump_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am__hdmv_test_SOURCES_DIST = src/examples/hdmv_test.c +am__hdmv_test_SOURCES_DIST = src/devtools/hdmv_test.c @USING_EXAMPLES_TRUE@am_hdmv_test_OBJECTS = \ -@USING_EXAMPLES_TRUE@ src/examples/hdmv_test.$(OBJEXT) +@USING_EXAMPLES_TRUE@ src/devtools/hdmv_test.$(OBJEXT) hdmv_test_OBJECTS = $(am_hdmv_test_OBJECTS) @USING_EXAMPLES_TRUE@hdmv_test_DEPENDENCIES = libbluray.la am__index_dump_SOURCES_DIST = src/examples/index_dump.c @@ -462,19 +432,19 @@ @USING_EXAMPLES_TRUE@ src/examples/list_titles.$(OBJEXT) list_titles_OBJECTS = $(am_list_titles_OBJECTS) @USING_EXAMPLES_TRUE@list_titles_DEPENDENCIES = libbluray.la -am__mobj_dump_SOURCES_DIST = src/examples/mobj_dump.c \ +am__mobj_dump_SOURCES_DIST = src/devtools/mobj_dump.c \ src/libbluray/hdmv/mobj_print.c -@USING_EXAMPLES_TRUE@am_mobj_dump_OBJECTS = src/examples/mobj_dump-mobj_dump.$(OBJEXT) \ +@USING_EXAMPLES_TRUE@am_mobj_dump_OBJECTS = src/devtools/mobj_dump-mobj_dump.$(OBJEXT) \ @USING_EXAMPLES_TRUE@ src/libbluray/hdmv/mobj_dump-mobj_print.$(OBJEXT) mobj_dump_OBJECTS = $(am_mobj_dump_OBJECTS) @USING_EXAMPLES_TRUE@mobj_dump_DEPENDENCIES = libbluray.la mobj_dump_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(mobj_dump_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am__mpls_dump_SOURCES_DIST = src/examples/mpls_dump.c \ - src/examples/util.c src/examples/util.h -@USING_EXAMPLES_TRUE@am_mpls_dump_OBJECTS = src/examples/mpls_dump-mpls_dump.$(OBJEXT) \ -@USING_EXAMPLES_TRUE@ src/examples/mpls_dump-util.$(OBJEXT) +am__mpls_dump_SOURCES_DIST = src/devtools/mpls_dump.c \ + src/devtools/util.c src/devtools/util.h +@USING_EXAMPLES_TRUE@am_mpls_dump_OBJECTS = src/devtools/mpls_dump-mpls_dump.$(OBJEXT) \ +@USING_EXAMPLES_TRUE@ src/devtools/mpls_dump-util.$(OBJEXT) mpls_dump_OBJECTS = $(am_mpls_dump_OBJECTS) @USING_EXAMPLES_TRUE@mpls_dump_DEPENDENCIES = libbluray.la mpls_dump_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -562,6 +532,20 @@ CTAGS = ctags CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing \ + $(top_srcdir)/doxygen-include.am \ + $(top_srcdir)/src/libbluray.pc.in \ + $(top_srcdir)/src/libbluray/bluray-version.h.in COPYING \ + ChangeLog build-aux/compile build-aux/config.guess \ + build-aux/config.sub build-aux/depcomp build-aux/install-sh \ + build-aux/ltmain.sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -657,6 +641,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ @@ -683,7 +668,6 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UDF_CFLAGS = @UDF_CFLAGS@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -729,6 +713,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -753,15 +738,8 @@ @DX_COND_doc_TRUE@ @DX_DOCDIR@ ACLOCAL_AMFLAGS = -I m4 -DISTCHECK_CONFIGURE_FLAGS = --enable-bdjava --enable-udf MOSTLYCLEANFILES = $(DX_CLEANFILES) -@ENABLE_UDF_FALSE@POSIX_C_SOURCE = 200112L -@ENABLE_UDF_TRUE@POSIX_C_SOURCE = 200809L -SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) -D_REENTRANT -SET_INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/libbluray -I$(top_builddir)/src/libbluray $(BDJAVA_CFLAGS) -AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) \ - $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(UDF_CFLAGS) \ - $(am__append_6) +POSIX_C_SOURCE = 200809L EXTRA_DIST = \ bootstrap \ ChangeLog \ @@ -772,9 +750,34 @@ src/libbluray/bdj/build.xml \ src/libbluray/bdj/java \ src/libbluray/bdj/java-j2me \ - src/libbluray/bdj/java-j2se + src/libbluray/bdj/java-j2se \ + contrib/asm + +AM_CFLAGS = \ + -std=c99 + +AM_CPPFLAGS = \ + -D_ISOC99_SOURCE \ + -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) \ + -D_REENTRANT \ + \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/libbluray lib_LTLIBRARIES = libbluray.la +libbluray_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_builddir)/src/libbluray \ + $(BDJAVA_CFLAGS) \ + -I${top_srcdir}/contrib/libudfread/src/ \ + $(LIBXML2_CFLAGS) \ + $(FT2_CFLAGS) \ + $(FONTCONFIG_CFLAGS) + + +# bd-j + +# libudfread libbluray_la_SOURCES = src/file/dirs.h src/file/dl.h src/file/file.h \ src/file/file.c src/file/filesystem.h src/file/filesystem.c \ src/file/mount.h src/libbluray/bluray.h src/libbluray/bluray.c \ @@ -793,11 +796,13 @@ src/libbluray/bdnav/meta_parse.h \ src/libbluray/bdnav/meta_parse.c \ src/libbluray/bdnav/mpls_parse.h \ + src/libbluray/bdnav/mpls_data.h \ src/libbluray/bdnav/mpls_parse.c \ src/libbluray/bdnav/navigation.h \ src/libbluray/bdnav/navigation.c \ src/libbluray/bdnav/sound_parse.h \ src/libbluray/bdnav/sound_parse.c \ + src/libbluray/bdnav/uo_mask.h src/libbluray/bdnav/uo_mask.c \ src/libbluray/bdnav/uo_mask_table.h \ src/libbluray/decoders/graphics_controller.h \ src/libbluray/decoders/graphics_controller.c \ @@ -825,20 +830,45 @@ src/libbluray/disc/bdplus.h src/libbluray/disc/bdplus.c \ src/libbluray/disc/dec.h src/libbluray/disc/dec.c \ src/libbluray/disc/disc.h src/libbluray/disc/disc.c \ - src/libbluray/disc/enc_info.h src/libbluray/hdmv/hdmv_insn.h \ + src/libbluray/disc/enc_info.h src/libbluray/disc/properties.h \ + src/libbluray/disc/properties.c src/libbluray/hdmv/hdmv_insn.h \ src/libbluray/hdmv/hdmv_vm.h src/libbluray/hdmv/hdmv_vm.c \ src/libbluray/hdmv/mobj_data.h src/libbluray/hdmv/mobj_parse.h \ src/libbluray/hdmv/mobj_parse.c \ src/libbluray/hdmv/mobj_print.h \ src/libbluray/hdmv/mobj_print.c src/util/array.h \ src/util/array.c src/util/attributes.h src/util/bits.h \ - src/util/bits.c src/util/logging.h src/util/logging.c \ - src/util/log_control.h src/util/macro.h src/util/mutex.h \ - src/util/mutex.c src/util/refcnt.h src/util/refcnt.c \ - src/util/strutl.h src/util/strutl.c src/util/time.h \ - src/util/time.c $(am__append_1) $(am__append_2) \ - $(am__append_3) $(am__append_4) $(am__append_5) -libbluray_la_LDFLAGS = -version-info $(LT_VERSION_INFO) -export-symbols-regex "^bd_" + src/util/bits.c src/util/event_queue.h src/util/event_queue.c \ + src/util/logging.h src/util/logging.c src/util/log_control.h \ + src/util/macro.h src/util/mutex.h src/util/mutex.c \ + src/util/refcnt.h src/util/refcnt.c src/util/strutl.h \ + src/util/strutl.c src/util/time.h src/util/time.c \ + src/libbluray/bdj/bdj.h src/libbluray/bdj/bdj.c \ + src/libbluray/bdj/bdjo_data.h src/libbluray/bdj/bdjo_parse.h \ + src/libbluray/bdj/bdjo_parse.c src/libbluray/bdj/native/bdjo.h \ + src/libbluray/bdj/native/bdjo.c \ + src/libbluray/bdj/native/java_awt_BDFontMetrics.h \ + src/libbluray/bdj/native/java_awt_BDFontMetrics.c \ + src/libbluray/bdj/native/java_awt_BDGraphics.h \ + src/libbluray/bdj/native/java_awt_BDGraphics.c \ + src/libbluray/bdj/native/org_videolan_Libbluray.h \ + src/libbluray/bdj/native/org_videolan_Libbluray.c \ + src/libbluray/bdj/native/org_videolan_Logger.h \ + src/libbluray/bdj/native/org_videolan_Logger.c \ + src/libbluray/bdj/native/register_native.h \ + src/libbluray/bdj/native/register_native.c \ + src/libbluray/bdj/native/util.h \ + src/libbluray/bdj/native/util.c src/libbluray/disc/udf_fs.h \ + src/libbluray/disc/udf_fs.c \ + contrib/libudfread/src/blockinput.h \ + contrib/libudfread/src/default_blockinput.h \ + contrib/libudfread/src/default_blockinput.c \ + contrib/libudfread/src/ecma167.h \ + contrib/libudfread/src/ecma167.c \ + contrib/libudfread/src/udfread.h \ + contrib/libudfread/src/udfread.c $(am__append_1) \ + $(am__append_2) $(am__append_3) +libbluray_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION_INFO) -export-symbols-regex "^bd_" libbluray_la_LIBADD = $(LIBXML2_LIBS) $(FT2_LIBS) $(FONTCONFIG_LIBS) noinst_HEADERS = \ jni/jni.h \ @@ -857,26 +887,26 @@ src/libbluray/decoders/overlay.h \ src/util/log_control.h -@USING_BDJAVA_TRUE@jardir = $(datadir)/java/ -@USING_BDJAVA_TRUE@jar_DATA = $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar +@USING_BDJAVA_BUILD_JAR_TRUE@jardir = $(datadir)/java/ +@USING_BDJAVA_BUILD_JAR_TRUE@jar_DATA = $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = src/libbluray.pc @USING_EXAMPLES_TRUE@bd_info_SOURCES = src/examples/bd_info.c @USING_EXAMPLES_TRUE@bd_info_LDADD = libbluray.la @USING_EXAMPLES_TRUE@bdsplice_SOURCES = src/examples/bdsplice.c @USING_EXAMPLES_TRUE@bdsplice_LDADD = libbluray.la -@USING_EXAMPLES_TRUE@bdj_test_SOURCES = src/examples/bdj_test.c +@USING_EXAMPLES_TRUE@bdj_test_SOURCES = src/devtools/bdj_test.c @USING_EXAMPLES_TRUE@bdj_test_LDADD = libbluray.la -@USING_EXAMPLES_TRUE@bdjo_dump_SOURCES = src/examples/bdjo_dump.c +@USING_EXAMPLES_TRUE@bdjo_dump_SOURCES = src/devtools/bdjo_dump.c @USING_EXAMPLES_TRUE@bdjo_dump_LDADD = libbluray.la @USING_EXAMPLES_TRUE@clpi_dump_CFLAGS = $(AM_CFLAGS) @USING_EXAMPLES_TRUE@clpi_dump_SOURCES = \ -@USING_EXAMPLES_TRUE@ src/examples/clpi_dump.c \ -@USING_EXAMPLES_TRUE@ src/examples/util.c \ -@USING_EXAMPLES_TRUE@ src/examples/util.h +@USING_EXAMPLES_TRUE@ src/devtools/clpi_dump.c \ +@USING_EXAMPLES_TRUE@ src/devtools/util.c \ +@USING_EXAMPLES_TRUE@ src/devtools/util.h @USING_EXAMPLES_TRUE@clpi_dump_LDADD = libbluray.la -@USING_EXAMPLES_TRUE@hdmv_test_SOURCES = src/examples/hdmv_test.c +@USING_EXAMPLES_TRUE@hdmv_test_SOURCES = src/devtools/hdmv_test.c @USING_EXAMPLES_TRUE@hdmv_test_LDADD = libbluray.la @USING_EXAMPLES_TRUE@index_dump_SOURCES = src/examples/index_dump.c @USING_EXAMPLES_TRUE@index_dump_LDADD = libbluray.la @@ -885,15 +915,15 @@ @USING_EXAMPLES_TRUE@list_titles_SOURCES = src/examples/list_titles.c @USING_EXAMPLES_TRUE@list_titles_LDADD = libbluray.la @USING_EXAMPLES_TRUE@mobj_dump_CFLAGS = $(AM_CFLAGS) -@USING_EXAMPLES_TRUE@mobj_dump_SOURCES = src/examples/mobj_dump.c \ +@USING_EXAMPLES_TRUE@mobj_dump_SOURCES = src/devtools/mobj_dump.c \ @USING_EXAMPLES_TRUE@ src/libbluray/hdmv/mobj_print.c @USING_EXAMPLES_TRUE@mobj_dump_LDADD = libbluray.la @USING_EXAMPLES_TRUE@mpls_dump_CFLAGS = $(AM_CFLAGS) @USING_EXAMPLES_TRUE@mpls_dump_SOURCES = \ -@USING_EXAMPLES_TRUE@ src/examples/mpls_dump.c \ -@USING_EXAMPLES_TRUE@ src/examples/util.c \ -@USING_EXAMPLES_TRUE@ src/examples/util.h +@USING_EXAMPLES_TRUE@ src/devtools/mpls_dump.c \ +@USING_EXAMPLES_TRUE@ src/devtools/util.c \ +@USING_EXAMPLES_TRUE@ src/devtools/util.h @USING_EXAMPLES_TRUE@mpls_dump_LDADD = libbluray.la @USING_EXAMPLES_TRUE@sound_dump_SOURCES = src/examples/sound_dump.c @@ -918,7 +948,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -928,7 +957,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/doxygen-include.am: +$(top_srcdir)/doxygen-include.am $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -998,9 +1027,9 @@ src/file/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/file/$(DEPDIR) @: > src/file/$(DEPDIR)/$(am__dirstamp) -src/file/file.lo: src/file/$(am__dirstamp) \ +src/file/libbluray_la-file.lo: src/file/$(am__dirstamp) \ src/file/$(DEPDIR)/$(am__dirstamp) -src/file/filesystem.lo: src/file/$(am__dirstamp) \ +src/file/libbluray_la-filesystem.lo: src/file/$(am__dirstamp) \ src/file/$(DEPDIR)/$(am__dirstamp) src/libbluray/$(am__dirstamp): @$(MKDIR_P) src/libbluray @@ -1008,9 +1037,9 @@ src/libbluray/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/libbluray/$(DEPDIR) @: > src/libbluray/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bluray.lo: src/libbluray/$(am__dirstamp) \ +src/libbluray/libbluray_la-bluray.lo: src/libbluray/$(am__dirstamp) \ src/libbluray/$(DEPDIR)/$(am__dirstamp) -src/libbluray/register.lo: src/libbluray/$(am__dirstamp) \ +src/libbluray/libbluray_la-register.lo: src/libbluray/$(am__dirstamp) \ src/libbluray/$(DEPDIR)/$(am__dirstamp) src/libbluray/bdnav/$(am__dirstamp): @$(MKDIR_P) src/libbluray/bdnav @@ -1018,28 +1047,31 @@ src/libbluray/bdnav/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/libbluray/bdnav/$(DEPDIR) @: > src/libbluray/bdnav/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdnav/bdid_parse.lo: \ +src/libbluray/bdnav/libbluray_la-bdid_parse.lo: \ + src/libbluray/bdnav/$(am__dirstamp) \ + src/libbluray/bdnav/$(DEPDIR)/$(am__dirstamp) +src/libbluray/bdnav/libbluray_la-clpi_parse.lo: \ src/libbluray/bdnav/$(am__dirstamp) \ src/libbluray/bdnav/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdnav/clpi_parse.lo: \ +src/libbluray/bdnav/libbluray_la-extdata_parse.lo: \ src/libbluray/bdnav/$(am__dirstamp) \ src/libbluray/bdnav/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdnav/extdata_parse.lo: \ +src/libbluray/bdnav/libbluray_la-index_parse.lo: \ src/libbluray/bdnav/$(am__dirstamp) \ src/libbluray/bdnav/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdnav/index_parse.lo: \ +src/libbluray/bdnav/libbluray_la-meta_parse.lo: \ src/libbluray/bdnav/$(am__dirstamp) \ src/libbluray/bdnav/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdnav/meta_parse.lo: \ +src/libbluray/bdnav/libbluray_la-mpls_parse.lo: \ src/libbluray/bdnav/$(am__dirstamp) \ src/libbluray/bdnav/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdnav/mpls_parse.lo: \ +src/libbluray/bdnav/libbluray_la-navigation.lo: \ src/libbluray/bdnav/$(am__dirstamp) \ src/libbluray/bdnav/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdnav/navigation.lo: \ +src/libbluray/bdnav/libbluray_la-sound_parse.lo: \ src/libbluray/bdnav/$(am__dirstamp) \ src/libbluray/bdnav/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdnav/sound_parse.lo: \ +src/libbluray/bdnav/libbluray_la-uo_mask.lo: \ src/libbluray/bdnav/$(am__dirstamp) \ src/libbluray/bdnav/$(DEPDIR)/$(am__dirstamp) src/libbluray/decoders/$(am__dirstamp): @@ -1048,33 +1080,34 @@ src/libbluray/decoders/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/libbluray/decoders/$(DEPDIR) @: > src/libbluray/decoders/$(DEPDIR)/$(am__dirstamp) -src/libbluray/decoders/graphics_controller.lo: \ +src/libbluray/decoders/libbluray_la-graphics_controller.lo: \ src/libbluray/decoders/$(am__dirstamp) \ src/libbluray/decoders/$(DEPDIR)/$(am__dirstamp) -src/libbluray/decoders/graphics_processor.lo: \ +src/libbluray/decoders/libbluray_la-graphics_processor.lo: \ src/libbluray/decoders/$(am__dirstamp) \ src/libbluray/decoders/$(DEPDIR)/$(am__dirstamp) -src/libbluray/decoders/ig_decode.lo: \ +src/libbluray/decoders/libbluray_la-ig_decode.lo: \ src/libbluray/decoders/$(am__dirstamp) \ src/libbluray/decoders/$(DEPDIR)/$(am__dirstamp) -src/libbluray/decoders/m2ts_demux.lo: \ +src/libbluray/decoders/libbluray_la-m2ts_demux.lo: \ src/libbluray/decoders/$(am__dirstamp) \ src/libbluray/decoders/$(DEPDIR)/$(am__dirstamp) -src/libbluray/decoders/m2ts_filter.lo: \ +src/libbluray/decoders/libbluray_la-m2ts_filter.lo: \ src/libbluray/decoders/$(am__dirstamp) \ src/libbluray/decoders/$(DEPDIR)/$(am__dirstamp) -src/libbluray/decoders/pg_decode.lo: \ +src/libbluray/decoders/libbluray_la-pg_decode.lo: \ src/libbluray/decoders/$(am__dirstamp) \ src/libbluray/decoders/$(DEPDIR)/$(am__dirstamp) -src/libbluray/decoders/pes_buffer.lo: \ +src/libbluray/decoders/libbluray_la-pes_buffer.lo: \ src/libbluray/decoders/$(am__dirstamp) \ src/libbluray/decoders/$(DEPDIR)/$(am__dirstamp) -src/libbluray/decoders/rle.lo: src/libbluray/decoders/$(am__dirstamp) \ +src/libbluray/decoders/libbluray_la-rle.lo: \ + src/libbluray/decoders/$(am__dirstamp) \ src/libbluray/decoders/$(DEPDIR)/$(am__dirstamp) -src/libbluray/decoders/textst_decode.lo: \ +src/libbluray/decoders/libbluray_la-textst_decode.lo: \ src/libbluray/decoders/$(am__dirstamp) \ src/libbluray/decoders/$(DEPDIR)/$(am__dirstamp) -src/libbluray/decoders/textst_render.lo: \ +src/libbluray/decoders/libbluray_la-textst_render.lo: \ src/libbluray/decoders/$(am__dirstamp) \ src/libbluray/decoders/$(DEPDIR)/$(am__dirstamp) src/libbluray/disc/$(am__dirstamp): @@ -1083,13 +1116,20 @@ src/libbluray/disc/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/libbluray/disc/$(DEPDIR) @: > src/libbluray/disc/$(DEPDIR)/$(am__dirstamp) -src/libbluray/disc/aacs.lo: src/libbluray/disc/$(am__dirstamp) \ +src/libbluray/disc/libbluray_la-aacs.lo: \ + src/libbluray/disc/$(am__dirstamp) \ src/libbluray/disc/$(DEPDIR)/$(am__dirstamp) -src/libbluray/disc/bdplus.lo: src/libbluray/disc/$(am__dirstamp) \ +src/libbluray/disc/libbluray_la-bdplus.lo: \ + src/libbluray/disc/$(am__dirstamp) \ src/libbluray/disc/$(DEPDIR)/$(am__dirstamp) -src/libbluray/disc/dec.lo: src/libbluray/disc/$(am__dirstamp) \ +src/libbluray/disc/libbluray_la-dec.lo: \ + src/libbluray/disc/$(am__dirstamp) \ src/libbluray/disc/$(DEPDIR)/$(am__dirstamp) -src/libbluray/disc/disc.lo: src/libbluray/disc/$(am__dirstamp) \ +src/libbluray/disc/libbluray_la-disc.lo: \ + src/libbluray/disc/$(am__dirstamp) \ + src/libbluray/disc/$(DEPDIR)/$(am__dirstamp) +src/libbluray/disc/libbluray_la-properties.lo: \ + src/libbluray/disc/$(am__dirstamp) \ src/libbluray/disc/$(DEPDIR)/$(am__dirstamp) src/libbluray/hdmv/$(am__dirstamp): @$(MKDIR_P) src/libbluray/hdmv @@ -1097,11 +1137,14 @@ src/libbluray/hdmv/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/libbluray/hdmv/$(DEPDIR) @: > src/libbluray/hdmv/$(DEPDIR)/$(am__dirstamp) -src/libbluray/hdmv/hdmv_vm.lo: src/libbluray/hdmv/$(am__dirstamp) \ +src/libbluray/hdmv/libbluray_la-hdmv_vm.lo: \ + src/libbluray/hdmv/$(am__dirstamp) \ src/libbluray/hdmv/$(DEPDIR)/$(am__dirstamp) -src/libbluray/hdmv/mobj_parse.lo: src/libbluray/hdmv/$(am__dirstamp) \ +src/libbluray/hdmv/libbluray_la-mobj_parse.lo: \ + src/libbluray/hdmv/$(am__dirstamp) \ src/libbluray/hdmv/$(DEPDIR)/$(am__dirstamp) -src/libbluray/hdmv/mobj_print.lo: src/libbluray/hdmv/$(am__dirstamp) \ +src/libbluray/hdmv/libbluray_la-mobj_print.lo: \ + src/libbluray/hdmv/$(am__dirstamp) \ src/libbluray/hdmv/$(DEPDIR)/$(am__dirstamp) src/util/$(am__dirstamp): @$(MKDIR_P) src/util @@ -1109,68 +1152,33 @@ src/util/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/util/$(DEPDIR) @: > src/util/$(DEPDIR)/$(am__dirstamp) -src/util/array.lo: src/util/$(am__dirstamp) \ +src/util/libbluray_la-array.lo: src/util/$(am__dirstamp) \ src/util/$(DEPDIR)/$(am__dirstamp) -src/util/bits.lo: src/util/$(am__dirstamp) \ +src/util/libbluray_la-bits.lo: src/util/$(am__dirstamp) \ src/util/$(DEPDIR)/$(am__dirstamp) -src/util/logging.lo: src/util/$(am__dirstamp) \ +src/util/libbluray_la-event_queue.lo: src/util/$(am__dirstamp) \ src/util/$(DEPDIR)/$(am__dirstamp) -src/util/mutex.lo: src/util/$(am__dirstamp) \ +src/util/libbluray_la-logging.lo: src/util/$(am__dirstamp) \ src/util/$(DEPDIR)/$(am__dirstamp) -src/util/refcnt.lo: src/util/$(am__dirstamp) \ +src/util/libbluray_la-mutex.lo: src/util/$(am__dirstamp) \ src/util/$(DEPDIR)/$(am__dirstamp) -src/util/strutl.lo: src/util/$(am__dirstamp) \ +src/util/libbluray_la-refcnt.lo: src/util/$(am__dirstamp) \ src/util/$(DEPDIR)/$(am__dirstamp) -src/util/time.lo: src/util/$(am__dirstamp) \ +src/util/libbluray_la-strutl.lo: src/util/$(am__dirstamp) \ + src/util/$(DEPDIR)/$(am__dirstamp) +src/util/libbluray_la-time.lo: src/util/$(am__dirstamp) \ src/util/$(DEPDIR)/$(am__dirstamp) -src/file/dir_posix.lo: src/file/$(am__dirstamp) \ - src/file/$(DEPDIR)/$(am__dirstamp) -src/file/dirs_darwin.lo: src/file/$(am__dirstamp) \ - src/file/$(DEPDIR)/$(am__dirstamp) -src/file/dl_posix.lo: src/file/$(am__dirstamp) \ - src/file/$(DEPDIR)/$(am__dirstamp) -src/file/file_posix.lo: src/file/$(am__dirstamp) \ - src/file/$(DEPDIR)/$(am__dirstamp) -src/file/mount_darwin.lo: src/file/$(am__dirstamp) \ - src/file/$(DEPDIR)/$(am__dirstamp) -src/file/dir_win32.lo: src/file/$(am__dirstamp) \ - src/file/$(DEPDIR)/$(am__dirstamp) -src/file/dirs_win32.lo: src/file/$(am__dirstamp) \ - src/file/$(DEPDIR)/$(am__dirstamp) -src/file/dl_win32.lo: src/file/$(am__dirstamp) \ - src/file/$(DEPDIR)/$(am__dirstamp) -src/file/file_win32.lo: src/file/$(am__dirstamp) \ - src/file/$(DEPDIR)/$(am__dirstamp) -src/file/mount.lo: src/file/$(am__dirstamp) \ - src/file/$(DEPDIR)/$(am__dirstamp) -src/file/dirs_xdg.lo: src/file/$(am__dirstamp) \ - src/file/$(DEPDIR)/$(am__dirstamp) -src/libbluray/disc/udf_fs.lo: src/libbluray/disc/$(am__dirstamp) \ - src/libbluray/disc/$(DEPDIR)/$(am__dirstamp) -contrib/libudfread/src/$(am__dirstamp): - @$(MKDIR_P) contrib/libudfread/src - @: > contrib/libudfread/src/$(am__dirstamp) -contrib/libudfread/src/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) contrib/libudfread/src/$(DEPDIR) - @: > contrib/libudfread/src/$(DEPDIR)/$(am__dirstamp) -contrib/libudfread/src/default_blockinput.lo: \ - contrib/libudfread/src/$(am__dirstamp) \ - contrib/libudfread/src/$(DEPDIR)/$(am__dirstamp) -contrib/libudfread/src/ecma167.lo: \ - contrib/libudfread/src/$(am__dirstamp) \ - contrib/libudfread/src/$(DEPDIR)/$(am__dirstamp) -contrib/libudfread/src/udfread.lo: \ - contrib/libudfread/src/$(am__dirstamp) \ - contrib/libudfread/src/$(DEPDIR)/$(am__dirstamp) src/libbluray/bdj/$(am__dirstamp): @$(MKDIR_P) src/libbluray/bdj @: > src/libbluray/bdj/$(am__dirstamp) src/libbluray/bdj/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/libbluray/bdj/$(DEPDIR) @: > src/libbluray/bdj/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdj/bdj.lo: src/libbluray/bdj/$(am__dirstamp) \ +src/libbluray/bdj/libbluray_la-bdj.lo: \ + src/libbluray/bdj/$(am__dirstamp) \ src/libbluray/bdj/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdj/bdjo_parse.lo: src/libbluray/bdj/$(am__dirstamp) \ +src/libbluray/bdj/libbluray_la-bdjo_parse.lo: \ + src/libbluray/bdj/$(am__dirstamp) \ src/libbluray/bdj/$(DEPDIR)/$(am__dirstamp) src/libbluray/bdj/native/$(am__dirstamp): @$(MKDIR_P) src/libbluray/bdj/native @@ -1178,27 +1186,67 @@ src/libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/libbluray/bdj/native/$(DEPDIR) @: > src/libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdj/native/bdjo.lo: \ +src/libbluray/bdj/native/libbluray_la-bdjo.lo: \ src/libbluray/bdj/native/$(am__dirstamp) \ src/libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdj/native/java_awt_BDFontMetrics.lo: \ +src/libbluray/bdj/native/libbluray_la-java_awt_BDFontMetrics.lo: \ src/libbluray/bdj/native/$(am__dirstamp) \ src/libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdj/native/java_awt_BDGraphics.lo: \ +src/libbluray/bdj/native/libbluray_la-java_awt_BDGraphics.lo: \ src/libbluray/bdj/native/$(am__dirstamp) \ src/libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdj/native/org_videolan_Libbluray.lo: \ +src/libbluray/bdj/native/libbluray_la-org_videolan_Libbluray.lo: \ src/libbluray/bdj/native/$(am__dirstamp) \ src/libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdj/native/org_videolan_Logger.lo: \ +src/libbluray/bdj/native/libbluray_la-org_videolan_Logger.lo: \ src/libbluray/bdj/native/$(am__dirstamp) \ src/libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdj/native/register_native.lo: \ +src/libbluray/bdj/native/libbluray_la-register_native.lo: \ src/libbluray/bdj/native/$(am__dirstamp) \ src/libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp) -src/libbluray/bdj/native/util.lo: \ +src/libbluray/bdj/native/libbluray_la-util.lo: \ src/libbluray/bdj/native/$(am__dirstamp) \ src/libbluray/bdj/native/$(DEPDIR)/$(am__dirstamp) +src/libbluray/disc/libbluray_la-udf_fs.lo: \ + src/libbluray/disc/$(am__dirstamp) \ + src/libbluray/disc/$(DEPDIR)/$(am__dirstamp) +contrib/libudfread/src/$(am__dirstamp): + @$(MKDIR_P) contrib/libudfread/src + @: > contrib/libudfread/src/$(am__dirstamp) +contrib/libudfread/src/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) contrib/libudfread/src/$(DEPDIR) + @: > contrib/libudfread/src/$(DEPDIR)/$(am__dirstamp) +contrib/libudfread/src/libbluray_la-default_blockinput.lo: \ + contrib/libudfread/src/$(am__dirstamp) \ + contrib/libudfread/src/$(DEPDIR)/$(am__dirstamp) +contrib/libudfread/src/libbluray_la-ecma167.lo: \ + contrib/libudfread/src/$(am__dirstamp) \ + contrib/libudfread/src/$(DEPDIR)/$(am__dirstamp) +contrib/libudfread/src/libbluray_la-udfread.lo: \ + contrib/libudfread/src/$(am__dirstamp) \ + contrib/libudfread/src/$(DEPDIR)/$(am__dirstamp) +src/file/libbluray_la-dir_posix.lo: src/file/$(am__dirstamp) \ + src/file/$(DEPDIR)/$(am__dirstamp) +src/file/libbluray_la-dirs_darwin.lo: src/file/$(am__dirstamp) \ + src/file/$(DEPDIR)/$(am__dirstamp) +src/file/libbluray_la-dl_posix.lo: src/file/$(am__dirstamp) \ + src/file/$(DEPDIR)/$(am__dirstamp) +src/file/libbluray_la-file_posix.lo: src/file/$(am__dirstamp) \ + src/file/$(DEPDIR)/$(am__dirstamp) +src/file/libbluray_la-mount_darwin.lo: src/file/$(am__dirstamp) \ + src/file/$(DEPDIR)/$(am__dirstamp) +src/file/libbluray_la-dir_win32.lo: src/file/$(am__dirstamp) \ + src/file/$(DEPDIR)/$(am__dirstamp) +src/file/libbluray_la-dirs_win32.lo: src/file/$(am__dirstamp) \ + src/file/$(DEPDIR)/$(am__dirstamp) +src/file/libbluray_la-dl_win32.lo: src/file/$(am__dirstamp) \ + src/file/$(DEPDIR)/$(am__dirstamp) +src/file/libbluray_la-file_win32.lo: src/file/$(am__dirstamp) \ + src/file/$(DEPDIR)/$(am__dirstamp) +src/file/libbluray_la-mount.lo: src/file/$(am__dirstamp) \ + src/file/$(DEPDIR)/$(am__dirstamp) +src/file/libbluray_la-dirs_xdg.lo: src/file/$(am__dirstamp) \ + src/file/$(DEPDIR)/$(am__dirstamp) libbluray.la: $(libbluray_la_OBJECTS) $(libbluray_la_DEPENDENCIES) $(EXTRA_libbluray_la_DEPENDENCIES) $(AM_V_CCLD)$(libbluray_la_LINK) -rpath $(libdir) $(libbluray_la_OBJECTS) $(libbluray_la_LIBADD) $(LIBS) @@ -1272,14 +1320,20 @@ bd_info$(EXEEXT): $(bd_info_OBJECTS) $(bd_info_DEPENDENCIES) $(EXTRA_bd_info_DEPENDENCIES) @rm -f bd_info$(EXEEXT) $(AM_V_CCLD)$(LINK) $(bd_info_OBJECTS) $(bd_info_LDADD) $(LIBS) -src/examples/bdj_test.$(OBJEXT): src/examples/$(am__dirstamp) \ - src/examples/$(DEPDIR)/$(am__dirstamp) +src/devtools/$(am__dirstamp): + @$(MKDIR_P) src/devtools + @: > src/devtools/$(am__dirstamp) +src/devtools/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) src/devtools/$(DEPDIR) + @: > src/devtools/$(DEPDIR)/$(am__dirstamp) +src/devtools/bdj_test.$(OBJEXT): src/devtools/$(am__dirstamp) \ + src/devtools/$(DEPDIR)/$(am__dirstamp) bdj_test$(EXEEXT): $(bdj_test_OBJECTS) $(bdj_test_DEPENDENCIES) $(EXTRA_bdj_test_DEPENDENCIES) @rm -f bdj_test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(bdj_test_OBJECTS) $(bdj_test_LDADD) $(LIBS) -src/examples/bdjo_dump.$(OBJEXT): src/examples/$(am__dirstamp) \ - src/examples/$(DEPDIR)/$(am__dirstamp) +src/devtools/bdjo_dump.$(OBJEXT): src/devtools/$(am__dirstamp) \ + src/devtools/$(DEPDIR)/$(am__dirstamp) bdjo_dump$(EXEEXT): $(bdjo_dump_OBJECTS) $(bdjo_dump_DEPENDENCIES) $(EXTRA_bdjo_dump_DEPENDENCIES) @rm -f bdjo_dump$(EXEEXT) @@ -1290,17 +1344,17 @@ bdsplice$(EXEEXT): $(bdsplice_OBJECTS) $(bdsplice_DEPENDENCIES) $(EXTRA_bdsplice_DEPENDENCIES) @rm -f bdsplice$(EXEEXT) $(AM_V_CCLD)$(LINK) $(bdsplice_OBJECTS) $(bdsplice_LDADD) $(LIBS) -src/examples/clpi_dump-clpi_dump.$(OBJEXT): \ - src/examples/$(am__dirstamp) \ - src/examples/$(DEPDIR)/$(am__dirstamp) -src/examples/clpi_dump-util.$(OBJEXT): src/examples/$(am__dirstamp) \ - src/examples/$(DEPDIR)/$(am__dirstamp) +src/devtools/clpi_dump-clpi_dump.$(OBJEXT): \ + src/devtools/$(am__dirstamp) \ + src/devtools/$(DEPDIR)/$(am__dirstamp) +src/devtools/clpi_dump-util.$(OBJEXT): src/devtools/$(am__dirstamp) \ + src/devtools/$(DEPDIR)/$(am__dirstamp) clpi_dump$(EXEEXT): $(clpi_dump_OBJECTS) $(clpi_dump_DEPENDENCIES) $(EXTRA_clpi_dump_DEPENDENCIES) @rm -f clpi_dump$(EXEEXT) $(AM_V_CCLD)$(clpi_dump_LINK) $(clpi_dump_OBJECTS) $(clpi_dump_LDADD) $(LIBS) -src/examples/hdmv_test.$(OBJEXT): src/examples/$(am__dirstamp) \ - src/examples/$(DEPDIR)/$(am__dirstamp) +src/devtools/hdmv_test.$(OBJEXT): src/devtools/$(am__dirstamp) \ + src/devtools/$(DEPDIR)/$(am__dirstamp) hdmv_test$(EXEEXT): $(hdmv_test_OBJECTS) $(hdmv_test_DEPENDENCIES) $(EXTRA_hdmv_test_DEPENDENCIES) @rm -f hdmv_test$(EXEEXT) @@ -1323,9 +1377,9 @@ list_titles$(EXEEXT): $(list_titles_OBJECTS) $(list_titles_DEPENDENCIES) $(EXTRA_list_titles_DEPENDENCIES) @rm -f list_titles$(EXEEXT) $(AM_V_CCLD)$(LINK) $(list_titles_OBJECTS) $(list_titles_LDADD) $(LIBS) -src/examples/mobj_dump-mobj_dump.$(OBJEXT): \ - src/examples/$(am__dirstamp) \ - src/examples/$(DEPDIR)/$(am__dirstamp) +src/devtools/mobj_dump-mobj_dump.$(OBJEXT): \ + src/devtools/$(am__dirstamp) \ + src/devtools/$(DEPDIR)/$(am__dirstamp) src/libbluray/hdmv/mobj_dump-mobj_print.$(OBJEXT): \ src/libbluray/hdmv/$(am__dirstamp) \ src/libbluray/hdmv/$(DEPDIR)/$(am__dirstamp) @@ -1333,11 +1387,11 @@ mobj_dump$(EXEEXT): $(mobj_dump_OBJECTS) $(mobj_dump_DEPENDENCIES) $(EXTRA_mobj_dump_DEPENDENCIES) @rm -f mobj_dump$(EXEEXT) $(AM_V_CCLD)$(mobj_dump_LINK) $(mobj_dump_OBJECTS) $(mobj_dump_LDADD) $(LIBS) -src/examples/mpls_dump-mpls_dump.$(OBJEXT): \ - src/examples/$(am__dirstamp) \ - src/examples/$(DEPDIR)/$(am__dirstamp) -src/examples/mpls_dump-util.$(OBJEXT): src/examples/$(am__dirstamp) \ - src/examples/$(DEPDIR)/$(am__dirstamp) +src/devtools/mpls_dump-mpls_dump.$(OBJEXT): \ + src/devtools/$(am__dirstamp) \ + src/devtools/$(DEPDIR)/$(am__dirstamp) +src/devtools/mpls_dump-util.$(OBJEXT): src/devtools/$(am__dirstamp) \ + src/devtools/$(DEPDIR)/$(am__dirstamp) mpls_dump$(EXEEXT): $(mpls_dump_OBJECTS) $(mpls_dump_DEPENDENCIES) $(EXTRA_mpls_dump_DEPENDENCIES) @rm -f mpls_dump$(EXEEXT) @@ -1353,6 +1407,7 @@ -rm -f *.$(OBJEXT) -rm -f contrib/libudfread/src/*.$(OBJEXT) -rm -f contrib/libudfread/src/*.lo + -rm -f src/devtools/*.$(OBJEXT) -rm -f src/examples/*.$(OBJEXT) -rm -f src/file/*.$(OBJEXT) -rm -f src/file/*.lo @@ -1376,81 +1431,84 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@contrib/libudfread/src/$(DEPDIR)/default_blockinput.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@contrib/libudfread/src/$(DEPDIR)/ecma167.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@contrib/libudfread/src/$(DEPDIR)/udfread.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@contrib/libudfread/src/$(DEPDIR)/libbluray_la-default_blockinput.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@contrib/libudfread/src/$(DEPDIR)/libbluray_la-ecma167.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@contrib/libudfread/src/$(DEPDIR)/libbluray_la-udfread.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devtools/$(DEPDIR)/bdj_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devtools/$(DEPDIR)/bdjo_dump.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devtools/$(DEPDIR)/clpi_dump-clpi_dump.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devtools/$(DEPDIR)/clpi_dump-util.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devtools/$(DEPDIR)/hdmv_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devtools/$(DEPDIR)/mobj_dump-mobj_dump.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devtools/$(DEPDIR)/mpls_dump-mpls_dump.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devtools/$(DEPDIR)/mpls_dump-util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/bd_info.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/bdj_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/bdjo_dump.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/bdsplice.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/clpi_dump-clpi_dump.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/clpi_dump-util.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/hdmv_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/index_dump.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/libbluray_test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/list_titles.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/mobj_dump-mobj_dump.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/mpls_dump-mpls_dump.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/mpls_dump-util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/examples/$(DEPDIR)/sound_dump.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/dir_posix.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/dir_win32.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/dirs_darwin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/dirs_win32.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/dirs_xdg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/dl_posix.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/dl_win32.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/file.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/file_posix.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/file_win32.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/filesystem.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/mount.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/mount_darwin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/$(DEPDIR)/bluray.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/$(DEPDIR)/register.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/$(DEPDIR)/bdj.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/$(DEPDIR)/bdjo_parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/bdjo.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/java_awt_BDFontMetrics.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/java_awt_BDGraphics.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/org_videolan_Libbluray.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/org_videolan_Logger.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/register_native.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/util.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/bdid_parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/clpi_parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/extdata_parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/index_parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/meta_parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/mpls_parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/navigation.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/sound_parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/graphics_controller.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/graphics_processor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/ig_decode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/m2ts_demux.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/m2ts_filter.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/pes_buffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/pg_decode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/rle.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/textst_decode.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/textst_render.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/disc/$(DEPDIR)/aacs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/disc/$(DEPDIR)/bdplus.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/disc/$(DEPDIR)/dec.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/disc/$(DEPDIR)/disc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/disc/$(DEPDIR)/udf_fs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/hdmv/$(DEPDIR)/hdmv_vm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/libbluray_la-dir_posix.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/libbluray_la-dir_win32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/libbluray_la-dirs_darwin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/libbluray_la-dirs_win32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/libbluray_la-dirs_xdg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/libbluray_la-dl_posix.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/libbluray_la-dl_win32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/libbluray_la-file.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/libbluray_la-file_posix.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/libbluray_la-file_win32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/libbluray_la-filesystem.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/libbluray_la-mount.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/file/$(DEPDIR)/libbluray_la-mount_darwin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/$(DEPDIR)/libbluray_la-bluray.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/$(DEPDIR)/libbluray_la-register.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/$(DEPDIR)/libbluray_la-bdj.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/$(DEPDIR)/libbluray_la-bdjo_parse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-bdjo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-java_awt_BDFontMetrics.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-java_awt_BDGraphics.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-org_videolan_Libbluray.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-org_videolan_Logger.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-register_native.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-util.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/libbluray_la-bdid_parse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/libbluray_la-clpi_parse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/libbluray_la-extdata_parse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/libbluray_la-index_parse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/libbluray_la-meta_parse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/libbluray_la-mpls_parse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/libbluray_la-navigation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/libbluray_la-sound_parse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/bdnav/$(DEPDIR)/libbluray_la-uo_mask.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/libbluray_la-graphics_controller.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/libbluray_la-graphics_processor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/libbluray_la-ig_decode.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/libbluray_la-m2ts_demux.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/libbluray_la-m2ts_filter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/libbluray_la-pes_buffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/libbluray_la-pg_decode.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/libbluray_la-rle.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/libbluray_la-textst_decode.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/decoders/$(DEPDIR)/libbluray_la-textst_render.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/disc/$(DEPDIR)/libbluray_la-aacs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/disc/$(DEPDIR)/libbluray_la-bdplus.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/disc/$(DEPDIR)/libbluray_la-dec.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/disc/$(DEPDIR)/libbluray_la-disc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/disc/$(DEPDIR)/libbluray_la-properties.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/disc/$(DEPDIR)/libbluray_la-udf_fs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/hdmv/$(DEPDIR)/libbluray_la-hdmv_vm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/hdmv/$(DEPDIR)/libbluray_la-mobj_parse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/hdmv/$(DEPDIR)/libbluray_la-mobj_print.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_print.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/hdmv/$(DEPDIR)/mobj_parse.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/libbluray/hdmv/$(DEPDIR)/mobj_print.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/array.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/bits.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/logging.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/mutex.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/refcnt.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/strutl.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/time.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libbluray_la-array.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libbluray_la-bits.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libbluray_la-event_queue.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libbluray_la-logging.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libbluray_la-mutex.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libbluray_la-refcnt.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libbluray_la-strutl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/util/$(DEPDIR)/libbluray_la-time.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -1476,47 +1534,488 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -src/examples/clpi_dump-clpi_dump.o: src/examples/clpi_dump.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -MT src/examples/clpi_dump-clpi_dump.o -MD -MP -MF src/examples/$(DEPDIR)/clpi_dump-clpi_dump.Tpo -c -o src/examples/clpi_dump-clpi_dump.o `test -f 'src/examples/clpi_dump.c' || echo '$(srcdir)/'`src/examples/clpi_dump.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/examples/$(DEPDIR)/clpi_dump-clpi_dump.Tpo src/examples/$(DEPDIR)/clpi_dump-clpi_dump.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/examples/clpi_dump.c' object='src/examples/clpi_dump-clpi_dump.o' libtool=no @AMDEPBACKSLASH@ +src/file/libbluray_la-file.lo: src/file/file.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file/libbluray_la-file.lo -MD -MP -MF src/file/$(DEPDIR)/libbluray_la-file.Tpo -c -o src/file/libbluray_la-file.lo `test -f 'src/file/file.c' || echo '$(srcdir)/'`src/file/file.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/file/$(DEPDIR)/libbluray_la-file.Tpo src/file/$(DEPDIR)/libbluray_la-file.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file/file.c' object='src/file/libbluray_la-file.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file/libbluray_la-file.lo `test -f 'src/file/file.c' || echo '$(srcdir)/'`src/file/file.c + +src/file/libbluray_la-filesystem.lo: src/file/filesystem.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file/libbluray_la-filesystem.lo -MD -MP -MF src/file/$(DEPDIR)/libbluray_la-filesystem.Tpo -c -o src/file/libbluray_la-filesystem.lo `test -f 'src/file/filesystem.c' || echo '$(srcdir)/'`src/file/filesystem.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/file/$(DEPDIR)/libbluray_la-filesystem.Tpo src/file/$(DEPDIR)/libbluray_la-filesystem.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file/filesystem.c' object='src/file/libbluray_la-filesystem.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file/libbluray_la-filesystem.lo `test -f 'src/file/filesystem.c' || echo '$(srcdir)/'`src/file/filesystem.c + +src/libbluray/libbluray_la-bluray.lo: src/libbluray/bluray.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/libbluray_la-bluray.lo -MD -MP -MF src/libbluray/$(DEPDIR)/libbluray_la-bluray.Tpo -c -o src/libbluray/libbluray_la-bluray.lo `test -f 'src/libbluray/bluray.c' || echo '$(srcdir)/'`src/libbluray/bluray.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/$(DEPDIR)/libbluray_la-bluray.Tpo src/libbluray/$(DEPDIR)/libbluray_la-bluray.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bluray.c' object='src/libbluray/libbluray_la-bluray.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -c -o src/examples/clpi_dump-clpi_dump.o `test -f 'src/examples/clpi_dump.c' || echo '$(srcdir)/'`src/examples/clpi_dump.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/libbluray_la-bluray.lo `test -f 'src/libbluray/bluray.c' || echo '$(srcdir)/'`src/libbluray/bluray.c -src/examples/clpi_dump-clpi_dump.obj: src/examples/clpi_dump.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -MT src/examples/clpi_dump-clpi_dump.obj -MD -MP -MF src/examples/$(DEPDIR)/clpi_dump-clpi_dump.Tpo -c -o src/examples/clpi_dump-clpi_dump.obj `if test -f 'src/examples/clpi_dump.c'; then $(CYGPATH_W) 'src/examples/clpi_dump.c'; else $(CYGPATH_W) '$(srcdir)/src/examples/clpi_dump.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/examples/$(DEPDIR)/clpi_dump-clpi_dump.Tpo src/examples/$(DEPDIR)/clpi_dump-clpi_dump.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/examples/clpi_dump.c' object='src/examples/clpi_dump-clpi_dump.obj' libtool=no @AMDEPBACKSLASH@ +src/libbluray/libbluray_la-register.lo: src/libbluray/register.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/libbluray_la-register.lo -MD -MP -MF src/libbluray/$(DEPDIR)/libbluray_la-register.Tpo -c -o src/libbluray/libbluray_la-register.lo `test -f 'src/libbluray/register.c' || echo '$(srcdir)/'`src/libbluray/register.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/$(DEPDIR)/libbluray_la-register.Tpo src/libbluray/$(DEPDIR)/libbluray_la-register.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/register.c' object='src/libbluray/libbluray_la-register.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -c -o src/examples/clpi_dump-clpi_dump.obj `if test -f 'src/examples/clpi_dump.c'; then $(CYGPATH_W) 'src/examples/clpi_dump.c'; else $(CYGPATH_W) '$(srcdir)/src/examples/clpi_dump.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/libbluray_la-register.lo `test -f 'src/libbluray/register.c' || echo '$(srcdir)/'`src/libbluray/register.c -src/examples/clpi_dump-util.o: src/examples/util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -MT src/examples/clpi_dump-util.o -MD -MP -MF src/examples/$(DEPDIR)/clpi_dump-util.Tpo -c -o src/examples/clpi_dump-util.o `test -f 'src/examples/util.c' || echo '$(srcdir)/'`src/examples/util.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/examples/$(DEPDIR)/clpi_dump-util.Tpo src/examples/$(DEPDIR)/clpi_dump-util.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/examples/util.c' object='src/examples/clpi_dump-util.o' libtool=no @AMDEPBACKSLASH@ +src/libbluray/bdnav/libbluray_la-bdid_parse.lo: src/libbluray/bdnav/bdid_parse.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdnav/libbluray_la-bdid_parse.lo -MD -MP -MF src/libbluray/bdnav/$(DEPDIR)/libbluray_la-bdid_parse.Tpo -c -o src/libbluray/bdnav/libbluray_la-bdid_parse.lo `test -f 'src/libbluray/bdnav/bdid_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/bdid_parse.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdnav/$(DEPDIR)/libbluray_la-bdid_parse.Tpo src/libbluray/bdnav/$(DEPDIR)/libbluray_la-bdid_parse.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdnav/bdid_parse.c' object='src/libbluray/bdnav/libbluray_la-bdid_parse.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -c -o src/examples/clpi_dump-util.o `test -f 'src/examples/util.c' || echo '$(srcdir)/'`src/examples/util.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdnav/libbluray_la-bdid_parse.lo `test -f 'src/libbluray/bdnav/bdid_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/bdid_parse.c -src/examples/clpi_dump-util.obj: src/examples/util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -MT src/examples/clpi_dump-util.obj -MD -MP -MF src/examples/$(DEPDIR)/clpi_dump-util.Tpo -c -o src/examples/clpi_dump-util.obj `if test -f 'src/examples/util.c'; then $(CYGPATH_W) 'src/examples/util.c'; else $(CYGPATH_W) '$(srcdir)/src/examples/util.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/examples/$(DEPDIR)/clpi_dump-util.Tpo src/examples/$(DEPDIR)/clpi_dump-util.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/examples/util.c' object='src/examples/clpi_dump-util.obj' libtool=no @AMDEPBACKSLASH@ +src/libbluray/bdnav/libbluray_la-clpi_parse.lo: src/libbluray/bdnav/clpi_parse.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdnav/libbluray_la-clpi_parse.lo -MD -MP -MF src/libbluray/bdnav/$(DEPDIR)/libbluray_la-clpi_parse.Tpo -c -o src/libbluray/bdnav/libbluray_la-clpi_parse.lo `test -f 'src/libbluray/bdnav/clpi_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/clpi_parse.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdnav/$(DEPDIR)/libbluray_la-clpi_parse.Tpo src/libbluray/bdnav/$(DEPDIR)/libbluray_la-clpi_parse.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdnav/clpi_parse.c' object='src/libbluray/bdnav/libbluray_la-clpi_parse.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -c -o src/examples/clpi_dump-util.obj `if test -f 'src/examples/util.c'; then $(CYGPATH_W) 'src/examples/util.c'; else $(CYGPATH_W) '$(srcdir)/src/examples/util.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdnav/libbluray_la-clpi_parse.lo `test -f 'src/libbluray/bdnav/clpi_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/clpi_parse.c -src/examples/mobj_dump-mobj_dump.o: src/examples/mobj_dump.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT src/examples/mobj_dump-mobj_dump.o -MD -MP -MF src/examples/$(DEPDIR)/mobj_dump-mobj_dump.Tpo -c -o src/examples/mobj_dump-mobj_dump.o `test -f 'src/examples/mobj_dump.c' || echo '$(srcdir)/'`src/examples/mobj_dump.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/examples/$(DEPDIR)/mobj_dump-mobj_dump.Tpo src/examples/$(DEPDIR)/mobj_dump-mobj_dump.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/examples/mobj_dump.c' object='src/examples/mobj_dump-mobj_dump.o' libtool=no @AMDEPBACKSLASH@ +src/libbluray/bdnav/libbluray_la-extdata_parse.lo: src/libbluray/bdnav/extdata_parse.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdnav/libbluray_la-extdata_parse.lo -MD -MP -MF src/libbluray/bdnav/$(DEPDIR)/libbluray_la-extdata_parse.Tpo -c -o src/libbluray/bdnav/libbluray_la-extdata_parse.lo `test -f 'src/libbluray/bdnav/extdata_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/extdata_parse.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdnav/$(DEPDIR)/libbluray_la-extdata_parse.Tpo src/libbluray/bdnav/$(DEPDIR)/libbluray_la-extdata_parse.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdnav/extdata_parse.c' object='src/libbluray/bdnav/libbluray_la-extdata_parse.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o src/examples/mobj_dump-mobj_dump.o `test -f 'src/examples/mobj_dump.c' || echo '$(srcdir)/'`src/examples/mobj_dump.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdnav/libbluray_la-extdata_parse.lo `test -f 'src/libbluray/bdnav/extdata_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/extdata_parse.c -src/examples/mobj_dump-mobj_dump.obj: src/examples/mobj_dump.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT src/examples/mobj_dump-mobj_dump.obj -MD -MP -MF src/examples/$(DEPDIR)/mobj_dump-mobj_dump.Tpo -c -o src/examples/mobj_dump-mobj_dump.obj `if test -f 'src/examples/mobj_dump.c'; then $(CYGPATH_W) 'src/examples/mobj_dump.c'; else $(CYGPATH_W) '$(srcdir)/src/examples/mobj_dump.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/examples/$(DEPDIR)/mobj_dump-mobj_dump.Tpo src/examples/$(DEPDIR)/mobj_dump-mobj_dump.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/examples/mobj_dump.c' object='src/examples/mobj_dump-mobj_dump.obj' libtool=no @AMDEPBACKSLASH@ +src/libbluray/bdnav/libbluray_la-index_parse.lo: src/libbluray/bdnav/index_parse.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdnav/libbluray_la-index_parse.lo -MD -MP -MF src/libbluray/bdnav/$(DEPDIR)/libbluray_la-index_parse.Tpo -c -o src/libbluray/bdnav/libbluray_la-index_parse.lo `test -f 'src/libbluray/bdnav/index_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/index_parse.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdnav/$(DEPDIR)/libbluray_la-index_parse.Tpo src/libbluray/bdnav/$(DEPDIR)/libbluray_la-index_parse.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdnav/index_parse.c' object='src/libbluray/bdnav/libbluray_la-index_parse.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o src/examples/mobj_dump-mobj_dump.obj `if test -f 'src/examples/mobj_dump.c'; then $(CYGPATH_W) 'src/examples/mobj_dump.c'; else $(CYGPATH_W) '$(srcdir)/src/examples/mobj_dump.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdnav/libbluray_la-index_parse.lo `test -f 'src/libbluray/bdnav/index_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/index_parse.c + +src/libbluray/bdnav/libbluray_la-meta_parse.lo: src/libbluray/bdnav/meta_parse.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdnav/libbluray_la-meta_parse.lo -MD -MP -MF src/libbluray/bdnav/$(DEPDIR)/libbluray_la-meta_parse.Tpo -c -o src/libbluray/bdnav/libbluray_la-meta_parse.lo `test -f 'src/libbluray/bdnav/meta_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/meta_parse.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdnav/$(DEPDIR)/libbluray_la-meta_parse.Tpo src/libbluray/bdnav/$(DEPDIR)/libbluray_la-meta_parse.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdnav/meta_parse.c' object='src/libbluray/bdnav/libbluray_la-meta_parse.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdnav/libbluray_la-meta_parse.lo `test -f 'src/libbluray/bdnav/meta_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/meta_parse.c + +src/libbluray/bdnav/libbluray_la-mpls_parse.lo: src/libbluray/bdnav/mpls_parse.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdnav/libbluray_la-mpls_parse.lo -MD -MP -MF src/libbluray/bdnav/$(DEPDIR)/libbluray_la-mpls_parse.Tpo -c -o src/libbluray/bdnav/libbluray_la-mpls_parse.lo `test -f 'src/libbluray/bdnav/mpls_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/mpls_parse.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdnav/$(DEPDIR)/libbluray_la-mpls_parse.Tpo src/libbluray/bdnav/$(DEPDIR)/libbluray_la-mpls_parse.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdnav/mpls_parse.c' object='src/libbluray/bdnav/libbluray_la-mpls_parse.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdnav/libbluray_la-mpls_parse.lo `test -f 'src/libbluray/bdnav/mpls_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/mpls_parse.c + +src/libbluray/bdnav/libbluray_la-navigation.lo: src/libbluray/bdnav/navigation.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdnav/libbluray_la-navigation.lo -MD -MP -MF src/libbluray/bdnav/$(DEPDIR)/libbluray_la-navigation.Tpo -c -o src/libbluray/bdnav/libbluray_la-navigation.lo `test -f 'src/libbluray/bdnav/navigation.c' || echo '$(srcdir)/'`src/libbluray/bdnav/navigation.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdnav/$(DEPDIR)/libbluray_la-navigation.Tpo src/libbluray/bdnav/$(DEPDIR)/libbluray_la-navigation.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdnav/navigation.c' object='src/libbluray/bdnav/libbluray_la-navigation.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdnav/libbluray_la-navigation.lo `test -f 'src/libbluray/bdnav/navigation.c' || echo '$(srcdir)/'`src/libbluray/bdnav/navigation.c + +src/libbluray/bdnav/libbluray_la-sound_parse.lo: src/libbluray/bdnav/sound_parse.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdnav/libbluray_la-sound_parse.lo -MD -MP -MF src/libbluray/bdnav/$(DEPDIR)/libbluray_la-sound_parse.Tpo -c -o src/libbluray/bdnav/libbluray_la-sound_parse.lo `test -f 'src/libbluray/bdnav/sound_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/sound_parse.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdnav/$(DEPDIR)/libbluray_la-sound_parse.Tpo src/libbluray/bdnav/$(DEPDIR)/libbluray_la-sound_parse.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdnav/sound_parse.c' object='src/libbluray/bdnav/libbluray_la-sound_parse.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdnav/libbluray_la-sound_parse.lo `test -f 'src/libbluray/bdnav/sound_parse.c' || echo '$(srcdir)/'`src/libbluray/bdnav/sound_parse.c + +src/libbluray/bdnav/libbluray_la-uo_mask.lo: src/libbluray/bdnav/uo_mask.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdnav/libbluray_la-uo_mask.lo -MD -MP -MF src/libbluray/bdnav/$(DEPDIR)/libbluray_la-uo_mask.Tpo -c -o src/libbluray/bdnav/libbluray_la-uo_mask.lo `test -f 'src/libbluray/bdnav/uo_mask.c' || echo '$(srcdir)/'`src/libbluray/bdnav/uo_mask.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdnav/$(DEPDIR)/libbluray_la-uo_mask.Tpo src/libbluray/bdnav/$(DEPDIR)/libbluray_la-uo_mask.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdnav/uo_mask.c' object='src/libbluray/bdnav/libbluray_la-uo_mask.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdnav/libbluray_la-uo_mask.lo `test -f 'src/libbluray/bdnav/uo_mask.c' || echo '$(srcdir)/'`src/libbluray/bdnav/uo_mask.c + +src/libbluray/decoders/libbluray_la-graphics_controller.lo: src/libbluray/decoders/graphics_controller.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/decoders/libbluray_la-graphics_controller.lo -MD -MP -MF src/libbluray/decoders/$(DEPDIR)/libbluray_la-graphics_controller.Tpo -c -o src/libbluray/decoders/libbluray_la-graphics_controller.lo `test -f 'src/libbluray/decoders/graphics_controller.c' || echo '$(srcdir)/'`src/libbluray/decoders/graphics_controller.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/decoders/$(DEPDIR)/libbluray_la-graphics_controller.Tpo src/libbluray/decoders/$(DEPDIR)/libbluray_la-graphics_controller.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/decoders/graphics_controller.c' object='src/libbluray/decoders/libbluray_la-graphics_controller.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/decoders/libbluray_la-graphics_controller.lo `test -f 'src/libbluray/decoders/graphics_controller.c' || echo '$(srcdir)/'`src/libbluray/decoders/graphics_controller.c + +src/libbluray/decoders/libbluray_la-graphics_processor.lo: src/libbluray/decoders/graphics_processor.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/decoders/libbluray_la-graphics_processor.lo -MD -MP -MF src/libbluray/decoders/$(DEPDIR)/libbluray_la-graphics_processor.Tpo -c -o src/libbluray/decoders/libbluray_la-graphics_processor.lo `test -f 'src/libbluray/decoders/graphics_processor.c' || echo '$(srcdir)/'`src/libbluray/decoders/graphics_processor.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/decoders/$(DEPDIR)/libbluray_la-graphics_processor.Tpo src/libbluray/decoders/$(DEPDIR)/libbluray_la-graphics_processor.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/decoders/graphics_processor.c' object='src/libbluray/decoders/libbluray_la-graphics_processor.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/decoders/libbluray_la-graphics_processor.lo `test -f 'src/libbluray/decoders/graphics_processor.c' || echo '$(srcdir)/'`src/libbluray/decoders/graphics_processor.c + +src/libbluray/decoders/libbluray_la-ig_decode.lo: src/libbluray/decoders/ig_decode.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/decoders/libbluray_la-ig_decode.lo -MD -MP -MF src/libbluray/decoders/$(DEPDIR)/libbluray_la-ig_decode.Tpo -c -o src/libbluray/decoders/libbluray_la-ig_decode.lo `test -f 'src/libbluray/decoders/ig_decode.c' || echo '$(srcdir)/'`src/libbluray/decoders/ig_decode.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/decoders/$(DEPDIR)/libbluray_la-ig_decode.Tpo src/libbluray/decoders/$(DEPDIR)/libbluray_la-ig_decode.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/decoders/ig_decode.c' object='src/libbluray/decoders/libbluray_la-ig_decode.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/decoders/libbluray_la-ig_decode.lo `test -f 'src/libbluray/decoders/ig_decode.c' || echo '$(srcdir)/'`src/libbluray/decoders/ig_decode.c + +src/libbluray/decoders/libbluray_la-m2ts_demux.lo: src/libbluray/decoders/m2ts_demux.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/decoders/libbluray_la-m2ts_demux.lo -MD -MP -MF src/libbluray/decoders/$(DEPDIR)/libbluray_la-m2ts_demux.Tpo -c -o src/libbluray/decoders/libbluray_la-m2ts_demux.lo `test -f 'src/libbluray/decoders/m2ts_demux.c' || echo '$(srcdir)/'`src/libbluray/decoders/m2ts_demux.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/decoders/$(DEPDIR)/libbluray_la-m2ts_demux.Tpo src/libbluray/decoders/$(DEPDIR)/libbluray_la-m2ts_demux.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/decoders/m2ts_demux.c' object='src/libbluray/decoders/libbluray_la-m2ts_demux.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/decoders/libbluray_la-m2ts_demux.lo `test -f 'src/libbluray/decoders/m2ts_demux.c' || echo '$(srcdir)/'`src/libbluray/decoders/m2ts_demux.c + +src/libbluray/decoders/libbluray_la-m2ts_filter.lo: src/libbluray/decoders/m2ts_filter.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/decoders/libbluray_la-m2ts_filter.lo -MD -MP -MF src/libbluray/decoders/$(DEPDIR)/libbluray_la-m2ts_filter.Tpo -c -o src/libbluray/decoders/libbluray_la-m2ts_filter.lo `test -f 'src/libbluray/decoders/m2ts_filter.c' || echo '$(srcdir)/'`src/libbluray/decoders/m2ts_filter.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/decoders/$(DEPDIR)/libbluray_la-m2ts_filter.Tpo src/libbluray/decoders/$(DEPDIR)/libbluray_la-m2ts_filter.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/decoders/m2ts_filter.c' object='src/libbluray/decoders/libbluray_la-m2ts_filter.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/decoders/libbluray_la-m2ts_filter.lo `test -f 'src/libbluray/decoders/m2ts_filter.c' || echo '$(srcdir)/'`src/libbluray/decoders/m2ts_filter.c + +src/libbluray/decoders/libbluray_la-pg_decode.lo: src/libbluray/decoders/pg_decode.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/decoders/libbluray_la-pg_decode.lo -MD -MP -MF src/libbluray/decoders/$(DEPDIR)/libbluray_la-pg_decode.Tpo -c -o src/libbluray/decoders/libbluray_la-pg_decode.lo `test -f 'src/libbluray/decoders/pg_decode.c' || echo '$(srcdir)/'`src/libbluray/decoders/pg_decode.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/decoders/$(DEPDIR)/libbluray_la-pg_decode.Tpo src/libbluray/decoders/$(DEPDIR)/libbluray_la-pg_decode.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/decoders/pg_decode.c' object='src/libbluray/decoders/libbluray_la-pg_decode.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/decoders/libbluray_la-pg_decode.lo `test -f 'src/libbluray/decoders/pg_decode.c' || echo '$(srcdir)/'`src/libbluray/decoders/pg_decode.c + +src/libbluray/decoders/libbluray_la-pes_buffer.lo: src/libbluray/decoders/pes_buffer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/decoders/libbluray_la-pes_buffer.lo -MD -MP -MF src/libbluray/decoders/$(DEPDIR)/libbluray_la-pes_buffer.Tpo -c -o src/libbluray/decoders/libbluray_la-pes_buffer.lo `test -f 'src/libbluray/decoders/pes_buffer.c' || echo '$(srcdir)/'`src/libbluray/decoders/pes_buffer.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/decoders/$(DEPDIR)/libbluray_la-pes_buffer.Tpo src/libbluray/decoders/$(DEPDIR)/libbluray_la-pes_buffer.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/decoders/pes_buffer.c' object='src/libbluray/decoders/libbluray_la-pes_buffer.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/decoders/libbluray_la-pes_buffer.lo `test -f 'src/libbluray/decoders/pes_buffer.c' || echo '$(srcdir)/'`src/libbluray/decoders/pes_buffer.c + +src/libbluray/decoders/libbluray_la-rle.lo: src/libbluray/decoders/rle.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/decoders/libbluray_la-rle.lo -MD -MP -MF src/libbluray/decoders/$(DEPDIR)/libbluray_la-rle.Tpo -c -o src/libbluray/decoders/libbluray_la-rle.lo `test -f 'src/libbluray/decoders/rle.c' || echo '$(srcdir)/'`src/libbluray/decoders/rle.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/decoders/$(DEPDIR)/libbluray_la-rle.Tpo src/libbluray/decoders/$(DEPDIR)/libbluray_la-rle.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/decoders/rle.c' object='src/libbluray/decoders/libbluray_la-rle.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/decoders/libbluray_la-rle.lo `test -f 'src/libbluray/decoders/rle.c' || echo '$(srcdir)/'`src/libbluray/decoders/rle.c + +src/libbluray/decoders/libbluray_la-textst_decode.lo: src/libbluray/decoders/textst_decode.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/decoders/libbluray_la-textst_decode.lo -MD -MP -MF src/libbluray/decoders/$(DEPDIR)/libbluray_la-textst_decode.Tpo -c -o src/libbluray/decoders/libbluray_la-textst_decode.lo `test -f 'src/libbluray/decoders/textst_decode.c' || echo '$(srcdir)/'`src/libbluray/decoders/textst_decode.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/decoders/$(DEPDIR)/libbluray_la-textst_decode.Tpo src/libbluray/decoders/$(DEPDIR)/libbluray_la-textst_decode.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/decoders/textst_decode.c' object='src/libbluray/decoders/libbluray_la-textst_decode.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/decoders/libbluray_la-textst_decode.lo `test -f 'src/libbluray/decoders/textst_decode.c' || echo '$(srcdir)/'`src/libbluray/decoders/textst_decode.c + +src/libbluray/decoders/libbluray_la-textst_render.lo: src/libbluray/decoders/textst_render.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/decoders/libbluray_la-textst_render.lo -MD -MP -MF src/libbluray/decoders/$(DEPDIR)/libbluray_la-textst_render.Tpo -c -o src/libbluray/decoders/libbluray_la-textst_render.lo `test -f 'src/libbluray/decoders/textst_render.c' || echo '$(srcdir)/'`src/libbluray/decoders/textst_render.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/decoders/$(DEPDIR)/libbluray_la-textst_render.Tpo src/libbluray/decoders/$(DEPDIR)/libbluray_la-textst_render.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/decoders/textst_render.c' object='src/libbluray/decoders/libbluray_la-textst_render.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/decoders/libbluray_la-textst_render.lo `test -f 'src/libbluray/decoders/textst_render.c' || echo '$(srcdir)/'`src/libbluray/decoders/textst_render.c + +src/libbluray/disc/libbluray_la-aacs.lo: src/libbluray/disc/aacs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/disc/libbluray_la-aacs.lo -MD -MP -MF src/libbluray/disc/$(DEPDIR)/libbluray_la-aacs.Tpo -c -o src/libbluray/disc/libbluray_la-aacs.lo `test -f 'src/libbluray/disc/aacs.c' || echo '$(srcdir)/'`src/libbluray/disc/aacs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/disc/$(DEPDIR)/libbluray_la-aacs.Tpo src/libbluray/disc/$(DEPDIR)/libbluray_la-aacs.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/disc/aacs.c' object='src/libbluray/disc/libbluray_la-aacs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/disc/libbluray_la-aacs.lo `test -f 'src/libbluray/disc/aacs.c' || echo '$(srcdir)/'`src/libbluray/disc/aacs.c + +src/libbluray/disc/libbluray_la-bdplus.lo: src/libbluray/disc/bdplus.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/disc/libbluray_la-bdplus.lo -MD -MP -MF src/libbluray/disc/$(DEPDIR)/libbluray_la-bdplus.Tpo -c -o src/libbluray/disc/libbluray_la-bdplus.lo `test -f 'src/libbluray/disc/bdplus.c' || echo '$(srcdir)/'`src/libbluray/disc/bdplus.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/disc/$(DEPDIR)/libbluray_la-bdplus.Tpo src/libbluray/disc/$(DEPDIR)/libbluray_la-bdplus.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/disc/bdplus.c' object='src/libbluray/disc/libbluray_la-bdplus.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/disc/libbluray_la-bdplus.lo `test -f 'src/libbluray/disc/bdplus.c' || echo '$(srcdir)/'`src/libbluray/disc/bdplus.c + +src/libbluray/disc/libbluray_la-dec.lo: src/libbluray/disc/dec.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/disc/libbluray_la-dec.lo -MD -MP -MF src/libbluray/disc/$(DEPDIR)/libbluray_la-dec.Tpo -c -o src/libbluray/disc/libbluray_la-dec.lo `test -f 'src/libbluray/disc/dec.c' || echo '$(srcdir)/'`src/libbluray/disc/dec.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/disc/$(DEPDIR)/libbluray_la-dec.Tpo src/libbluray/disc/$(DEPDIR)/libbluray_la-dec.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/disc/dec.c' object='src/libbluray/disc/libbluray_la-dec.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/disc/libbluray_la-dec.lo `test -f 'src/libbluray/disc/dec.c' || echo '$(srcdir)/'`src/libbluray/disc/dec.c + +src/libbluray/disc/libbluray_la-disc.lo: src/libbluray/disc/disc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/disc/libbluray_la-disc.lo -MD -MP -MF src/libbluray/disc/$(DEPDIR)/libbluray_la-disc.Tpo -c -o src/libbluray/disc/libbluray_la-disc.lo `test -f 'src/libbluray/disc/disc.c' || echo '$(srcdir)/'`src/libbluray/disc/disc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/disc/$(DEPDIR)/libbluray_la-disc.Tpo src/libbluray/disc/$(DEPDIR)/libbluray_la-disc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/disc/disc.c' object='src/libbluray/disc/libbluray_la-disc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/disc/libbluray_la-disc.lo `test -f 'src/libbluray/disc/disc.c' || echo '$(srcdir)/'`src/libbluray/disc/disc.c + +src/libbluray/disc/libbluray_la-properties.lo: src/libbluray/disc/properties.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/disc/libbluray_la-properties.lo -MD -MP -MF src/libbluray/disc/$(DEPDIR)/libbluray_la-properties.Tpo -c -o src/libbluray/disc/libbluray_la-properties.lo `test -f 'src/libbluray/disc/properties.c' || echo '$(srcdir)/'`src/libbluray/disc/properties.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/disc/$(DEPDIR)/libbluray_la-properties.Tpo src/libbluray/disc/$(DEPDIR)/libbluray_la-properties.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/disc/properties.c' object='src/libbluray/disc/libbluray_la-properties.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/disc/libbluray_la-properties.lo `test -f 'src/libbluray/disc/properties.c' || echo '$(srcdir)/'`src/libbluray/disc/properties.c + +src/libbluray/hdmv/libbluray_la-hdmv_vm.lo: src/libbluray/hdmv/hdmv_vm.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/hdmv/libbluray_la-hdmv_vm.lo -MD -MP -MF src/libbluray/hdmv/$(DEPDIR)/libbluray_la-hdmv_vm.Tpo -c -o src/libbluray/hdmv/libbluray_la-hdmv_vm.lo `test -f 'src/libbluray/hdmv/hdmv_vm.c' || echo '$(srcdir)/'`src/libbluray/hdmv/hdmv_vm.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/hdmv/$(DEPDIR)/libbluray_la-hdmv_vm.Tpo src/libbluray/hdmv/$(DEPDIR)/libbluray_la-hdmv_vm.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/hdmv/hdmv_vm.c' object='src/libbluray/hdmv/libbluray_la-hdmv_vm.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/hdmv/libbluray_la-hdmv_vm.lo `test -f 'src/libbluray/hdmv/hdmv_vm.c' || echo '$(srcdir)/'`src/libbluray/hdmv/hdmv_vm.c + +src/libbluray/hdmv/libbluray_la-mobj_parse.lo: src/libbluray/hdmv/mobj_parse.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/hdmv/libbluray_la-mobj_parse.lo -MD -MP -MF src/libbluray/hdmv/$(DEPDIR)/libbluray_la-mobj_parse.Tpo -c -o src/libbluray/hdmv/libbluray_la-mobj_parse.lo `test -f 'src/libbluray/hdmv/mobj_parse.c' || echo '$(srcdir)/'`src/libbluray/hdmv/mobj_parse.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/hdmv/$(DEPDIR)/libbluray_la-mobj_parse.Tpo src/libbluray/hdmv/$(DEPDIR)/libbluray_la-mobj_parse.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/hdmv/mobj_parse.c' object='src/libbluray/hdmv/libbluray_la-mobj_parse.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/hdmv/libbluray_la-mobj_parse.lo `test -f 'src/libbluray/hdmv/mobj_parse.c' || echo '$(srcdir)/'`src/libbluray/hdmv/mobj_parse.c + +src/libbluray/hdmv/libbluray_la-mobj_print.lo: src/libbluray/hdmv/mobj_print.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/hdmv/libbluray_la-mobj_print.lo -MD -MP -MF src/libbluray/hdmv/$(DEPDIR)/libbluray_la-mobj_print.Tpo -c -o src/libbluray/hdmv/libbluray_la-mobj_print.lo `test -f 'src/libbluray/hdmv/mobj_print.c' || echo '$(srcdir)/'`src/libbluray/hdmv/mobj_print.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/hdmv/$(DEPDIR)/libbluray_la-mobj_print.Tpo src/libbluray/hdmv/$(DEPDIR)/libbluray_la-mobj_print.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/hdmv/mobj_print.c' object='src/libbluray/hdmv/libbluray_la-mobj_print.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/hdmv/libbluray_la-mobj_print.lo `test -f 'src/libbluray/hdmv/mobj_print.c' || echo '$(srcdir)/'`src/libbluray/hdmv/mobj_print.c + +src/util/libbluray_la-array.lo: src/util/array.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/util/libbluray_la-array.lo -MD -MP -MF src/util/$(DEPDIR)/libbluray_la-array.Tpo -c -o src/util/libbluray_la-array.lo `test -f 'src/util/array.c' || echo '$(srcdir)/'`src/util/array.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/util/$(DEPDIR)/libbluray_la-array.Tpo src/util/$(DEPDIR)/libbluray_la-array.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/util/array.c' object='src/util/libbluray_la-array.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/util/libbluray_la-array.lo `test -f 'src/util/array.c' || echo '$(srcdir)/'`src/util/array.c + +src/util/libbluray_la-bits.lo: src/util/bits.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/util/libbluray_la-bits.lo -MD -MP -MF src/util/$(DEPDIR)/libbluray_la-bits.Tpo -c -o src/util/libbluray_la-bits.lo `test -f 'src/util/bits.c' || echo '$(srcdir)/'`src/util/bits.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/util/$(DEPDIR)/libbluray_la-bits.Tpo src/util/$(DEPDIR)/libbluray_la-bits.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/util/bits.c' object='src/util/libbluray_la-bits.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/util/libbluray_la-bits.lo `test -f 'src/util/bits.c' || echo '$(srcdir)/'`src/util/bits.c + +src/util/libbluray_la-event_queue.lo: src/util/event_queue.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/util/libbluray_la-event_queue.lo -MD -MP -MF src/util/$(DEPDIR)/libbluray_la-event_queue.Tpo -c -o src/util/libbluray_la-event_queue.lo `test -f 'src/util/event_queue.c' || echo '$(srcdir)/'`src/util/event_queue.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/util/$(DEPDIR)/libbluray_la-event_queue.Tpo src/util/$(DEPDIR)/libbluray_la-event_queue.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/util/event_queue.c' object='src/util/libbluray_la-event_queue.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/util/libbluray_la-event_queue.lo `test -f 'src/util/event_queue.c' || echo '$(srcdir)/'`src/util/event_queue.c + +src/util/libbluray_la-logging.lo: src/util/logging.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/util/libbluray_la-logging.lo -MD -MP -MF src/util/$(DEPDIR)/libbluray_la-logging.Tpo -c -o src/util/libbluray_la-logging.lo `test -f 'src/util/logging.c' || echo '$(srcdir)/'`src/util/logging.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/util/$(DEPDIR)/libbluray_la-logging.Tpo src/util/$(DEPDIR)/libbluray_la-logging.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/util/logging.c' object='src/util/libbluray_la-logging.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/util/libbluray_la-logging.lo `test -f 'src/util/logging.c' || echo '$(srcdir)/'`src/util/logging.c + +src/util/libbluray_la-mutex.lo: src/util/mutex.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/util/libbluray_la-mutex.lo -MD -MP -MF src/util/$(DEPDIR)/libbluray_la-mutex.Tpo -c -o src/util/libbluray_la-mutex.lo `test -f 'src/util/mutex.c' || echo '$(srcdir)/'`src/util/mutex.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/util/$(DEPDIR)/libbluray_la-mutex.Tpo src/util/$(DEPDIR)/libbluray_la-mutex.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/util/mutex.c' object='src/util/libbluray_la-mutex.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/util/libbluray_la-mutex.lo `test -f 'src/util/mutex.c' || echo '$(srcdir)/'`src/util/mutex.c + +src/util/libbluray_la-refcnt.lo: src/util/refcnt.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/util/libbluray_la-refcnt.lo -MD -MP -MF src/util/$(DEPDIR)/libbluray_la-refcnt.Tpo -c -o src/util/libbluray_la-refcnt.lo `test -f 'src/util/refcnt.c' || echo '$(srcdir)/'`src/util/refcnt.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/util/$(DEPDIR)/libbluray_la-refcnt.Tpo src/util/$(DEPDIR)/libbluray_la-refcnt.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/util/refcnt.c' object='src/util/libbluray_la-refcnt.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/util/libbluray_la-refcnt.lo `test -f 'src/util/refcnt.c' || echo '$(srcdir)/'`src/util/refcnt.c + +src/util/libbluray_la-strutl.lo: src/util/strutl.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/util/libbluray_la-strutl.lo -MD -MP -MF src/util/$(DEPDIR)/libbluray_la-strutl.Tpo -c -o src/util/libbluray_la-strutl.lo `test -f 'src/util/strutl.c' || echo '$(srcdir)/'`src/util/strutl.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/util/$(DEPDIR)/libbluray_la-strutl.Tpo src/util/$(DEPDIR)/libbluray_la-strutl.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/util/strutl.c' object='src/util/libbluray_la-strutl.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/util/libbluray_la-strutl.lo `test -f 'src/util/strutl.c' || echo '$(srcdir)/'`src/util/strutl.c + +src/util/libbluray_la-time.lo: src/util/time.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/util/libbluray_la-time.lo -MD -MP -MF src/util/$(DEPDIR)/libbluray_la-time.Tpo -c -o src/util/libbluray_la-time.lo `test -f 'src/util/time.c' || echo '$(srcdir)/'`src/util/time.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/util/$(DEPDIR)/libbluray_la-time.Tpo src/util/$(DEPDIR)/libbluray_la-time.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/util/time.c' object='src/util/libbluray_la-time.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/util/libbluray_la-time.lo `test -f 'src/util/time.c' || echo '$(srcdir)/'`src/util/time.c + +src/libbluray/bdj/libbluray_la-bdj.lo: src/libbluray/bdj/bdj.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdj/libbluray_la-bdj.lo -MD -MP -MF src/libbluray/bdj/$(DEPDIR)/libbluray_la-bdj.Tpo -c -o src/libbluray/bdj/libbluray_la-bdj.lo `test -f 'src/libbluray/bdj/bdj.c' || echo '$(srcdir)/'`src/libbluray/bdj/bdj.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdj/$(DEPDIR)/libbluray_la-bdj.Tpo src/libbluray/bdj/$(DEPDIR)/libbluray_la-bdj.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdj/bdj.c' object='src/libbluray/bdj/libbluray_la-bdj.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdj/libbluray_la-bdj.lo `test -f 'src/libbluray/bdj/bdj.c' || echo '$(srcdir)/'`src/libbluray/bdj/bdj.c + +src/libbluray/bdj/libbluray_la-bdjo_parse.lo: src/libbluray/bdj/bdjo_parse.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdj/libbluray_la-bdjo_parse.lo -MD -MP -MF src/libbluray/bdj/$(DEPDIR)/libbluray_la-bdjo_parse.Tpo -c -o src/libbluray/bdj/libbluray_la-bdjo_parse.lo `test -f 'src/libbluray/bdj/bdjo_parse.c' || echo '$(srcdir)/'`src/libbluray/bdj/bdjo_parse.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdj/$(DEPDIR)/libbluray_la-bdjo_parse.Tpo src/libbluray/bdj/$(DEPDIR)/libbluray_la-bdjo_parse.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdj/bdjo_parse.c' object='src/libbluray/bdj/libbluray_la-bdjo_parse.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdj/libbluray_la-bdjo_parse.lo `test -f 'src/libbluray/bdj/bdjo_parse.c' || echo '$(srcdir)/'`src/libbluray/bdj/bdjo_parse.c + +src/libbluray/bdj/native/libbluray_la-bdjo.lo: src/libbluray/bdj/native/bdjo.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdj/native/libbluray_la-bdjo.lo -MD -MP -MF src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-bdjo.Tpo -c -o src/libbluray/bdj/native/libbluray_la-bdjo.lo `test -f 'src/libbluray/bdj/native/bdjo.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/bdjo.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-bdjo.Tpo src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-bdjo.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdj/native/bdjo.c' object='src/libbluray/bdj/native/libbluray_la-bdjo.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdj/native/libbluray_la-bdjo.lo `test -f 'src/libbluray/bdj/native/bdjo.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/bdjo.c + +src/libbluray/bdj/native/libbluray_la-java_awt_BDFontMetrics.lo: src/libbluray/bdj/native/java_awt_BDFontMetrics.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdj/native/libbluray_la-java_awt_BDFontMetrics.lo -MD -MP -MF src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-java_awt_BDFontMetrics.Tpo -c -o src/libbluray/bdj/native/libbluray_la-java_awt_BDFontMetrics.lo `test -f 'src/libbluray/bdj/native/java_awt_BDFontMetrics.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/java_awt_BDFontMetrics.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-java_awt_BDFontMetrics.Tpo src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-java_awt_BDFontMetrics.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdj/native/java_awt_BDFontMetrics.c' object='src/libbluray/bdj/native/libbluray_la-java_awt_BDFontMetrics.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdj/native/libbluray_la-java_awt_BDFontMetrics.lo `test -f 'src/libbluray/bdj/native/java_awt_BDFontMetrics.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/java_awt_BDFontMetrics.c + +src/libbluray/bdj/native/libbluray_la-java_awt_BDGraphics.lo: src/libbluray/bdj/native/java_awt_BDGraphics.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdj/native/libbluray_la-java_awt_BDGraphics.lo -MD -MP -MF src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-java_awt_BDGraphics.Tpo -c -o src/libbluray/bdj/native/libbluray_la-java_awt_BDGraphics.lo `test -f 'src/libbluray/bdj/native/java_awt_BDGraphics.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/java_awt_BDGraphics.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-java_awt_BDGraphics.Tpo src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-java_awt_BDGraphics.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdj/native/java_awt_BDGraphics.c' object='src/libbluray/bdj/native/libbluray_la-java_awt_BDGraphics.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdj/native/libbluray_la-java_awt_BDGraphics.lo `test -f 'src/libbluray/bdj/native/java_awt_BDGraphics.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/java_awt_BDGraphics.c + +src/libbluray/bdj/native/libbluray_la-org_videolan_Libbluray.lo: src/libbluray/bdj/native/org_videolan_Libbluray.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdj/native/libbluray_la-org_videolan_Libbluray.lo -MD -MP -MF src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-org_videolan_Libbluray.Tpo -c -o src/libbluray/bdj/native/libbluray_la-org_videolan_Libbluray.lo `test -f 'src/libbluray/bdj/native/org_videolan_Libbluray.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/org_videolan_Libbluray.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-org_videolan_Libbluray.Tpo src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-org_videolan_Libbluray.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdj/native/org_videolan_Libbluray.c' object='src/libbluray/bdj/native/libbluray_la-org_videolan_Libbluray.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdj/native/libbluray_la-org_videolan_Libbluray.lo `test -f 'src/libbluray/bdj/native/org_videolan_Libbluray.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/org_videolan_Libbluray.c + +src/libbluray/bdj/native/libbluray_la-org_videolan_Logger.lo: src/libbluray/bdj/native/org_videolan_Logger.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdj/native/libbluray_la-org_videolan_Logger.lo -MD -MP -MF src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-org_videolan_Logger.Tpo -c -o src/libbluray/bdj/native/libbluray_la-org_videolan_Logger.lo `test -f 'src/libbluray/bdj/native/org_videolan_Logger.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/org_videolan_Logger.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-org_videolan_Logger.Tpo src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-org_videolan_Logger.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdj/native/org_videolan_Logger.c' object='src/libbluray/bdj/native/libbluray_la-org_videolan_Logger.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdj/native/libbluray_la-org_videolan_Logger.lo `test -f 'src/libbluray/bdj/native/org_videolan_Logger.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/org_videolan_Logger.c + +src/libbluray/bdj/native/libbluray_la-register_native.lo: src/libbluray/bdj/native/register_native.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdj/native/libbluray_la-register_native.lo -MD -MP -MF src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-register_native.Tpo -c -o src/libbluray/bdj/native/libbluray_la-register_native.lo `test -f 'src/libbluray/bdj/native/register_native.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/register_native.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-register_native.Tpo src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-register_native.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdj/native/register_native.c' object='src/libbluray/bdj/native/libbluray_la-register_native.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdj/native/libbluray_la-register_native.lo `test -f 'src/libbluray/bdj/native/register_native.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/register_native.c + +src/libbluray/bdj/native/libbluray_la-util.lo: src/libbluray/bdj/native/util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/bdj/native/libbluray_la-util.lo -MD -MP -MF src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-util.Tpo -c -o src/libbluray/bdj/native/libbluray_la-util.lo `test -f 'src/libbluray/bdj/native/util.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-util.Tpo src/libbluray/bdj/native/$(DEPDIR)/libbluray_la-util.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/bdj/native/util.c' object='src/libbluray/bdj/native/libbluray_la-util.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/bdj/native/libbluray_la-util.lo `test -f 'src/libbluray/bdj/native/util.c' || echo '$(srcdir)/'`src/libbluray/bdj/native/util.c + +src/libbluray/disc/libbluray_la-udf_fs.lo: src/libbluray/disc/udf_fs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/libbluray/disc/libbluray_la-udf_fs.lo -MD -MP -MF src/libbluray/disc/$(DEPDIR)/libbluray_la-udf_fs.Tpo -c -o src/libbluray/disc/libbluray_la-udf_fs.lo `test -f 'src/libbluray/disc/udf_fs.c' || echo '$(srcdir)/'`src/libbluray/disc/udf_fs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/libbluray/disc/$(DEPDIR)/libbluray_la-udf_fs.Tpo src/libbluray/disc/$(DEPDIR)/libbluray_la-udf_fs.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/libbluray/disc/udf_fs.c' object='src/libbluray/disc/libbluray_la-udf_fs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/libbluray/disc/libbluray_la-udf_fs.lo `test -f 'src/libbluray/disc/udf_fs.c' || echo '$(srcdir)/'`src/libbluray/disc/udf_fs.c + +contrib/libudfread/src/libbluray_la-default_blockinput.lo: contrib/libudfread/src/default_blockinput.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT contrib/libudfread/src/libbluray_la-default_blockinput.lo -MD -MP -MF contrib/libudfread/src/$(DEPDIR)/libbluray_la-default_blockinput.Tpo -c -o contrib/libudfread/src/libbluray_la-default_blockinput.lo `test -f 'contrib/libudfread/src/default_blockinput.c' || echo '$(srcdir)/'`contrib/libudfread/src/default_blockinput.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) contrib/libudfread/src/$(DEPDIR)/libbluray_la-default_blockinput.Tpo contrib/libudfread/src/$(DEPDIR)/libbluray_la-default_blockinput.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='contrib/libudfread/src/default_blockinput.c' object='contrib/libudfread/src/libbluray_la-default_blockinput.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o contrib/libudfread/src/libbluray_la-default_blockinput.lo `test -f 'contrib/libudfread/src/default_blockinput.c' || echo '$(srcdir)/'`contrib/libudfread/src/default_blockinput.c + +contrib/libudfread/src/libbluray_la-ecma167.lo: contrib/libudfread/src/ecma167.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT contrib/libudfread/src/libbluray_la-ecma167.lo -MD -MP -MF contrib/libudfread/src/$(DEPDIR)/libbluray_la-ecma167.Tpo -c -o contrib/libudfread/src/libbluray_la-ecma167.lo `test -f 'contrib/libudfread/src/ecma167.c' || echo '$(srcdir)/'`contrib/libudfread/src/ecma167.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) contrib/libudfread/src/$(DEPDIR)/libbluray_la-ecma167.Tpo contrib/libudfread/src/$(DEPDIR)/libbluray_la-ecma167.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='contrib/libudfread/src/ecma167.c' object='contrib/libudfread/src/libbluray_la-ecma167.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o contrib/libudfread/src/libbluray_la-ecma167.lo `test -f 'contrib/libudfread/src/ecma167.c' || echo '$(srcdir)/'`contrib/libudfread/src/ecma167.c + +contrib/libudfread/src/libbluray_la-udfread.lo: contrib/libudfread/src/udfread.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT contrib/libudfread/src/libbluray_la-udfread.lo -MD -MP -MF contrib/libudfread/src/$(DEPDIR)/libbluray_la-udfread.Tpo -c -o contrib/libudfread/src/libbluray_la-udfread.lo `test -f 'contrib/libudfread/src/udfread.c' || echo '$(srcdir)/'`contrib/libudfread/src/udfread.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) contrib/libudfread/src/$(DEPDIR)/libbluray_la-udfread.Tpo contrib/libudfread/src/$(DEPDIR)/libbluray_la-udfread.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='contrib/libudfread/src/udfread.c' object='contrib/libudfread/src/libbluray_la-udfread.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o contrib/libudfread/src/libbluray_la-udfread.lo `test -f 'contrib/libudfread/src/udfread.c' || echo '$(srcdir)/'`contrib/libudfread/src/udfread.c + +src/file/libbluray_la-dir_posix.lo: src/file/dir_posix.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file/libbluray_la-dir_posix.lo -MD -MP -MF src/file/$(DEPDIR)/libbluray_la-dir_posix.Tpo -c -o src/file/libbluray_la-dir_posix.lo `test -f 'src/file/dir_posix.c' || echo '$(srcdir)/'`src/file/dir_posix.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/file/$(DEPDIR)/libbluray_la-dir_posix.Tpo src/file/$(DEPDIR)/libbluray_la-dir_posix.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file/dir_posix.c' object='src/file/libbluray_la-dir_posix.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file/libbluray_la-dir_posix.lo `test -f 'src/file/dir_posix.c' || echo '$(srcdir)/'`src/file/dir_posix.c + +src/file/libbluray_la-dirs_darwin.lo: src/file/dirs_darwin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file/libbluray_la-dirs_darwin.lo -MD -MP -MF src/file/$(DEPDIR)/libbluray_la-dirs_darwin.Tpo -c -o src/file/libbluray_la-dirs_darwin.lo `test -f 'src/file/dirs_darwin.c' || echo '$(srcdir)/'`src/file/dirs_darwin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/file/$(DEPDIR)/libbluray_la-dirs_darwin.Tpo src/file/$(DEPDIR)/libbluray_la-dirs_darwin.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file/dirs_darwin.c' object='src/file/libbluray_la-dirs_darwin.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file/libbluray_la-dirs_darwin.lo `test -f 'src/file/dirs_darwin.c' || echo '$(srcdir)/'`src/file/dirs_darwin.c + +src/file/libbluray_la-dl_posix.lo: src/file/dl_posix.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file/libbluray_la-dl_posix.lo -MD -MP -MF src/file/$(DEPDIR)/libbluray_la-dl_posix.Tpo -c -o src/file/libbluray_la-dl_posix.lo `test -f 'src/file/dl_posix.c' || echo '$(srcdir)/'`src/file/dl_posix.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/file/$(DEPDIR)/libbluray_la-dl_posix.Tpo src/file/$(DEPDIR)/libbluray_la-dl_posix.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file/dl_posix.c' object='src/file/libbluray_la-dl_posix.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file/libbluray_la-dl_posix.lo `test -f 'src/file/dl_posix.c' || echo '$(srcdir)/'`src/file/dl_posix.c + +src/file/libbluray_la-file_posix.lo: src/file/file_posix.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file/libbluray_la-file_posix.lo -MD -MP -MF src/file/$(DEPDIR)/libbluray_la-file_posix.Tpo -c -o src/file/libbluray_la-file_posix.lo `test -f 'src/file/file_posix.c' || echo '$(srcdir)/'`src/file/file_posix.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/file/$(DEPDIR)/libbluray_la-file_posix.Tpo src/file/$(DEPDIR)/libbluray_la-file_posix.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file/file_posix.c' object='src/file/libbluray_la-file_posix.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file/libbluray_la-file_posix.lo `test -f 'src/file/file_posix.c' || echo '$(srcdir)/'`src/file/file_posix.c + +src/file/libbluray_la-mount_darwin.lo: src/file/mount_darwin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file/libbluray_la-mount_darwin.lo -MD -MP -MF src/file/$(DEPDIR)/libbluray_la-mount_darwin.Tpo -c -o src/file/libbluray_la-mount_darwin.lo `test -f 'src/file/mount_darwin.c' || echo '$(srcdir)/'`src/file/mount_darwin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/file/$(DEPDIR)/libbluray_la-mount_darwin.Tpo src/file/$(DEPDIR)/libbluray_la-mount_darwin.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file/mount_darwin.c' object='src/file/libbluray_la-mount_darwin.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file/libbluray_la-mount_darwin.lo `test -f 'src/file/mount_darwin.c' || echo '$(srcdir)/'`src/file/mount_darwin.c + +src/file/libbluray_la-dir_win32.lo: src/file/dir_win32.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file/libbluray_la-dir_win32.lo -MD -MP -MF src/file/$(DEPDIR)/libbluray_la-dir_win32.Tpo -c -o src/file/libbluray_la-dir_win32.lo `test -f 'src/file/dir_win32.c' || echo '$(srcdir)/'`src/file/dir_win32.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/file/$(DEPDIR)/libbluray_la-dir_win32.Tpo src/file/$(DEPDIR)/libbluray_la-dir_win32.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file/dir_win32.c' object='src/file/libbluray_la-dir_win32.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file/libbluray_la-dir_win32.lo `test -f 'src/file/dir_win32.c' || echo '$(srcdir)/'`src/file/dir_win32.c + +src/file/libbluray_la-dirs_win32.lo: src/file/dirs_win32.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file/libbluray_la-dirs_win32.lo -MD -MP -MF src/file/$(DEPDIR)/libbluray_la-dirs_win32.Tpo -c -o src/file/libbluray_la-dirs_win32.lo `test -f 'src/file/dirs_win32.c' || echo '$(srcdir)/'`src/file/dirs_win32.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/file/$(DEPDIR)/libbluray_la-dirs_win32.Tpo src/file/$(DEPDIR)/libbluray_la-dirs_win32.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file/dirs_win32.c' object='src/file/libbluray_la-dirs_win32.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file/libbluray_la-dirs_win32.lo `test -f 'src/file/dirs_win32.c' || echo '$(srcdir)/'`src/file/dirs_win32.c + +src/file/libbluray_la-dl_win32.lo: src/file/dl_win32.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file/libbluray_la-dl_win32.lo -MD -MP -MF src/file/$(DEPDIR)/libbluray_la-dl_win32.Tpo -c -o src/file/libbluray_la-dl_win32.lo `test -f 'src/file/dl_win32.c' || echo '$(srcdir)/'`src/file/dl_win32.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/file/$(DEPDIR)/libbluray_la-dl_win32.Tpo src/file/$(DEPDIR)/libbluray_la-dl_win32.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file/dl_win32.c' object='src/file/libbluray_la-dl_win32.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file/libbluray_la-dl_win32.lo `test -f 'src/file/dl_win32.c' || echo '$(srcdir)/'`src/file/dl_win32.c + +src/file/libbluray_la-file_win32.lo: src/file/file_win32.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file/libbluray_la-file_win32.lo -MD -MP -MF src/file/$(DEPDIR)/libbluray_la-file_win32.Tpo -c -o src/file/libbluray_la-file_win32.lo `test -f 'src/file/file_win32.c' || echo '$(srcdir)/'`src/file/file_win32.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/file/$(DEPDIR)/libbluray_la-file_win32.Tpo src/file/$(DEPDIR)/libbluray_la-file_win32.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file/file_win32.c' object='src/file/libbluray_la-file_win32.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file/libbluray_la-file_win32.lo `test -f 'src/file/file_win32.c' || echo '$(srcdir)/'`src/file/file_win32.c + +src/file/libbluray_la-mount.lo: src/file/mount.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file/libbluray_la-mount.lo -MD -MP -MF src/file/$(DEPDIR)/libbluray_la-mount.Tpo -c -o src/file/libbluray_la-mount.lo `test -f 'src/file/mount.c' || echo '$(srcdir)/'`src/file/mount.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/file/$(DEPDIR)/libbluray_la-mount.Tpo src/file/$(DEPDIR)/libbluray_la-mount.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file/mount.c' object='src/file/libbluray_la-mount.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file/libbluray_la-mount.lo `test -f 'src/file/mount.c' || echo '$(srcdir)/'`src/file/mount.c + +src/file/libbluray_la-dirs_xdg.lo: src/file/dirs_xdg.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/file/libbluray_la-dirs_xdg.lo -MD -MP -MF src/file/$(DEPDIR)/libbluray_la-dirs_xdg.Tpo -c -o src/file/libbluray_la-dirs_xdg.lo `test -f 'src/file/dirs_xdg.c' || echo '$(srcdir)/'`src/file/dirs_xdg.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/file/$(DEPDIR)/libbluray_la-dirs_xdg.Tpo src/file/$(DEPDIR)/libbluray_la-dirs_xdg.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/file/dirs_xdg.c' object='src/file/libbluray_la-dirs_xdg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libbluray_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/file/libbluray_la-dirs_xdg.lo `test -f 'src/file/dirs_xdg.c' || echo '$(srcdir)/'`src/file/dirs_xdg.c + +src/devtools/clpi_dump-clpi_dump.o: src/devtools/clpi_dump.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -MT src/devtools/clpi_dump-clpi_dump.o -MD -MP -MF src/devtools/$(DEPDIR)/clpi_dump-clpi_dump.Tpo -c -o src/devtools/clpi_dump-clpi_dump.o `test -f 'src/devtools/clpi_dump.c' || echo '$(srcdir)/'`src/devtools/clpi_dump.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devtools/$(DEPDIR)/clpi_dump-clpi_dump.Tpo src/devtools/$(DEPDIR)/clpi_dump-clpi_dump.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devtools/clpi_dump.c' object='src/devtools/clpi_dump-clpi_dump.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -c -o src/devtools/clpi_dump-clpi_dump.o `test -f 'src/devtools/clpi_dump.c' || echo '$(srcdir)/'`src/devtools/clpi_dump.c + +src/devtools/clpi_dump-clpi_dump.obj: src/devtools/clpi_dump.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -MT src/devtools/clpi_dump-clpi_dump.obj -MD -MP -MF src/devtools/$(DEPDIR)/clpi_dump-clpi_dump.Tpo -c -o src/devtools/clpi_dump-clpi_dump.obj `if test -f 'src/devtools/clpi_dump.c'; then $(CYGPATH_W) 'src/devtools/clpi_dump.c'; else $(CYGPATH_W) '$(srcdir)/src/devtools/clpi_dump.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devtools/$(DEPDIR)/clpi_dump-clpi_dump.Tpo src/devtools/$(DEPDIR)/clpi_dump-clpi_dump.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devtools/clpi_dump.c' object='src/devtools/clpi_dump-clpi_dump.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -c -o src/devtools/clpi_dump-clpi_dump.obj `if test -f 'src/devtools/clpi_dump.c'; then $(CYGPATH_W) 'src/devtools/clpi_dump.c'; else $(CYGPATH_W) '$(srcdir)/src/devtools/clpi_dump.c'; fi` + +src/devtools/clpi_dump-util.o: src/devtools/util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -MT src/devtools/clpi_dump-util.o -MD -MP -MF src/devtools/$(DEPDIR)/clpi_dump-util.Tpo -c -o src/devtools/clpi_dump-util.o `test -f 'src/devtools/util.c' || echo '$(srcdir)/'`src/devtools/util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devtools/$(DEPDIR)/clpi_dump-util.Tpo src/devtools/$(DEPDIR)/clpi_dump-util.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devtools/util.c' object='src/devtools/clpi_dump-util.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -c -o src/devtools/clpi_dump-util.o `test -f 'src/devtools/util.c' || echo '$(srcdir)/'`src/devtools/util.c + +src/devtools/clpi_dump-util.obj: src/devtools/util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -MT src/devtools/clpi_dump-util.obj -MD -MP -MF src/devtools/$(DEPDIR)/clpi_dump-util.Tpo -c -o src/devtools/clpi_dump-util.obj `if test -f 'src/devtools/util.c'; then $(CYGPATH_W) 'src/devtools/util.c'; else $(CYGPATH_W) '$(srcdir)/src/devtools/util.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devtools/$(DEPDIR)/clpi_dump-util.Tpo src/devtools/$(DEPDIR)/clpi_dump-util.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devtools/util.c' object='src/devtools/clpi_dump-util.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clpi_dump_CFLAGS) $(CFLAGS) -c -o src/devtools/clpi_dump-util.obj `if test -f 'src/devtools/util.c'; then $(CYGPATH_W) 'src/devtools/util.c'; else $(CYGPATH_W) '$(srcdir)/src/devtools/util.c'; fi` + +src/devtools/mobj_dump-mobj_dump.o: src/devtools/mobj_dump.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT src/devtools/mobj_dump-mobj_dump.o -MD -MP -MF src/devtools/$(DEPDIR)/mobj_dump-mobj_dump.Tpo -c -o src/devtools/mobj_dump-mobj_dump.o `test -f 'src/devtools/mobj_dump.c' || echo '$(srcdir)/'`src/devtools/mobj_dump.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devtools/$(DEPDIR)/mobj_dump-mobj_dump.Tpo src/devtools/$(DEPDIR)/mobj_dump-mobj_dump.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devtools/mobj_dump.c' object='src/devtools/mobj_dump-mobj_dump.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o src/devtools/mobj_dump-mobj_dump.o `test -f 'src/devtools/mobj_dump.c' || echo '$(srcdir)/'`src/devtools/mobj_dump.c + +src/devtools/mobj_dump-mobj_dump.obj: src/devtools/mobj_dump.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT src/devtools/mobj_dump-mobj_dump.obj -MD -MP -MF src/devtools/$(DEPDIR)/mobj_dump-mobj_dump.Tpo -c -o src/devtools/mobj_dump-mobj_dump.obj `if test -f 'src/devtools/mobj_dump.c'; then $(CYGPATH_W) 'src/devtools/mobj_dump.c'; else $(CYGPATH_W) '$(srcdir)/src/devtools/mobj_dump.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devtools/$(DEPDIR)/mobj_dump-mobj_dump.Tpo src/devtools/$(DEPDIR)/mobj_dump-mobj_dump.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devtools/mobj_dump.c' object='src/devtools/mobj_dump-mobj_dump.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o src/devtools/mobj_dump-mobj_dump.obj `if test -f 'src/devtools/mobj_dump.c'; then $(CYGPATH_W) 'src/devtools/mobj_dump.c'; else $(CYGPATH_W) '$(srcdir)/src/devtools/mobj_dump.c'; fi` src/libbluray/hdmv/mobj_dump-mobj_print.o: src/libbluray/hdmv/mobj_print.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -MT src/libbluray/hdmv/mobj_dump-mobj_print.o -MD -MP -MF src/libbluray/hdmv/$(DEPDIR)/mobj_dump-mobj_print.Tpo -c -o src/libbluray/hdmv/mobj_dump-mobj_print.o `test -f 'src/libbluray/hdmv/mobj_print.c' || echo '$(srcdir)/'`src/libbluray/hdmv/mobj_print.c @@ -1532,33 +2031,33 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mobj_dump_CFLAGS) $(CFLAGS) -c -o src/libbluray/hdmv/mobj_dump-mobj_print.obj `if test -f 'src/libbluray/hdmv/mobj_print.c'; then $(CYGPATH_W) 'src/libbluray/hdmv/mobj_print.c'; else $(CYGPATH_W) '$(srcdir)/src/libbluray/hdmv/mobj_print.c'; fi` -src/examples/mpls_dump-mpls_dump.o: src/examples/mpls_dump.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT src/examples/mpls_dump-mpls_dump.o -MD -MP -MF src/examples/$(DEPDIR)/mpls_dump-mpls_dump.Tpo -c -o src/examples/mpls_dump-mpls_dump.o `test -f 'src/examples/mpls_dump.c' || echo '$(srcdir)/'`src/examples/mpls_dump.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/examples/$(DEPDIR)/mpls_dump-mpls_dump.Tpo src/examples/$(DEPDIR)/mpls_dump-mpls_dump.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/examples/mpls_dump.c' object='src/examples/mpls_dump-mpls_dump.o' libtool=no @AMDEPBACKSLASH@ +src/devtools/mpls_dump-mpls_dump.o: src/devtools/mpls_dump.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT src/devtools/mpls_dump-mpls_dump.o -MD -MP -MF src/devtools/$(DEPDIR)/mpls_dump-mpls_dump.Tpo -c -o src/devtools/mpls_dump-mpls_dump.o `test -f 'src/devtools/mpls_dump.c' || echo '$(srcdir)/'`src/devtools/mpls_dump.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devtools/$(DEPDIR)/mpls_dump-mpls_dump.Tpo src/devtools/$(DEPDIR)/mpls_dump-mpls_dump.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devtools/mpls_dump.c' object='src/devtools/mpls_dump-mpls_dump.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o src/examples/mpls_dump-mpls_dump.o `test -f 'src/examples/mpls_dump.c' || echo '$(srcdir)/'`src/examples/mpls_dump.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o src/devtools/mpls_dump-mpls_dump.o `test -f 'src/devtools/mpls_dump.c' || echo '$(srcdir)/'`src/devtools/mpls_dump.c -src/examples/mpls_dump-mpls_dump.obj: src/examples/mpls_dump.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT src/examples/mpls_dump-mpls_dump.obj -MD -MP -MF src/examples/$(DEPDIR)/mpls_dump-mpls_dump.Tpo -c -o src/examples/mpls_dump-mpls_dump.obj `if test -f 'src/examples/mpls_dump.c'; then $(CYGPATH_W) 'src/examples/mpls_dump.c'; else $(CYGPATH_W) '$(srcdir)/src/examples/mpls_dump.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/examples/$(DEPDIR)/mpls_dump-mpls_dump.Tpo src/examples/$(DEPDIR)/mpls_dump-mpls_dump.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/examples/mpls_dump.c' object='src/examples/mpls_dump-mpls_dump.obj' libtool=no @AMDEPBACKSLASH@ +src/devtools/mpls_dump-mpls_dump.obj: src/devtools/mpls_dump.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT src/devtools/mpls_dump-mpls_dump.obj -MD -MP -MF src/devtools/$(DEPDIR)/mpls_dump-mpls_dump.Tpo -c -o src/devtools/mpls_dump-mpls_dump.obj `if test -f 'src/devtools/mpls_dump.c'; then $(CYGPATH_W) 'src/devtools/mpls_dump.c'; else $(CYGPATH_W) '$(srcdir)/src/devtools/mpls_dump.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devtools/$(DEPDIR)/mpls_dump-mpls_dump.Tpo src/devtools/$(DEPDIR)/mpls_dump-mpls_dump.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devtools/mpls_dump.c' object='src/devtools/mpls_dump-mpls_dump.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o src/examples/mpls_dump-mpls_dump.obj `if test -f 'src/examples/mpls_dump.c'; then $(CYGPATH_W) 'src/examples/mpls_dump.c'; else $(CYGPATH_W) '$(srcdir)/src/examples/mpls_dump.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o src/devtools/mpls_dump-mpls_dump.obj `if test -f 'src/devtools/mpls_dump.c'; then $(CYGPATH_W) 'src/devtools/mpls_dump.c'; else $(CYGPATH_W) '$(srcdir)/src/devtools/mpls_dump.c'; fi` -src/examples/mpls_dump-util.o: src/examples/util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT src/examples/mpls_dump-util.o -MD -MP -MF src/examples/$(DEPDIR)/mpls_dump-util.Tpo -c -o src/examples/mpls_dump-util.o `test -f 'src/examples/util.c' || echo '$(srcdir)/'`src/examples/util.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/examples/$(DEPDIR)/mpls_dump-util.Tpo src/examples/$(DEPDIR)/mpls_dump-util.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/examples/util.c' object='src/examples/mpls_dump-util.o' libtool=no @AMDEPBACKSLASH@ +src/devtools/mpls_dump-util.o: src/devtools/util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT src/devtools/mpls_dump-util.o -MD -MP -MF src/devtools/$(DEPDIR)/mpls_dump-util.Tpo -c -o src/devtools/mpls_dump-util.o `test -f 'src/devtools/util.c' || echo '$(srcdir)/'`src/devtools/util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devtools/$(DEPDIR)/mpls_dump-util.Tpo src/devtools/$(DEPDIR)/mpls_dump-util.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devtools/util.c' object='src/devtools/mpls_dump-util.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o src/examples/mpls_dump-util.o `test -f 'src/examples/util.c' || echo '$(srcdir)/'`src/examples/util.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o src/devtools/mpls_dump-util.o `test -f 'src/devtools/util.c' || echo '$(srcdir)/'`src/devtools/util.c -src/examples/mpls_dump-util.obj: src/examples/util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT src/examples/mpls_dump-util.obj -MD -MP -MF src/examples/$(DEPDIR)/mpls_dump-util.Tpo -c -o src/examples/mpls_dump-util.obj `if test -f 'src/examples/util.c'; then $(CYGPATH_W) 'src/examples/util.c'; else $(CYGPATH_W) '$(srcdir)/src/examples/util.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/examples/$(DEPDIR)/mpls_dump-util.Tpo src/examples/$(DEPDIR)/mpls_dump-util.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/examples/util.c' object='src/examples/mpls_dump-util.obj' libtool=no @AMDEPBACKSLASH@ +src/devtools/mpls_dump-util.obj: src/devtools/util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -MT src/devtools/mpls_dump-util.obj -MD -MP -MF src/devtools/$(DEPDIR)/mpls_dump-util.Tpo -c -o src/devtools/mpls_dump-util.obj `if test -f 'src/devtools/util.c'; then $(CYGPATH_W) 'src/devtools/util.c'; else $(CYGPATH_W) '$(srcdir)/src/devtools/util.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devtools/$(DEPDIR)/mpls_dump-util.Tpo src/devtools/$(DEPDIR)/mpls_dump-util.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devtools/util.c' object='src/devtools/mpls_dump-util.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o src/examples/mpls_dump-util.obj `if test -f 'src/examples/util.c'; then $(CYGPATH_W) 'src/examples/util.c'; else $(CYGPATH_W) '$(srcdir)/src/examples/util.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpls_dump_CFLAGS) $(CFLAGS) -c -o src/devtools/mpls_dump-util.obj `if test -f 'src/devtools/util.c'; then $(CYGPATH_W) 'src/devtools/util.c'; else $(CYGPATH_W) '$(srcdir)/src/devtools/util.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -1756,15 +2255,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @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 $(am__post_remove_distdir) @@ -1800,17 +2299,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1865,7 +2364,7 @@ exit 1; } >&2 check-am: all-am check: check-am -@USING_BDJAVA_FALSE@all-local: +@USING_BDJAVA_BUILD_JAR_FALSE@all-local: all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) \ config.h all-local install-binPROGRAMS: install-libLTLIBRARIES @@ -1903,6 +2402,8 @@ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -rm -f contrib/libudfread/src/$(DEPDIR)/$(am__dirstamp) -rm -f contrib/libudfread/src/$(am__dirstamp) + -rm -f src/devtools/$(DEPDIR)/$(am__dirstamp) + -rm -f src/devtools/$(am__dirstamp) -rm -f src/examples/$(DEPDIR)/$(am__dirstamp) -rm -f src/examples/$(am__dirstamp) -rm -f src/file/$(DEPDIR)/$(am__dirstamp) @@ -1927,7 +2428,7 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@USING_BDJAVA_FALSE@clean-local: +@USING_BDJAVA_BUILD_JAR_FALSE@clean-local: clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ @@ -1935,7 +2436,7 @@ distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf contrib/libudfread/src/$(DEPDIR) src/examples/$(DEPDIR) src/file/$(DEPDIR) src/libbluray/$(DEPDIR) src/libbluray/bdj/$(DEPDIR) src/libbluray/bdj/native/$(DEPDIR) src/libbluray/bdnav/$(DEPDIR) src/libbluray/decoders/$(DEPDIR) src/libbluray/disc/$(DEPDIR) src/libbluray/hdmv/$(DEPDIR) src/util/$(DEPDIR) + -rm -rf contrib/libudfread/src/$(DEPDIR) src/devtools/$(DEPDIR) src/examples/$(DEPDIR) src/file/$(DEPDIR) src/libbluray/$(DEPDIR) src/libbluray/bdj/$(DEPDIR) src/libbluray/bdj/native/$(DEPDIR) src/libbluray/bdnav/$(DEPDIR) src/libbluray/decoders/$(DEPDIR) src/libbluray/disc/$(DEPDIR) src/libbluray/hdmv/$(DEPDIR) src/util/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags @@ -1984,7 +2485,7 @@ maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf contrib/libudfread/src/$(DEPDIR) src/examples/$(DEPDIR) src/file/$(DEPDIR) src/libbluray/$(DEPDIR) src/libbluray/bdj/$(DEPDIR) src/libbluray/bdj/native/$(DEPDIR) src/libbluray/bdnav/$(DEPDIR) src/libbluray/decoders/$(DEPDIR) src/libbluray/disc/$(DEPDIR) src/libbluray/hdmv/$(DEPDIR) src/util/$(DEPDIR) + -rm -rf contrib/libudfread/src/$(DEPDIR) src/devtools/$(DEPDIR) src/examples/$(DEPDIR) src/file/$(DEPDIR) src/libbluray/$(DEPDIR) src/libbluray/bdj/$(DEPDIR) src/libbluray/bdj/native/$(DEPDIR) src/libbluray/bdnav/$(DEPDIR) src/libbluray/decoders/$(DEPDIR) src/libbluray/disc/$(DEPDIR) src/libbluray/hdmv/$(DEPDIR) src/util/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -2029,6 +2530,8 @@ uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \ uninstall-pkgincludeHEADERS +.PRECIOUS: Makefile + @DX_COND_doc_TRUE@@DX_COND_ps_TRUE@doxygen-ps: @DX_DOCDIR@/@PACKAGE@.ps @@ -2076,22 +2579,22 @@ @DX_COND_doc_TRUE@ rm -rf @DX_DOCDIR@ @DX_COND_doc_TRUE@ $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) -@USING_BDJAVA_TRUE@$(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar: all-local +@USING_BDJAVA_BUILD_JAR_TRUE@$(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar: all-local -@USING_BDJAVA_TRUE@all-local: -@USING_BDJAVA_TRUE@ ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \ -@USING_BDJAVA_TRUE@ -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \ -@USING_BDJAVA_TRUE@ -Ddist='$(abs_builddir)/.libs' \ -@USING_BDJAVA_TRUE@ -Dsrc_awt=:java-$(BDJ_TYPE) \ -@USING_BDJAVA_TRUE@ -Dbootclasspath="$(BDJ_BOOTCLASSPATH)" \ -@USING_BDJAVA_TRUE@ -Dversion='$(BDJ_TYPE)-$(VERSION)' - -@USING_BDJAVA_TRUE@clean-local: -@USING_BDJAVA_TRUE@ ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \ -@USING_BDJAVA_TRUE@ -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \ -@USING_BDJAVA_TRUE@ -Ddist='$(abs_builddir)/.libs' \ -@USING_BDJAVA_TRUE@ -Dversion='$(BDJ_TYPE)-$(VERSION)' \ -@USING_BDJAVA_TRUE@ clean +@USING_BDJAVA_BUILD_JAR_TRUE@all-local: +@USING_BDJAVA_BUILD_JAR_TRUE@ ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \ +@USING_BDJAVA_BUILD_JAR_TRUE@ -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \ +@USING_BDJAVA_BUILD_JAR_TRUE@ -Ddist='$(abs_builddir)/.libs' \ +@USING_BDJAVA_BUILD_JAR_TRUE@ -Dsrc_awt=:java-$(BDJ_TYPE) \ +@USING_BDJAVA_BUILD_JAR_TRUE@ -Dbootclasspath="$(BDJ_BOOTCLASSPATH)" \ +@USING_BDJAVA_BUILD_JAR_TRUE@ -Dversion='$(BDJ_TYPE)-$(VERSION)' + +@USING_BDJAVA_BUILD_JAR_TRUE@clean-local: +@USING_BDJAVA_BUILD_JAR_TRUE@ ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \ +@USING_BDJAVA_BUILD_JAR_TRUE@ -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \ +@USING_BDJAVA_BUILD_JAR_TRUE@ -Ddist='$(abs_builddir)/.libs' \ +@USING_BDJAVA_BUILD_JAR_TRUE@ -Dversion='$(BDJ_TYPE)-$(VERSION)' \ +@USING_BDJAVA_BUILD_JAR_TRUE@ clean # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libbluray-0.8.1/.pc/02_online-image.patch/doc/doxygen-footer.html libbluray-1.0.1/.pc/02_online-image.patch/doc/doxygen-footer.html --- libbluray-0.8.1/.pc/02_online-image.patch/doc/doxygen-footer.html 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/.pc/02_online-image.patch/doc/doxygen-footer.html 2017-06-23 13:35:15.000000000 +0000 @@ -0,0 +1,13 @@ +

+ + + \ No newline at end of file diff -Nru libbluray-0.8.1/.pc/04_kfreebsd-include.patch/configure.ac libbluray-1.0.1/.pc/04_kfreebsd-include.patch/configure.ac --- libbluray-0.8.1/.pc/04_kfreebsd-include.patch/configure.ac 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/.pc/04_kfreebsd-include.patch/configure.ac 2017-06-23 13:35:17.000000000 +0000 @@ -0,0 +1,293 @@ +dnl library version number +m4_define([bluray_major], 1) +m4_define([bluray_minor], 0) +m4_define([bluray_micro], 1) +m4_define([bluray_version],[bluray_major.bluray_minor.bluray_micro]) + +dnl shared library version (.so version) +dnl +dnl - If there are no interface changes, increase revision. +dnl - If interfaces have been added, increase current and age. Set revision to 0. +dnl - If interfaces have been changed or removed, increase current and set age and revision to 0. +dnl +dnl Library file name will be libbluray.so.(current-age).age.revision +dnl +m4_define([lt_current], 2) +m4_define([lt_revision], 1) +m4_define([lt_age], 0) + +dnl initilization +AC_INIT([libbluray], bluray_version, [http://www.videolan.org/developers/libbluray.html]) +AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CANONICAL_HOST +AM_INIT_AUTOMAKE([foreign tar-ustar dist-bzip2 no-dist-gzip subdir-objects]) +AC_CONFIG_HEADERS(config.h) + +dnl Enable silent rules only when available (automake 1.11 or later). +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +case "${host_os}" in + "") + SYS=unknown + ;; + *mingw32* | *cygwin* | *wince* | *mingwce*) + case "${host_os}" in + *wince* | *mingwce* | *mingw32ce*) + SYS=mingwce + ;; + *mingw32*) + SYS=mingw32 + AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows XP SP2 APIs.]) + AC_DEFINE([_WIN32_IE], 0x0501, [Define to '0x0501' for IE 5.01.]) + CPPFLAGS="${CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=1" + ;; + esac + ;; + *darwin*) + SYS=darwin + ;; + netbsd*) + SYS=netbsd + CFLAGS="${CFLAGS} -D_NETBSD_SOURCE" + ;; + *) + SYS="${host_os}" + ;; +esac + +AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") +AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin") + +dnl messages +library_not_found="Could not find required library!" +function_not_found="Could not find required function!" + +dnl configure options +AC_ARG_VAR([JDK_HOME], [Path to the JDK]) + +AC_ARG_ENABLE([werror], + [AS_HELP_STRING([--enable-werror], [set warnings as errors via -Werror @<:@default=disabled@:>@])]) + +AC_ARG_ENABLE([extra-warnings], + [AS_HELP_STRING([--disable-extra-warnings], [set extra warnings @<:@default=enabled@:>@])]) + +AC_ARG_ENABLE([optimizations], + [AS_HELP_STRING([--disable-optimizations], [disable optimizations @<:@default=enabled@:>@])]) + +AC_ARG_ENABLE([examples], + [AS_HELP_STRING([--enable-examples], + [build examples (default is yes)])], + [use_examples=$enableval], + [use_examples=yes]) + +AC_ARG_ENABLE([bdjava-jar], + [AS_HELP_STRING([--disable-bdjava-jar], + [disable building of BD-Java JAR file @<:@default=enabled@:>@])], + [use_bdjava_jar=$enableval], + [use_bdjava_jar=yes]) + +AC_ARG_WITH([libxml2], + [AS_HELP_STRING([--without-libxml2], [build without libxml2 support @<:@default=with@:>@])]) + +AC_ARG_WITH([freetype], + [AS_HELP_STRING([--without-freetype], [build without freetype support @<:@default=with@:>@])]) + +AC_ARG_WITH([fontconfig], + [AS_HELP_STRING([--without-fontconfig], [build without fontconfig support @<:@default=with@:>@])]) + +AC_ARG_WITH([bdj-type], + [AS_HELP_STRING([--with-bdj-type=TYPE], + [Specify the type of BD-J implementation (j2se, j2me). Default is j2se.])], + [BDJ_TYPE=$withval], + [BDJ_TYPE=j2se]) + +AC_ARG_WITH([bdj-bootclasspath], + [AS_HELP_STRING([--with-bdj-bootclasspath=PATH], + [Specify BD-J build-time bootclass path (example /opt/PhoneME/lib/btclasses.zip;/opt/PhoneME/lib/xmlparer.jar). Default is empty.])], + [BDJ_BOOTCLASSPATH=$withval], + [BDJ_BOOTCLASSPATH=]) + +dnl required programs +AC_PROG_CC +AM_PROG_CC_C_O +AC_PROG_LIBTOOL + +dnl required types +AC_TYPE_SIGNAL + +dnl required headers +AC_CHECK_HEADERS([stdarg.h sys/types.h dirent.h errno.h libgen.h malloc.h]) +AC_CHECK_HEADERS([stdlib.h mntent.h linux/cdrom.h inttypes.h strings.h]) +AC_CHECK_HEADERS([sys/time.h time.h mntent.h]) + +dnl required structures +AC_STRUCT_DIRENT_D_TYPE + +dnl required system services +AC_SYS_LARGEFILE + +dnl required functions +AC_CHECK_FUNC([snprintf],, [AC_MSG_ERROR($function_not_found)]) + +dnl required libraries +dnl pthreads (not on win32) +AS_IF([test "${SYS}" != "mingw32"], [ + AC_CHECK_HEADERS([pthread.h], , + [AC_MSG_ERROR([pthread required])]) + AC_SEARCH_LIBS([pthread_create], [pthread], , + [AC_MSG_ERROR([pthread required])]) + AC_SEARCH_LIBS([dlopen], [dl]) + DLOPEN_LIBS="$ac_cv_search_dlopen" + AS_CASE([$DLOPEN_LIBS], + [no|none\ required], [DLOPEN_LIBS=""]) + AC_SUBST([DLOPEN_LIBS]) +]) + +dnl libxml2 for metadata parser +AS_IF([test "x$with_libxml2" != "xno"], [ + PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6], + [with_libxml2=yes; AC_DEFINE([HAVE_LIBXML2], [1], + [Define to 1 if libxml2 is to be used for metadata parsing])]) +]) + +dnl FreeType2 +AS_IF([test "x$with_freetype" != "xno"], [ + PKG_CHECK_MODULES([FT2], [freetype2], + [with_freetype=yes; AC_DEFINE([HAVE_FT2], 1, [Define this if you have FreeType2 library])]) + + dnl fontconfig support + AS_IF([test "${SYS}" != "mingw32"], [ + AS_IF([test "x$with_fontconfig" != "xno"], [ + PKG_CHECK_MODULES([FONTCONFIG], [fontconfig], + [with_fontconfig=yes; AC_DEFINE([HAVE_FONTCONFIG], 1, [Define this if you have fontconfig library])]) + ]) + ],[ + FONTCONFIG_LIBS="-lgdi32" + AC_SUBST([FONTCONFIG_LIBS]) + ]) +]) + +CC_CHECK_CFLAGS_APPEND([-Wall -Wdisabled-optimization -Wpointer-arith ]dnl +[-Wredundant-decls -Wcast-qual -Wwrite-strings -Wtype-limits -Wundef ]dnl +[-Wmissing-prototypes -Wshadow]) + +CC_CHECK_CFLAGS_APPEND([-Werror=implicit-function-declaration ]dnl + [-Werror-implicit-function-declaration], + [break;]) + +CC_CHECK_WERROR +AS_IF([test "x$enable_werror" = "xyes"], [ + CFLAGS="${CFLAGS} $cc_cv_werror" +]) + +AS_IF([test "x$enable_extra_warnings" != "xno"], [ + CC_CHECK_CFLAGS_APPEND([-Wextra -Winline]) +]) + +AS_IF([test "x$enable_optimizations" != "xno"], [ + CC_CHECK_CFLAGS_APPEND([-O3 -fomit-frame-pointer]) +]) + +dnl use examples +AM_CONDITIONAL([USING_EXAMPLES], [ test $use_examples = "yes" ]) + +dnl use bdjava +case $host_cpu in + x86_64) java_arch=amd64 ;; + i?86) java_arch=i386 ;; + arm*) java_arch=arm ;; + *) java_arch=$host_cpu ;; +esac +case $host_os in + linux*) java_os=linux ;; + win*) java_os=win32 ;; + mingw*) java_os=win32 ;; + freebsd*) java_os=freebsd ;; + solaris*) java_os=solaris ;; + darwin*) java_os=darwin ;; + *) java_os=$host_os ;; +esac + +AS_IF([test "x${JDK_HOME}" != "x"], [ + BDJAVA_CFLAGS="-I${JDK_HOME}/include -I${JDK_HOME}/include/$java_os" + + temp_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$BDJAVA_CFLAGS $CPPFLAGS" + AC_CHECK_HEADERS([jni.h], [], [AC_MSG_ERROR(could not find jni.h)]) + CPPFLAGS="$temp_CPPFLAGS" +], [ + BDJAVA_CFLAGS='-I${abs_top_srcdir}/jni -I${abs_top_srcdir}/jni/'"${java_os}" +]) + +AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) +if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then + AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.]) +fi + +AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."]) +AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""]) +AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ]) + +dnl BD-J type +if test "$BDJ_TYPE" = "j2me"; then + AC_DEFINE([HAVE_BDJ_J2ME], [1], [Define to 1 if using libbluray J2ME stack]) +else + BDJ_TYPE=j2se +fi +AC_SUBST(BDJ_TYPE) +dnl bootclasspath +AC_SUBST(BDJ_BOOTCLASSPATH) + +dnl udf support (using git submodule) +if test ! -f "${srcdir}/contrib/libudfread/src/udfread.h"; then + AC_MSG_ERROR("libudfread source tree not found") +fi +AC_CHECK_HEADERS([unistd.h fcntl.h]) +AS_IF([test "${SYS}" != "mingw32"], [ + AC_CHECK_FUNC([pread],, [AC_DEFINE([NEED_PREAD_IMPL], [1], [Define to 1 to use inefficient pread() replacement])]) +]) + +dnl generate documentation +DX_INIT_DOXYGEN(libbluray, doc/doxygen-config, [doc/doxygen]) + +dnl export library version number +BLURAY_VERSION_MAJOR=bluray_major() +AC_SUBST(BLURAY_VERSION_MAJOR) +BLURAY_VERSION_MINOR=bluray_minor() +AC_SUBST(BLURAY_VERSION_MINOR) +BLURAY_VERSION_MICRO=bluray_micro() +AC_SUBST(BLURAY_VERSION_MICRO) + +dnl export library (.so) version +LT_VERSION_INFO="lt_current():lt_revision():lt_age()" +AC_SUBST(LT_VERSION_INFO) + +dnl generate output files +AC_SUBST(BDJAVA_CFLAGS) +AC_CONFIG_FILES([Makefile src/libbluray.pc src/libbluray/bluray-version.h]) +AC_OUTPUT + + +dnl --------------------------------------------- +dnl Some infos: +dnl --------------------------------------------- + +echo " Summary:" +echo " --------" +echo " BD-J type: $BDJ_TYPE" +echo " build JAR: $use_bdjava_jar" +if test x"$BDJ_BOOTCLASSPATH" != x""; then +echo " BD-J bootclasspath: $BDJ_BOOTCLASSPATH" +fi +echo " Font support (freetype2): $with_freetype" +if [[ $with_freetype = "yes" ]]; then +if test "${SYS}" != "mingw32"; then +echo " Use system fonts (fontconfig): $with_fontconfig" +else +echo " Use system fonts: yes" +fi +fi +echo " Metadata support (libxml2): $with_libxml2" +echo " Build examples: $use_examples" + diff -Nru libbluray-0.8.1/.pc/applied-patches libbluray-1.0.1/.pc/applied-patches --- libbluray-0.8.1/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/.pc/applied-patches 2017-06-23 13:39:37.000000000 +0000 @@ -0,0 +1,2 @@ +02_online-image.patch +04_kfreebsd-include.patch diff -Nru libbluray-0.8.1/.pc/.quilt_patches libbluray-1.0.1/.pc/.quilt_patches --- libbluray-0.8.1/.pc/.quilt_patches 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/.pc/.quilt_patches 2017-06-23 13:39:37.000000000 +0000 @@ -0,0 +1 @@ +debian/patches diff -Nru libbluray-0.8.1/.pc/.quilt_series libbluray-1.0.1/.pc/.quilt_series --- libbluray-0.8.1/.pc/.quilt_series 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/.pc/.quilt_series 2017-06-23 13:39:37.000000000 +0000 @@ -0,0 +1 @@ +series diff -Nru libbluray-0.8.1/.pc/.version libbluray-1.0.1/.pc/.version --- libbluray-0.8.1/.pc/.version 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/.pc/.version 2017-06-23 13:39:37.000000000 +0000 @@ -0,0 +1 @@ +2 diff -Nru libbluray-0.8.1/src/devtools/bdjo_dump.c libbluray-1.0.1/src/devtools/bdjo_dump.c --- libbluray-0.8.1/src/devtools/bdjo_dump.c 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/devtools/bdjo_dump.c 2017-06-23 13:34:43.000000000 +0000 @@ -0,0 +1,206 @@ +/* + * This file is part of libbluray + * Copyright (C) 2014 Petri Hintukainen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#include "bdj/bdjo_data.h" +#include "bluray.h" + +#include +#include + +static const char *_yes_no(int i) +{ + return i > 0 ? "yes" : i < 0 ? "unknown" : "no"; +} + +static const char *_binding_str(int i) +{ + switch (i) { + case 0: return "unbound"; + case 1: return "disc bound"; + case 3: return "title bound"; + default: return "???"; + } +} + +static const char *_visibility_str(int i) +{ + switch (i) { + case 0: return "none"; + case 1: return "applications"; + case 2: return "user"; + default: return "???"; + } +} + +static void _terminal_info_print(const BDJO_TERMINAL_INFO *p) +{ + printf("Terminal Info:\n"); + printf(" Default AWT font : %s\n", p->default_font); + printf(" initial HaVi config : %d\n", p->initial_havi_config_id); + printf(" Menu call mask : %d\n", p->menu_call_mask); + printf(" Title search mask : %d\n", p->menu_call_mask); +} + +static void _app_cache_item_print(const BDJO_APP_CACHE_ITEM *p) +{ + printf(" %3.3s: %s%s\n", + p->lang_code, p->ref_to_name, + p->type == 1 ? ".jar" : p->type == 2 ? "/" : " (unknown type)"); +} + +static void _app_cache_info_print(const BDJO_APP_CACHE_INFO *p) +{ + unsigned ii; + + printf("Application cache info:\n"); + for (ii = 0; ii < p->num_item; ii++) { + _app_cache_item_print(&p->item[ii]); + } +} + +static void _accessible_playlists_print(const BDJO_ACCESSIBLE_PLAYLISTS *p) +{ + unsigned ii; + + printf("Accessible playlists:\n"); + printf(" Access to all : %s\n", _yes_no(p->access_to_all_flag)); + printf(" Autostart first : %s\n", _yes_no(p->autostart_first_playlist_flag)); + + if (p->num_pl) { + printf(" Playlists : %d\n", p->num_pl); + for (ii = 0; ii < p->num_pl; ii++) { + printf(" %s.mpls\n", p->pl[ii].name); + } + } +} + +static void _app_profile_print(BDJO_APP_PROFILE *p) +{ + printf(" Profile %d Version %d.%d.%d\n", + p->profile_number, p->major_version, p->minor_version, p->micro_version); +} + +static void _app_print(const BDJO_APP *p) +{ + unsigned ii; + + printf(" Control code: : %d (%s)\n", p->control_code, + p->control_code == 1 ? "autostart" : p->control_code == 2 ? "present" : "???"); + printf(" Type : %d (%s)\n", p->type, + p->type == 1 ? "BD-J App" : "???"); + printf(" Organization ID : %08X\n", p->org_id); + printf(" Application ID : %04X\n", p->app_id); + printf(" Priority : %d\n", p->priority); + printf(" Binding : %d (%s)\n", p->binding, _binding_str(p->binding)); + printf(" Visibility : %d (%s)\n", p->visibility, _visibility_str(p->visibility)); + + if (p->num_profile) { + printf(" Profiles:\n"); + for (ii = 0; ii < p->num_profile; ii++) { + _app_profile_print(&p->profile[ii]); + } + } + + if (p->num_name) { + printf(" Names:\n"); + for (ii = 0; ii < p->num_name; ii++) { + printf(" %s: %s\n", p->name[ii].lang, p->name[ii].name); + } + } + + printf(" Base directory : %s\n", p->base_dir); + printf(" Icon locator : %s\n", p->icon_locator); + printf(" Icon flags : 0x%04x\n", p->icon_flags); + printf(" Classpath extension : %s\n", p->classpath_extension); + printf(" Initial class : %s\n", p->initial_class); + printf(" Parameters : "); + for (ii = 0; ii < p->num_param; ii++) { + printf("%s ", p->param[ii].param); + } + printf("\n"); +} + +static void _app_management_table_print(const BDJO_APP_MANAGEMENT_TABLE *p) +{ + unsigned ii; + + for (ii = 0; ii < p->num_app; ii++) { + printf("Application %u:\n", ii); + _app_print(&p->app[ii]); + } +} + +static void _key_interest_table_print(const BDJO_KEY_INTEREST_TABLE *p) +{ + unsigned int v; + memcpy(&v, p, sizeof(unsigned int)); + if (v) { + printf("Key interest table:\n"); + printf(" %s%s%s%s%s%s%s%s%s%s%s\n", + p->vk_play ? "VK_PLAY " : "", + p->vk_stop ? "VK_STOP " : "", + p->vk_ffw ? "VK_FFW " : "", + p->vk_rew ? "VK_REW " : "", + p->vk_track_next ? "VK_TRACK_NEXT " : "", + p->vk_track_prev ? "VK_TRACK_PREV " : "", + p->vk_pause ? "VK_PAUSE " : "", + p->vk_still_off ? "VK_STILL_OFF " : "", + p->vk_sec_audio_ena_dis ? "VK_SEC_AUDIO " : "", + p->vk_sec_video_ena_dis ? "VK_SEC_VIDEO " : "", + p->pg_textst_ena_dis ? "VK_PG_TEXTST " : ""); + } +} + +static void _file_access_info_print(const BDJO_FILE_ACCESS_INFO *p) +{ + printf("File access info:\n %s\n", p->path); +} + +static void _bdjo_print(const BDJO *p) +{ + _terminal_info_print(&p->terminal_info); + _app_cache_info_print(&p->app_cache_info); + _accessible_playlists_print(&p->accessible_playlists); + _app_management_table_print(&p->app_table); + _key_interest_table_print(&p->key_interest_table); + _file_access_info_print(&p->file_access_info); +} + +int main(int argc, const char *argv[]) +{ + if (argc < 2) { + fprintf(stderr, "usage: %s \n", argv[0]); + return 1; + } + + int cnt; + for (cnt = 1; cnt < argc; cnt++) { + + printf("%s\n", argv[cnt]); + + BDJO *bdjo = bd_read_bdjo(argv[cnt]); + if (bdjo) { + _bdjo_print(bdjo); + bd_free_bdjo(bdjo); + } + printf("\n"); + } + + return 0; +} diff -Nru libbluray-0.8.1/src/devtools/bdj_test.c libbluray-1.0.1/src/devtools/bdj_test.c --- libbluray-0.8.1/src/devtools/bdj_test.c 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/devtools/bdj_test.c 2017-06-23 13:34:43.000000000 +0000 @@ -0,0 +1,116 @@ +/* + * This file is part of libbluray + * Copyright (C) 2010 William Hahne + * Copyright (C) 2011-2017 Petri Hintukainen + * + * 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 the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * In addition, as a special exception, the copyright holders of libbluray + * gives permission to link the code of its release of libbluray with the + * OpenSSL project's "OpenSSL" library (or with modified versions of it + * that use the same license as the "OpenSSL" library), and distribute + * the linked executables. You must obey the GNU General Public License + * in all respects for all of the code used other than "OpenSSL". If you + * modify this file, you may extend this exception to your version of the + * file, but you are not obligated to do so. If you do not wish to do + * so, delete this exception statement from your version. + */ + +#include +#include +#include +#include + +#include "bluray.h" + +#if defined(_WIN32) +#include +#define sleep(x) Sleep(x) +#endif + +static void _usage(void) { + printf("Usage: [path to disc] [starting object]\n"); +} + +int main(int argc, char** argv) +{ + int major, minor, micro; + const BLURAY_DISC_INFO *di; + BLURAY *bd; + + bd_get_version(&major, &minor, µ); + printf("Using libbluray version %d.%d.%d\n", major, minor, micro); + + if (argc < 3) { + _usage(); + return 0; + } + + printf("Strating BD-J object %s from %s\n", argv[2], argv[1]); + + bd = bd_init(); + if (!bd) { + return -1; + } + + /* disable persistent storage */ + bd_set_player_setting(bd, BLURAY_PLAYER_SETTING_PERSISTENT_STORAGE, 0); + + /* initialize event queue */ + bd_get_event(bd, NULL); + + /* check BD-J config */ + + di = bd_get_disc_info(bd); + assert(di != NULL); + + if (!di->libjvm_detected) { + fprintf(stderr, "JVM not found\n"); + goto fail; + } + if (!di->bdj_handled) { + fprintf(stderr, "libbluray.jar not found\n"); + goto fail; + } + + /* open disc */ + + if (!bd_open_disc(bd, argv[1], NULL)) { + fprintf(stderr, "bd_open_disc() failed\n"); + return -1; + } + + bd_get_titles(bd, TITLES_ALL, 0); + + if (!bd_start_bdj(bd, argv[2])) { + printf("Failed to start BD-J application.\n"); + goto fail; + } + + while (1) { + BD_EVENT ev; + while (bd_get_event(bd, &ev)) { + } + sleep(20); + } + + bd_stop_bdj(bd); + bd_close(bd); + + return 0; + + fail: + bd_close(bd); + return -1; +} diff -Nru libbluray-0.8.1/src/devtools/clpi_dump.c libbluray-1.0.1/src/devtools/clpi_dump.c --- libbluray-0.8.1/src/devtools/clpi_dump.c 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/devtools/clpi_dump.c 2017-06-23 13:34:43.000000000 +0000 @@ -0,0 +1,487 @@ +/* + * This file is part of libbluray + * Copyright (C) 2009-2010 John Stebbins + * Copyright (C) 2012-2013 Petri Hintukainen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#include +#include +#include +#include + +#include "bluray.h" +#include "bdnav/clpi_data.h" + +#include "util.h" + +static int verbose; + +typedef struct { + int value; + const char *str; +} VALUE_MAP; + +static inline const char* +_lookup_str(const VALUE_MAP *map, int val) +{ + int ii; + + for (ii = 0; map[ii].str; ii++) { + if (val == map[ii].value) { + return map[ii].str; + } + } + return "?"; +} + +const VALUE_MAP codec_map[] = { + {0x01, "MPEG-1 Video"}, + {0x02, "MPEG-2 Video"}, + {0x03, "MPEG-1 Audio"}, + {0x04, "MPEG-2 Audio"}, + {0x80, "LPCM"}, + {0x81, "AC-3"}, + {0x82, "DTS"}, + {0x83, "TrueHD"}, + {0x84, "AC-3 Plus"}, + {0x85, "DTS-HD"}, + {0x86, "DTS-HD Master"}, + {0xa1, "AC-3 Plus for secondary audio"}, + {0xa2, "DTS-HD for secondary audio"}, + {0xea, "VC-1"}, + {0x1b, "H.264"}, + {0x20, "H.264 MVC dep."}, + {0x90, "Presentation Graphics"}, + {0x91, "Presentation Graphics"}, + {0x92, "Interactive Graphics"}, + {0, NULL} +}; + +const VALUE_MAP video_format_map[] = { + {0, "Reserved"}, + {1, "480i"}, + {2, "576i"}, + {3, "480p"}, + {4, "1080i"}, + {5, "720p"}, + {6, "1080p"}, + {7, "576p"}, + {0, NULL} +}; + +const VALUE_MAP video_rate_map[] = { + {0, "Reserved1"}, + {1, "23.976"}, + {2, "24"}, + {3, "25"}, + {4, "29.97"}, + {5, "Reserved2"}, + {6, "50"}, + {7, "59.94"}, + {0, NULL} +}; + +const VALUE_MAP video_aspect_map[] = { + {0, "Reserved1"}, + {1, "Reserved2"}, + {2, "4:3"}, + {3, "16:9"}, + {0, NULL} +}; + +const VALUE_MAP audio_format_map[] = { + {0, "Reserved1"}, + {1, "Mono"}, + {2, "Reserved2"}, + {3, "Stereo"}, + {4, "Reserved3"}, + {5, "Reserved4"}, + {6, "Multi Channel"}, + {12, "Combo"}, + {0, NULL} +}; + +const VALUE_MAP audio_rate_map[] = { + {0, "Reserved1"}, + {1, "48 Khz"}, + {2, "Reserved2"}, + {3, "Reserved3"}, + {4, "96 Khz"}, + {5, "192 Khz"}, + {12, "48/192 Khz"}, + {14, "48/96 Khz"}, + {0, NULL} +}; + +const VALUE_MAP application_type_map[] = { + {1, "Main TS for a main-path of Movie"}, + {2, "Main TS for a main-path of Time based slide show"}, + {3, "Main TS for a main-path of Browsable slide show"}, + {4, "Sub TS for a sub-path of Browsable slide show"}, + {5, "Sub TS for a sub-path of Interactive Graphics menu"}, + {6, "Sub TS for a sub-path of Text subtitle"}, + {7, "Sub TS for a sub-path of one or more elementary streams path"}, + {0, NULL}, +}; + +static void +_show_stream(CLPI_PROG_STREAM *ss, int level) +{ + indent_printf(level, "Codec (%04x): %s", ss->coding_type, + _lookup_str(codec_map, ss->coding_type)); + indent_printf(level, "PID: %04x", ss->pid); + switch (ss->coding_type) { + case 0x01: + case 0x02: + case 0xea: + case 0x1b: + case 0x20: + indent_printf(level, "Format %02x: %s", ss->format, + _lookup_str(video_format_map, ss->format)); + indent_printf(level, "Rate %02x: %s", ss->rate, + _lookup_str(video_rate_map, ss->rate)); + indent_printf(level, "Aspect %02x: %s", ss->aspect, + _lookup_str(video_aspect_map, ss->aspect)); + indent_printf(level, "oc_flag %02x", ss->oc_flag); + break; + + case 0x03: + case 0x04: + case 0x80: + case 0x81: + case 0x82: + case 0x83: + case 0x84: + case 0x85: + case 0x86: + case 0xa1: + case 0xa2: + indent_printf(level, "Format %02x: %s", ss->format, + _lookup_str(audio_format_map, ss->format)); + indent_printf(level, "Rate %02x: %s", ss->rate, + _lookup_str(audio_rate_map, ss->rate)); + indent_printf(level, "Language: %s", ss->lang); + break; + + case 0x90: + case 0x91: + case 0xa0: + indent_printf(level, "Language: %s", ss->lang); + break; + + case 0x92: + indent_printf(level, "Char Code: %02x", ss->char_code); + indent_printf(level, "Language: %s", ss->lang); + break; + + default: + fprintf(stderr, "unrecognized coding type %02x\n", ss->coding_type); + break; + }; +} + +static void +_show_clip_info(CLPI_CL *cl, int level) +{ + CLPI_CLIP_INFO *ci = &cl->clip; + int ii; + + indent_printf(level, "Clip Info"); + indent_printf(level+1, "Clip Stream Type: %02x", ci->clip_stream_type); + indent_printf(level+1, "Clip Application Type (%02x): %s", + ci->application_type, _lookup_str(application_type_map, ci->application_type)); + indent_printf(level+1, "is_ATC_delta: %s", ci->is_atc_delta ? "True" : "False"); + indent_printf(level+1, "ATC delta count: %d", ci->atc_delta_count); + indent_printf(level+1, "TS Recording Rate: %u", ci->ts_recording_rate); + indent_printf(level+1, "Number Source Packets: %u", ci->num_source_packets); + // Show ts type info + indent_printf(level+1, "TS Type Info"); + indent_printf(level+2, "Validity Flags %02x", ci->ts_type_info.validity); + indent_printf(level+2, "Format Id %s", ci->ts_type_info.format_id); + // Show cc5 thing + for (ii = 0; ii < ci->atc_delta_count; ii++) { + indent_printf(level+1, "ATC delta[ %d ]", ii); + indent_printf(level+2, "Delta %08x", ci->atc_delta[ii].delta); + indent_printf(level+2, "File Id %s", ci->atc_delta[ii].file_id); + indent_printf(level+2, "File Code %s", ci->atc_delta[ii].file_code); + } + // show fonts + if (cl->clip.font_info.font_count) { + indent_printf(level+1, "Font files"); + for (ii = 0; ii < cl->clip.font_info.font_count; ii++) { + indent_printf(level+2, "Font file %d: %s.otf", ii+1, cl->clip.font_info.font[ii].file_id); + } + } + + printf("\n"); +} + +static void +_show_seq_info(CLPI_SEQ_INFO *si, int level) +{ + CLPI_ATC_SEQ *atc; + CLPI_STC_SEQ *stc; + int ii, jj; + + indent_printf(level, "Sequence Info"); + indent_printf(level+1, "Number ATC Sequences: %d", si->num_atc_seq); + for (ii = 0; ii < si->num_atc_seq; ii++) { + atc = &si->atc_seq[ii]; + indent_printf(level+1, "ATC Sequence %d", ii); + indent_printf(level+2, "SPN ATC Start: %u", atc->spn_atc_start); + indent_printf(level+2, "Offset STC Id: %d", atc->offset_stc_id); + indent_printf(level+2, "Number STC Sequences: %d", atc->num_stc_seq); + for (jj = 0; jj < atc->num_stc_seq; jj++) { + stc = &atc->stc_seq[jj]; + indent_printf(level+2, "ATC Sequence %d", jj); + indent_printf(level+3, "SPN STC Start: %u", stc->spn_stc_start); + indent_printf(level+3, "PCR PID: %04x", stc->pcr_pid); + indent_printf(level+3, "Presentation Start: %u", + stc->presentation_start_time); + indent_printf(level+3, "Presentation End: %u", + stc->presentation_end_time); + } + } +} + +static void +_show_prog_info(CLPI_PROG_INFO *pi, int level) +{ + CLPI_PROG *prog; + int ii, jj; + + indent_printf(level, "Program Info"); + indent_printf(level+1, "Number Programs: %d", pi->num_prog); + for (ii = 0; ii < pi->num_prog; ii++) { + prog = &pi->progs[ii]; + indent_printf(level+1, "Program %d", ii); + indent_printf(level+2, "SPN Program Sequence Start: %d", + prog->spn_program_sequence_start); + indent_printf(level+2, "Program Map PID: %d", prog->program_map_pid); + indent_printf(level+2, "Number Streams: %d", prog->num_streams); + indent_printf(level+2, "Number Groups: %d", prog->num_groups); + for (jj = 0; jj < prog->num_streams; jj++) { + indent_printf(level+2, "Stream %d", jj); + _show_stream(&prog->streams[jj], level+3); + } + } +} + +static void +_show_extent_start(CLPI_EXTENT_START *es, int level) +{ + unsigned int ii; + + indent_printf(level, "Extension data: Extent Start Point"); + + if (!es->num_point) { + indent_printf(level+1, "(no data)"); + + } else { + indent_printf(level+1, "Number of Start Points: %d", es->num_point); + + if (verbose) { + for (ii = 0; ii < es->num_point; ii++) { + indent_printf(level+1, "Extent %5d: SPN 0x%08X", ii, es->point[ii]); + } + } + } +} + +static void +_show_cpi_info(CLPI_CPI *cpi, int level) +{ + CLPI_EP_MAP_ENTRY *entry; + CLPI_EP_COARSE *coarse; + CLPI_EP_FINE *fine; + int ii, jj, kk; + + indent_printf(level, "CPI"); + indent_printf(level+1, "Number Stream PID: %d", cpi->num_stream_pid); + for (ii = 0; ii < cpi->num_stream_pid; ii++) { + entry = &cpi->entry[ii]; + indent_printf(level+1, "Stream: %d", ii); + indent_printf(level+2, "PID: %04x", entry->pid); + indent_printf(level+2, "EP Stream Type: %d", entry->ep_stream_type); + indent_printf(level+2, "Number EP Coarse: %d", entry->num_ep_coarse); + indent_printf(level+2, "Number EP Fine: %d", entry->num_ep_fine); + indent_printf(level+2, "EP Map Start: %d", + entry->ep_map_stream_start_addr); + for (jj = 0; jj < entry->num_ep_coarse; jj++) { + coarse = &entry->coarse[jj]; + indent_printf(level+2, "Coarse: %d", jj); + indent_printf(level+3, "Ref EP Fine: %d", coarse->ref_ep_fine_id); + indent_printf(level+3, "PTS EP: %d", coarse->pts_ep); + indent_printf(level+3, "SPN EP: %d", coarse->spn_ep); + } + for (jj = 0; jj < entry->num_ep_fine; jj++) { + fine = &entry->fine[jj]; + indent_printf(level+2, "Fine: %d", jj); + indent_printf(level+3, "Angle Change Point: %s", + fine->is_angle_change_point ? "True":"False"); + indent_printf(level+3, "I End Offset: %d", + fine->i_end_position_offset); + indent_printf(level+3, "PTS EP: %d", fine->pts_ep); + indent_printf(level+3, "SPN EP: %d", fine->spn_ep); + } + if (verbose) { + uint64_t pts; + uint32_t spn; + + indent_printf(level+2, "PTS - SPN Map"); + for (jj = 0; jj < entry->num_ep_coarse; jj++) { + int start, end; + + indent_printf(level+3, "Coarse: %d", jj); + coarse = &entry->coarse[jj]; + start = coarse->ref_ep_fine_id; + if (jj < entry->num_ep_coarse - 1) { + end = entry->coarse[jj+1].ref_ep_fine_id; + } else { + end = entry->num_ep_fine; + } + for (kk = start; kk < end; kk++) { + fine = &entry->fine[kk]; + pts = ((uint64_t) (coarse->pts_ep & ~0x01) << 19) + + ((uint64_t)fine->pts_ep << 9); + spn = (coarse->spn_ep & ~0x1FFFF) + fine->spn_ep; + indent_printf(level+4, "PTS %8"PRIu64"/%8"PRIu64" -- SPN %u", + pts, pts >> 1, spn); + } + } + } + } +} + + +static void +_usage(char *cmd) +{ + fprintf(stderr, +"Usage: %s -vcspi [ ...]\n" +"With no options, produces no output (not very useful)\n" +"Options:\n" +" v - Verbose output.\n" +" c - Shows the Clip Info structure\n" +" s - Shows the Sequence Info structure\n" +" p - Shows the Program Info structure\n" +" i - Shows the CPI. PTS to SPN map\n" +" e - Shows Extent Start Table\n" +, cmd); + + exit(EXIT_FAILURE); +} + +#define OPTS "vcspie" + +int +main(int argc, char *argv[]) +{ + CLPI_CL *cl; + int opt; + int opt_clip_info = 0, opt_seq_info = 0, opt_prog_info = 0; + int opt_cpi_info = 0, opt_extent_start = 0; + int ii; + + do { + opt = getopt(argc, argv, OPTS); + switch (opt) { + case -1: break; + + case 'v': + verbose = 1; + break; + + case 's': + opt_seq_info = 1; + break; + + case 'i': + opt_cpi_info = 1; + break; + + case 'c': + opt_clip_info = 1; + break; + + case 'p': + opt_prog_info = 1; + break; + + case 'e': + opt_extent_start = 1; + break; + + default: + _usage(argv[0]); + break; + } + } while (opt != -1); + + if (optind >= argc) { + _usage(argv[0]); + } + + for (ii = optind; ii < argc; ii++) { + cl = bd_read_clpi(argv[ii]); + if (cl == NULL) { + fprintf(stderr, "Parsing %s failed\n", argv[ii]); + continue; + } + if (opt_clip_info) { + // Show clip info + _show_clip_info(cl, 1); + } + if (opt_seq_info) { + // Show sequence info + _show_seq_info(&cl->sequence, 1); + } + if (opt_prog_info) { + // Show program info + _show_prog_info(&cl->program, 1); + } + if (opt_cpi_info) { + // Show cpi + _show_cpi_info(&cl->cpi, 1); + } + + if (opt_prog_info) { + if (cl->program_ss.num_prog) { + printf("\n"); + indent_printf(1, "Extension: Program Info SS"); + _show_prog_info(&cl->program_ss, 1); + } + } + if (opt_cpi_info) { + if (cl->program_ss.num_prog) { + printf("\n"); + indent_printf(1, "Extension: CPI SS"); + _show_cpi_info(&cl->cpi_ss, 1); + } + } + if (opt_extent_start) { + // Show extent start point + if (cl->extent_start.num_point > 0) { + _show_extent_start(&cl->extent_start, 1); + } + } + + bd_free_clpi(cl); + } + return 0; +} + diff -Nru libbluray-0.8.1/src/devtools/hdmv_test.c libbluray-1.0.1/src/devtools/hdmv_test.c --- libbluray-0.8.1/src/devtools/hdmv_test.c 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/devtools/hdmv_test.c 2017-06-23 13:34:43.000000000 +0000 @@ -0,0 +1,264 @@ +/* + * This file is part of libbluray + * Copyright (C) 2010 hpi1 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * . + */ + +#include +#include +#include +#include + +#include "decoders/overlay.h" +#include "util/log_control.h" +#include "bluray.h" + + +#define PRINT_EV0(e) \ + case BD_EVENT_##e: \ + printf(#e "\n"); \ + break +#define PRINT_EV1(e,f) \ + case BD_EVENT_##e: \ + printf("%-25s " f "\n", #e ":", ev->param); \ + break + +static void _print_event(BD_EVENT *ev) +{ + switch ((bd_event_e)ev->event) { + + case BD_EVENT_NONE: + break; + + /* errors */ + + PRINT_EV1(ERROR, "%u"); + PRINT_EV1(READ_ERROR, "%u"); + PRINT_EV1(ENCRYPTED, "%u"); + + /* current playback position */ + + PRINT_EV1(ANGLE, "%u"); + PRINT_EV1(TITLE, "%u"); + PRINT_EV1(PLAYLIST, "%05u.mpls"); + PRINT_EV1(PLAYITEM, "%u"); + PRINT_EV1(PLAYMARK, "%u"); + PRINT_EV1(CHAPTER, "%u"); + PRINT_EV0(END_OF_TITLE); + + PRINT_EV1(STEREOSCOPIC_STATUS, "%u"); + + PRINT_EV1(SEEK, "%u"); + PRINT_EV0(DISCONTINUITY); + PRINT_EV0(PLAYLIST_STOP); + + /* Interactive */ + + PRINT_EV1(STILL_TIME, "%u"); + PRINT_EV1(STILL, "%u"); + PRINT_EV1(SOUND_EFFECT, "%u"); + PRINT_EV1(IDLE, "%u"); + PRINT_EV1(POPUP, "%u"); + PRINT_EV1(MENU, "%u"); + PRINT_EV1(UO_MASK_CHANGED, "0x%04x"); + PRINT_EV1(KEY_INTEREST_TABLE, "0x%04x"); + + /* stream selection */ + + PRINT_EV1(PG_TEXTST, "%u"); + PRINT_EV1(SECONDARY_AUDIO, "%u"); + PRINT_EV1(SECONDARY_VIDEO, "%u"); + PRINT_EV1(PIP_PG_TEXTST, "%u"); + + PRINT_EV1(AUDIO_STREAM, "%u"); + PRINT_EV1(IG_STREAM, "%u"); + PRINT_EV1(PG_TEXTST_STREAM, "%u"); + PRINT_EV1(SECONDARY_AUDIO_STREAM, "%u"); + PRINT_EV1(SECONDARY_VIDEO_STREAM, "%u"); + PRINT_EV1(SECONDARY_VIDEO_SIZE, "%u"); + PRINT_EV1(PIP_PG_TEXTST_STREAM, "%u"); + } + + fflush(stdout); +} + +static void _read_to_eof(BLURAY *bd) +{ + BD_EVENT ev; + int bytes; + uint64_t total = 0; + uint8_t buf[6144]; + + bd_seek(bd, bd_get_title_size(bd) - 6144); + + do { + bytes = bd_read_ext(bd, buf, 6144, &ev); + total += bytes < 0 ? 0 : bytes; + _print_event(&ev); + } while (bytes > 0); + + printf("_read_to_eof(): read %"PRIu64" bytes\n", total); +} + +static void _print_events(BLURAY *bd) +{ + BD_EVENT ev; + + do { + bd_read_ext(bd, NULL, 0, &ev); + _print_event(&ev); + } while (ev.event != BD_EVENT_NONE && ev.event != BD_EVENT_ERROR); +} + +static void _play_pl(BLURAY *bd) +{ + printf("Playing playlist\n"); + + fflush(stdout); + _read_to_eof(bd); + + printf("Playing playlist done\n\n"); + + _print_events(bd); + + printf("\n"); +} + +static void _overlay_cb(void *h, const struct bd_overlay_s * const ov) +{ + (void)h; + + if (ov) { + printf("OVERLAY @%ld p%d %d: %d,%d %dx%d\n", (long)ov->pts, ov->plane, ov->cmd, ov->x, ov->y, ov->w, ov->h); + + } else { + printf("OVERLAY CLOSE\n"); + } +} + +static void _argb_overlay_cb(void *h, const struct bd_argb_overlay_s * const ov) +{ + (void)h; + + if (ov) { + printf("ARGB OVERLAY @%ld p%d %d: %d,%d %dx%d\n", (long)ov->pts, ov->plane, ov->cmd, ov->x, ov->y, ov->w, ov->h); + + } else { + printf("ARGB OVERLAY CLOSE\n"); + } +} + +int main(int argc, char *argv[]) +{ + int title = -1; + int verbose = 0; + int args = 0; + + /* + * parse arguments + */ + + if (argc < 2) { + printf("\nUsage:\n %s [-v] [-t ] <media_path> [<keyfile_path>]\n\n", argv[0]); + return -1; + } + + if (!strcmp(argv[1+args], "-v")) { + verbose = 1; + args++; + } + + if (!strcmp(argv[1+args], "-t")) { + args++; + title = atoi(argv[1+args]); + args++; + printf("Requested title %d\n", title); + } + + if (verbose) { + printf("Enabling verbose debug\n"); + bd_set_debug_mask(bd_get_debug_mask() | DBG_HDMV | DBG_BLURAY); + } + + printf("\n"); + + /* + * open and setup + */ + + BLURAY *bd = bd_open(argv[1+args], argv[2+args]); + + if (!bd) { + printf("bd_open(\'%s\') failed\n", argv[1]); + return -1; + } + + bd_set_player_setting (bd, BLURAY_PLAYER_SETTING_PARENTAL, 99); + bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_AUDIO_LANG, "eng"); + bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_PG_LANG, "eng"); + bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_MENU_LANG, "eng"); + bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_COUNTRY_CODE, NULL); + + bd_register_overlay_proc(bd, bd, _overlay_cb); + bd_register_argb_overlay_proc(bd, bd, _argb_overlay_cb, NULL); + + /* + * play + */ + + printf("Running first play movie object\n"); + + fflush(stdout); + bd_play(bd); + + _print_events(bd); + + printf("\n"); + + /* + * play title + */ + + if (title >= 0) { + printf("Playing title %d\n", title); + + fflush(stdout); + bd_play_title(bd, title); + + _print_events(bd); + + printf("\n"); + } + + /* + * play playlist + */ + + _play_pl(bd); + + _play_pl(bd); + + _play_pl(bd); + + /* + * clean up + */ + + bd_close(bd); + + return 0; +} + diff -Nru libbluray-0.8.1/src/devtools/mobj_dump.c libbluray-1.0.1/src/devtools/mobj_dump.c --- libbluray-0.8.1/src/devtools/mobj_dump.c 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/devtools/mobj_dump.c 2017-06-23 13:34:43.000000000 +0000 @@ -0,0 +1,83 @@ +/* + * This file is part of libbluray + * Copyright (C) 2010 hpi1 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include "bluray.h" + +#include "hdmv/mobj_data.h" +#include "hdmv/mobj_print.h" + +#include <stdio.h> +#include <string.h> + +static void _mobj_print(MOBJ_OBJECTS *objects, int disasm) +{ + int o, c; + + printf("Number of objects: %d\n", objects->num_objects); + + for (o = 0; o < objects->num_objects; o++) { + + printf("Object %d:\n" + " number of commands: %d\n" + " resume intention flag: %d\n" + " menu call mask: %d\n" + " title search mask: %d\n", + o, objects->objects[o].num_cmds, + objects->objects[o].resume_intention_flag, + objects->objects[o].menu_call_mask, + objects->objects[o].title_search_mask); + + if (disasm) { + printf(" program:\n"); + for (c = 0; c < objects->objects[o].num_cmds; c++) { + char buf[256]; + mobj_sprint_cmd(buf, &objects->objects[o].cmds[c]); + printf(" %04d: %s\n", c, buf); + } + } + } +} + +int main(int argc, const char *argv[]) +{ + int disasm = 0; + MOBJ_OBJECTS *mobj = NULL; + + if (argc < 2) { + fprintf(stderr, + "usage: %s [-d] <file>\n" + "Options:\n" + " d disassemble object code\n", + argv[0]); + return 1; + } + if (argc > 2) { + disasm = !strcmp(argv[1], "-d"); + } + + mobj = bd_read_mobj(argv[argc-1]); + + if (mobj) { + _mobj_print(mobj, disasm); + + bd_free_mobj(mobj); + } + + return 0; +} diff -Nru libbluray-0.8.1/src/devtools/mpls_dump.c libbluray-1.0.1/src/devtools/mpls_dump.c --- libbluray-0.8.1/src/devtools/mpls_dump.c 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/devtools/mpls_dump.c 2017-06-23 13:34:43.000000000 +0000 @@ -0,0 +1,820 @@ +/* + * This file is part of libbluray + * Copyright (C) 2009-2010 John Stebbins + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <sys/stat.h> +#include <dirent.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <libgen.h> + +#include "bdnav/mpls_data.h" +#include "bluray.h" + +#include "util.h" + +#ifdef _WIN32 +# define DIR_SEP "\\" +# define PLAYLIST_DIR "\\BDMV\\PLAYLIST" +#else +# define DIR_SEP "/" +# define PLAYLIST_DIR "/BDMV/PLAYLIST" +#endif + + +static int verbose; + +typedef struct { + int value; + const char *str; +} VALUE_MAP; + +const VALUE_MAP codec_map[] = { + {0x01, "MPEG-1 Video"}, + {0x02, "MPEG-2 Video"}, + {0x03, "MPEG-1 Audio"}, + {0x04, "MPEG-2 Audio"}, + {0x80, "LPCM"}, + {0x81, "AC-3"}, + {0x82, "DTS"}, + {0x83, "TrueHD"}, + {0x84, "AC-3 Plus"}, + {0x85, "DTS-HD"}, + {0x86, "DTS-HD Master"}, + {0xa1, "AC-3 Plus for secondary audio"}, + {0xa2, "DTS-HD for secondary audio"}, + {0xea, "VC-1"}, + {0x1b, "H.264"}, + {0x90, "Presentation Graphics"}, + {0x91, "Interactive Graphics"}, + {0x92, "Text Subtitle"}, + {0, NULL} +}; + +const VALUE_MAP video_format_map[] = { + {0, "Reserved"}, + {1, "480i"}, + {2, "576i"}, + {3, "480p"}, + {4, "1080i"}, + {5, "720p"}, + {6, "1080p"}, + {7, "576p"}, + {0, NULL} +}; + +const VALUE_MAP video_rate_map[] = { + {0, "Reserved1"}, + {1, "23.976"}, + {2, "24"}, + {3, "25"}, + {4, "29.97"}, + {5, "Reserved2"}, + {6, "50"}, + {7, "59.94"}, + {0, NULL} +}; + +const VALUE_MAP audio_format_map[] = { + {0, "Reserved1"}, + {1, "Mono"}, + {2, "Reserved2"}, + {3, "Stereo"}, + {4, "Reserved3"}, + {5, "Reserved4"}, + {6, "Multi Channel"}, + {12, "Combo"}, + {0, NULL} +}; + +const VALUE_MAP audio_rate_map[] = { + {0, "Reserved1"}, + {1, "48 Khz"}, + {2, "Reserved2"}, + {3, "Reserved3"}, + {4, "96 Khz"}, + {5, "192 Khz"}, + {12, "48/192 Khz"}, + {14, "48/96 Khz"}, + {0, NULL} +}; + +const VALUE_MAP subpath_type_map[] = { + {2, "Primary audio of the Browsable slideshow"}, + {3, "Interactive Graphics presentation menu"}, + {4, "Text Subtitle"}, + {5, "Out-of-mux Synchronous elementary streams"}, + {6, "Out-of-mux Asynchronous Picture-in-Picture presentation"}, + {7, "In-mux Synchronous Picture-in-Picture presentation"}, + {8, "SS Video"}, + {0,NULL} +}; + +const VALUE_MAP playback_type_map[] = { + {1, "Sequential"}, + {2, "Random"}, + {3, "Shuffle"}, + {0, NULL} +}; + +const VALUE_MAP connection_type_map[] = { + {1, "Non-seamless"}, + {5, "Seamless"}, + {6, "Seamless"}, + {0, NULL} +}; + +static const char* +_lookup_str(const VALUE_MAP *map, int val) +{ + int ii; + + for (ii = 0; map[ii].str; ii++) { + if (val == map[ii].value) { + return map[ii].str; + } + } + return "?"; +} + +static char * +_mk_path(const char *base, const char *sub) +{ + size_t n1 = strlen(base); + size_t n2 = strlen(sub); + char *result = (char*)malloc(n1 + n2 + strlen(DIR_SEP) + 1); + if (result) { + strcpy(result, base); + strcat(result, DIR_SEP); + strcat(result, sub); + } + return result; +} + +static void +_show_stream(MPLS_STREAM *ss, int level) +{ + indent_printf(level, "Codec (%04x): %s", ss->coding_type, + _lookup_str(codec_map, ss->coding_type)); + switch (ss->stream_type) { + case 1: + indent_printf(level, "PID: %04x", ss->pid); + break; + + case 2: + case 4: + indent_printf(level, "SubPath Id: %02x", ss->subpath_id); + indent_printf(level, "SubClip Id: %02x", ss->subclip_id); + indent_printf(level, "PID: %04x", ss->pid); + break; + + case 3: + indent_printf(level, "SubPath Id: %02x", ss->subpath_id); + indent_printf(level, "PID: %04x", ss->pid); + break; + + default: + fprintf(stderr, "unrecognized stream type %02x\n", ss->stream_type); + break; + }; + + switch (ss->coding_type) { + case 0x01: + case 0x02: + case 0xea: + case 0x1b: + indent_printf(level, "Format %02x: %s", ss->format, + _lookup_str(video_format_map, ss->format)); + indent_printf(level, "Rate %02x: %s", ss->rate, + _lookup_str(video_rate_map, ss->rate)); + break; + + case 0x03: + case 0x04: + case 0x80: + case 0x81: + case 0x82: + case 0x83: + case 0x84: + case 0x85: + case 0x86: + case 0xa1: + case 0xa2: + indent_printf(level, "Format %02x: %s", ss->format, + _lookup_str(audio_format_map, ss->format)); + indent_printf(level, "Rate %02x: %s", ss->rate, + _lookup_str(audio_rate_map, ss->rate)); + indent_printf(level, "Language: %s", ss->lang); + break; + + case 0x90: + case 0x91: + indent_printf(level, "Language: %s", ss->lang); + break; + + case 0x92: + indent_printf(level, "Char Code: %02x", ss->char_code); + indent_printf(level, "Language: %s", ss->lang); + break; + + default: + fprintf(stderr, "unrecognized coding type %02x\n", ss->coding_type); + break; + }; +} + +static void +_show_details(MPLS_PL *pl, int level) +{ + int ii, jj, kk; + + for (ii = 0; ii < pl->list_count; ii++) { + MPLS_PI *pi; + + pi = &pl->play_item[ii]; + indent_printf(level, "Clip Id %s", pi->clip[0].clip_id); + indent_printf(level+1, "Stc Id: %02x", pi->clip[0].stc_id); + indent_printf(level+1, "Connection Condition: %s (%02x)", + _lookup_str(connection_type_map, pi->connection_condition), + pi->connection_condition); + indent_printf(level+1, "In-Time: %d", pi->in_time); + indent_printf(level+1, "Out-Time: %d", pi->out_time); + if (pi->still_mode == 1) { + indent_printf(level+1, "Still time: %ds\n", pi->still_time); + } + if (pi->still_mode == 2) { + indent_printf(level+1, "Still time: infinite\n"); + } + if (pi->angle_count > 1) { + for (jj = 1; jj < pi->angle_count; jj++) { + indent_printf(level+1, "Angle %d:", jj); + indent_printf(level+2, "Clip Id %s", pi->clip[jj].clip_id); + indent_printf(level+2, "Stc Id: %02x", pi->clip[jj].stc_id); + } + } + for (jj = 0; jj < pi->stn.num_video; jj++) { + indent_printf(level+1, "Video Stream %d:", jj); + _show_stream(&pi->stn.video[jj], level + 2); + } + for (jj = 0; jj < pi->stn.num_audio; jj++) { + indent_printf(level+1, "Audio Stream %d:", jj); + _show_stream(&pi->stn.audio[jj], level + 2); + } + for (jj = 0; jj < pi->stn.num_ig; jj++) { + indent_printf(level+1, "Interactive Graphics Stream %d:", jj); + _show_stream(&pi->stn.ig[jj], level + 2); + } + for (jj = 0; jj < (pi->stn.num_pg + pi->stn.num_pip_pg); jj++) { + if (jj < pi->stn.num_pg) { + indent_printf(level+1, "Presentation Graphics Stream %d:", jj); + } else { + indent_printf(level+1, "PIP Presentation Graphics Stream %d:", jj); + } + _show_stream(&pi->stn.pg[jj], level + 2); + } + for (jj = 0; jj < pi->stn.num_secondary_video; jj++) { + indent_printf(level+1, "Secondary Video Stream %d:", jj); + _show_stream(&pi->stn.secondary_video[jj], level + 2); + for (kk = 0; kk < pi->stn.secondary_video[jj].sv_num_secondary_audio_ref; kk++) { + indent_printf(level+2, "Secondary Audio Ref %d: %d", kk,pi->stn.secondary_video[jj].sv_secondary_audio_ref[kk]); + } + for (kk = 0; kk < pi->stn.secondary_video[jj].sv_num_pip_pg_ref; kk++) { + indent_printf(level+2, "PIP Presentation Graphic Ref %d: %d", kk,pi->stn.secondary_video[jj].sv_pip_pg_ref[kk]); + } + } + for (jj = 0; jj < pi->stn.num_secondary_audio; jj++) { + indent_printf(level+1, "Secondary Audio Stream %d:", jj); + _show_stream(&pi->stn.secondary_audio[jj], level + 2); + for (kk = 0; kk < pi->stn.secondary_audio[jj].sa_num_primary_audio_ref; kk++) { + indent_printf(level+2, "Primary Audio Ref %d: %d", kk,pi->stn.secondary_audio[jj].sa_primary_audio_ref[kk]); + } + } + printf("\n"); + } +} + +static void +_show_ai(MPLS_PL *pl, int level) +{ + indent_printf(level, "Playback type: %s (%d)", + _lookup_str(playback_type_map, pl->app_info.playback_type), + pl->app_info.playback_type); + if (pl->app_info.playback_type == 2 || pl->app_info.playback_type == 3) { + indent_printf(level+1, "Playback count: %d", pl->app_info.playback_count); + } +} + +static void +_show_marks(MPLS_PL *pl, int level) +{ + int ii; + + indent_printf(level, "PlayMark Count %d", pl->mark_count); + for (ii = 0; ii < pl->mark_count; ii++) { + MPLS_PI *pi; + MPLS_PLM *plm; + int min; + double sec; + + plm = &pl->play_mark[ii]; + indent_printf(level, "PlayMark %d", ii); + indent_printf(level+1, "Type: %02x", plm->mark_type); + if (plm->play_item_ref < pl->list_count) { + pi = &pl->play_item[plm->play_item_ref]; + indent_printf(level+1, "PlayItem: %s", pi->clip[0].clip_id); + } else { + indent_printf(level+1, "PlayItem: Invalid reference"); + } + indent_printf(level+1, "Time (ticks): %u", plm->time); + min = plm->duration / (45000*60); + sec = (double)(plm->duration - min * 45000 * 60) / 45000; + indent_printf(level+1, "Duration (mm:ss.ms, ticks): %d:%.2f, %u", + min, sec, plm->duration); + printf("\n"); + } +} + +static void +_show_clip_list(MPLS_PL *pl, int level) +{ + int ii, jj; + + for (ii = 0; ii < pl->list_count; ii++) { + MPLS_PI *pi; + + pi = &pl->play_item[ii]; + if (verbose) { + uint32_t duration; + + duration = pi->out_time - pi->in_time; + indent_printf(level, "%s.m2ts -- Duration: %3d:%02d", + pi->clip[0].clip_id, + duration / (45000 * 60), (duration / 45000) % 60); + } else { + indent_printf(level, "%s.m2ts", pi->clip[0].clip_id); + } + if (pi->angle_count > 1) { + for (jj = 1; jj < pi->angle_count; jj++) { + indent_printf(level+1, "Angle %d: %s.m2ts", jj+1, pi->clip[jj].clip_id); + } + } + } + printf("\n"); +} + +static void +_show_sub_path(MPLS_SUB *sub, int level) +{ + int ii; + + indent_printf(level+1, "Type: %d (%s)", sub->type, _lookup_str(subpath_type_map, sub->type)); + indent_printf(level+1, "Repeat: %d", sub->is_repeat); + indent_printf(level+1, "Sub playitem count: %d", sub->sub_playitem_count); + + for (ii = 0; ii < sub->sub_playitem_count; ii++) { + MPLS_SUB_PI *pi; + + pi = &sub->sub_play_item[ii]; + + if (verbose) { + indent_printf(level+1, "Sub playitem %d", ii); + indent_printf(level+2, "Clip Id %s", pi->clip[0].clip_id); + indent_printf(level+2, "Multi clip: %d", pi->is_multi_clip); + indent_printf(level+2, "Clip count: %d", pi->clip_count); + indent_printf(level+2, "Connection Condition: %s (%02x)", + _lookup_str(connection_type_map, pi->connection_condition), + pi->connection_condition); + indent_printf(level+2, "In-Time: %d", pi->in_time); + indent_printf(level+2, "Out-Time: %d", pi->out_time); + indent_printf(level+2, "Sync playitem Id: %d", pi->sync_play_item_id); + indent_printf(level+2, "Sync PTS: %d", pi->sync_pts); + } else { + indent_printf(level+1, "%s.m2ts", pi->clip[0].clip_id); + } + } +} + +static void +_show_pip_metadata_block(MPLS_PIP_METADATA *block, int level) +{ + int ii; + + indent_printf(level, "Clip ref: %d", block->clip_ref); + indent_printf(level, "Secondary video ref: %d", block->secondary_video_ref); + indent_printf(level, "Timeline type: %d", block->timeline_type); + indent_printf(level, "Luma key flag: %d", block->luma_key_flag); + if (block->luma_key_flag) { + indent_printf(level, "Upper limit luma key: %d", block->upper_limit_luma_key); + } + indent_printf(level, "Trick play flag: %d", block->trick_play_flag); + + for (ii = 0; ii < block->data_count; ii++) { + indent_printf(level, "data block %d:", ii); + indent_printf(level+1, "Timestamp: %d", block->data[ii].time); + indent_printf(level+1, "Horizontal position %d", block->data[ii].xpos); + indent_printf(level+1, "Vertical position: %d", block->data[ii].ypos); + indent_printf(level+1, "Scaling factor: %d", block->data[ii].scale_factor); + } +} + +static void +_show_pip_metadata(MPLS_PL *pl, int level) +{ + int ii; + + for (ii = 0; ii < pl->ext_pip_data_count; ii++) { + MPLS_PIP_METADATA *data; + + data = &pl->ext_pip_data[ii]; + + indent_printf(level, "PiP metadata block %d:", ii); + _show_pip_metadata_block(data, level+1); + } +} + +static void +_show_sub_paths(MPLS_PL *pl, int level) +{ + int ss; + + for (ss = 0; ss < pl->sub_count; ss++) { + MPLS_SUB *sub; + + sub = &pl->sub_path[ss]; + + indent_printf(level, "Sub Path %d:", ss); + _show_sub_path(sub, level+1); + } +} + +static void +_show_sub_paths_ss(MPLS_PL *pl, int level) +{ + int ss; + + for (ss = 0; ss < pl->ext_sub_count; ss++) { + MPLS_SUB *sub; + + sub = &pl->ext_sub_path[ss]; + + indent_printf(level, "Extension Sub Path %d:", ss); + _show_sub_path(sub, level+1); + } +} + +static uint32_t +_pl_duration(MPLS_PL *pl) +{ + int ii; + uint32_t duration = 0; + MPLS_PI *pi; + + for (ii = 0; ii < pl->list_count; ii++) { + pi = &pl->play_item[ii]; + duration += pi->out_time - pi->in_time; + } + return duration; +} + +static int +_filter_dup(MPLS_PL *pl_list[], int count, MPLS_PL *pl) +{ + int ii, jj; + + for (ii = 0; ii < count; ii++) { + if (pl->list_count != pl_list[ii]->list_count || + _pl_duration(pl) != _pl_duration(pl_list[ii])) { + continue; + } + for (jj = 0; jj < pl->list_count; jj++) { + MPLS_PI *pi1, *pi2; + + pi1 = &pl->play_item[jj]; + pi2 = &pl_list[ii]->play_item[jj]; + + if (memcmp(pi1->clip[0].clip_id, pi2->clip[0].clip_id, 5) != 0 || + pi1->in_time != pi2->in_time || + pi1->out_time != pi2->out_time) { + break; + } + } + if (jj != pl->list_count) { + continue; + } + return 0; + } + return 1; +} + +static int +_find_repeats(MPLS_PL *pl, const char *m2ts) +{ + int ii, count = 0; + + for (ii = 0; ii < pl->list_count; ii++) { + MPLS_PI *pi; + + pi = &pl->play_item[ii]; + // Ignore titles with repeated segments + if (strcmp(pi->clip[0].clip_id, m2ts) == 0) { + count++; + } + } + return count; +} + +static int +_filter_short(MPLS_PL *pl, unsigned int seconds) +{ + // Ignore short playlists + if (_pl_duration(pl) / 45000 <= seconds) { + return 0; + } + return 1; +} + +static int +_filter_repeats(MPLS_PL *pl, int repeats) +{ + int ii; + + for (ii = 0; ii < pl->list_count; ii++) { + MPLS_PI *pi; + + pi = &pl->play_item[ii]; + // Ignore titles with repeated segments + if (_find_repeats(pl, pi->clip[0].clip_id) > repeats) { + return 0; + } + } + return 1; +} + +static int clip_list = 0, playlist_info = 0, chapter_marks = 0, sub_paths = 0, pip_metadata = 0; +static int repeats = 0, seconds = 0, dups = 0; + +static MPLS_PL* +_process_file(char *name, MPLS_PL *pl_list[], int pl_count) +{ + MPLS_PL *pl; + + pl = bd_read_mpls(name); + if (pl == NULL) { + fprintf(stderr, "Parse failed: %s\n", name); + return NULL; + } + if (seconds) { + if (!_filter_short(pl, seconds)) { + bd_free_mpls(pl); + return NULL; + } + } + if (repeats) { + if (!_filter_repeats(pl, repeats)) { + bd_free_mpls(pl); + return NULL; + } + } + if (dups) { + if (!_filter_dup(pl_list, pl_count, pl)) { + bd_free_mpls(pl); + return NULL; + } + } + if (verbose) { + indent_printf(0, + "%s -- Num Clips: %3d , Duration: minutes %4u:%02u", + basename(name), + pl->list_count, + _pl_duration(pl) / (45000 * 60), + (_pl_duration(pl) / 45000) % 60); + _show_ai(pl, 1); + } else { + indent_printf(0, "%s -- Duration: minutes %4u:%02u", + basename(name), + _pl_duration(pl) / (45000 * 60), + (_pl_duration(pl) / 45000) % 60); + } + if (playlist_info) { + _show_details(pl, 1); + } + if (chapter_marks) { + _show_marks(pl, 1); + } + if (pip_metadata) { + _show_pip_metadata(pl, 1); + } + if (clip_list) { + _show_clip_list(pl, 1); + } + if (sub_paths) { + _show_sub_paths(pl, 1); + _show_sub_paths_ss(pl, 1); + } + return pl; +} + +static void +_usage(char *cmd) +{ + fprintf(stderr, +"Usage: %s -vli <mpls file> [<mpls file> ...]\n" +"With no options, produces a list of the playlist(s) with durations\n" +"Options:\n" +" v - Verbose output.\n" +" l - Produces a list of the m2ts clips\n" +" i - Dumps detailed information about each clip\n" +" c - Show chapter marks\n" +" p - Show sub paths\n" +" P - Show picture-in-picture metadata\n" +" r <N> - Filter out titles that have >N repeating clips\n" +" d - Filter out duplicate titles\n" +" s <seconds> - Filter out short titles\n" +" f - Filter combination -r2 -d -s900\n" +, cmd); + + exit(EXIT_FAILURE); +} + +#define OPTS "vlicpPfr:ds:" + +static int +_qsort_str_cmp(const void *a, const void *b) +{ + const char *stra = *(char * const *)a; + const char *strb = *(char * const *)b; + + return strcmp(stra, strb); +} + +int +main(int argc, char *argv[]) +{ + MPLS_PL *pl; + int opt; + int ii, pl_ii; + MPLS_PL *pl_list[1000]; + struct stat st; + char *path = NULL; + DIR *dir = NULL; + + do { + opt = getopt(argc, argv, OPTS); + switch (opt) { + case -1: + break; + + case 'v': + verbose = 1; + break; + + case 'l': + clip_list = 1; + break; + + case 'i': + playlist_info = 1; + break; + + case 'c': + chapter_marks = 1; + break; + + case 'p': + sub_paths = 1; + break; + + case 'P': + pip_metadata = 1; + break; + + case 'd': + dups = 1; + break; + + case 'r': + repeats = atoi(optarg); + break; + + case 'f': + repeats = 2; + dups = 1; + seconds = 900; + break; + + case 's': + seconds = atoi(optarg); + break; + + default: + _usage(argv[0]); + break; + } + } while (opt != -1); + + if (optind >= argc) { + _usage(argv[0]); + } + + for (pl_ii = 0, ii = optind; pl_ii < 1000 && ii < argc; ii++) { + + if (stat(argv[ii], &st)) { + continue; + } + dir = NULL; + if (S_ISDIR(st.st_mode)) { + + printf("Directory: %s:\n", argv[ii]); + + /* drop old ones (do not check for duplicates across directories) */ + for (int jj = 0; jj < pl_ii; jj++) { + bd_free_mpls(pl_list[jj]); + } + pl_ii = 0; + + path = _mk_path(argv[ii], PLAYLIST_DIR); + if (path == NULL) { + fprintf(stderr, "Failed to find playlist path: %s\n", argv[ii]); + continue; + } + dir = opendir(path); + if (dir == NULL) { + fprintf(stderr, "Failed to open dir: %s\n", path); + free(path); + continue; + } + } + if (dir != NULL) { + char **dirlist = (char**)calloc(10001, sizeof(char*)); + if (!dirlist) { + continue; + } + struct dirent *ent; + int jj = 0; + for (ent = readdir(dir); ent != NULL && jj < 1000; ent = readdir(dir)) { + char *s = (char*)malloc(strlen(ent->d_name) + 1); + if (s) { + dirlist[jj++] = strcpy(s, ent->d_name); + } + } + qsort(dirlist, jj, sizeof(char*), _qsort_str_cmp); + for (jj = 0; dirlist[jj] != NULL && pl_ii < 1000; jj++) { + char *name = NULL; + name = _mk_path(path, dirlist[jj]); + if (name == NULL) { + continue; + } + free(dirlist[jj]); + if (stat(name, &st)) { + free(name); + continue; + } + if (!S_ISREG(st.st_mode)) { + free(name); + continue; + } + pl = _process_file(name, pl_list, pl_ii); + free(name); + if (pl != NULL) { + pl_list[pl_ii++] = pl; + } + } + free(dirlist); + free(path); + closedir(dir); + dir = NULL; + } else { + pl = _process_file(argv[ii], pl_list, pl_ii); + if (pl != NULL) { + pl_list[pl_ii++] = pl; + } + } + if (pl_ii >= 999) { + fprintf(stderr, "Error: too many play lists given. Output is truncated.\n"); + } + } + + // Cleanup + for (ii = 0; ii < pl_ii; ii++) { + bd_free_mpls(pl_list[ii]); + } + return 0; +} + diff -Nru libbluray-0.8.1/src/devtools/util.c libbluray-1.0.1/src/devtools/util.c --- libbluray-0.8.1/src/devtools/util.c 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/devtools/util.c 2017-06-23 13:34:43.000000000 +0000 @@ -0,0 +1,40 @@ +/* + * This file is part of libbluray + * Copyright (C) 2009-2010 John Stebbins + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <stdio.h> +#include <stdarg.h> + +#include "util.h" + +void +indent_printf(int level, const char *fmt, ...) +{ + va_list ap; + int ii; + + for (ii = 0; ii < level; ii++) + { + printf(" "); + } + va_start(ap, fmt); + vprintf(fmt, ap); + va_end(ap); + printf("\n"); +} + diff -Nru libbluray-0.8.1/src/devtools/util.h libbluray-1.0.1/src/devtools/util.h --- libbluray-0.8.1/src/devtools/util.h 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/devtools/util.h 2017-06-23 13:34:43.000000000 +0000 @@ -0,0 +1,43 @@ +/* + * This file is part of libbluray + * Copyright (C) 2009-2010 John Stebbins + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <stdint.h> + +#include "util/attributes.h" + +#if defined( __MINGW32__ ) +# undef lseek +# define lseek _lseeki64 +# undef fseeko +# define fseeko fseeko64 +# undef ftello +# define ftello ftello64 +# define flockfile(...) +# define funlockfile(...) +# define getc_unlocked getc +# undef off_t +# define off_t off64_t +# undef stat +# define stat _stati64 +# define fstat _fstati64 +# define wstat _wstati64 +#endif + +void indent_printf(int level, const char *fmt, ...) BD_ATTR_FORMAT_PRINTF(2,3); + diff -Nru libbluray-0.8.1/src/examples/bd_info.c libbluray-1.0.1/src/examples/bd_info.c --- libbluray-0.8.1/src/examples/bd_info.c 2015-05-15 09:23:46.000000000 +0000 +++ libbluray-1.0.1/src/examples/bd_info.c 2017-06-23 13:34:43.000000000 +0000 @@ -22,8 +22,8 @@ #include <inttypes.h> #include <unistd.h> -#include "libbluray/bdnav/meta_data.h" -#include "libbluray/bluray.h" +#include "bdnav/meta_data.h" +#include "bluray.h" static const char *_yes_no(int i) { @@ -143,9 +143,13 @@ int main(int argc, char *argv[]) { + int major, minor, micro; const char *disc_root = (argc > 1) ? argv[1] : NULL; const char *keyfile = (argc > 2) ? argv[2] : NULL; + bd_get_version(&major, &minor, µ); + printf("Using libbluray version %d.%d.%d\n", major, minor, micro); + if (!disc_root) { fprintf(stderr, "%s <BD base dir> [keyfile]\n" @@ -178,13 +182,10 @@ printf("BD-J titles : %d\n", info->num_bdj_titles); printf("UNSUPPORTED titles : %d\n", info->num_unsupported_titles); - printf("\nBD-J detected : %s\n", _yes_no(info->bdj_supported)); + printf("\nBD-J detected : %s\n", _yes_no(info->bdj_detected)); if (info->bdj_detected) { - printf("BD-J supported : %s\n", _yes_no(info->bdj_supported)); - if (info->bdj_supported) { - printf("Java VM found : %s\n", _yes_no(info->libjvm_detected)); - printf("BD-J handled : %s\n", _yes_no(info->bdj_handled)); - } + printf("Java VM found : %s\n", _yes_no(info->libjvm_detected)); + printf("BD-J handled : %s\n", _yes_no(info->bdj_handled)); printf("BD-J organization ID: %s\n", info->bdj_org_id); printf("BD-J disc ID : %s\n", info->bdj_disc_id); } diff -Nru libbluray-0.8.1/src/examples/bdjo_dump.c libbluray-1.0.1/src/examples/bdjo_dump.c --- libbluray-0.8.1/src/examples/bdjo_dump.c 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/examples/bdjo_dump.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,206 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2014 Petri Hintukainen <phintuka@users.sourceforge.net> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -#include "libbluray/bluray.h" -#include "libbluray/bdj/bdjo_data.h" - -#include <stdio.h> -#include <string.h> - -static const char *_yes_no(int i) -{ - return i > 0 ? "yes" : i < 0 ? "unknown" : "no"; -} - -static const char *_binding_str(int i) -{ - switch (i) { - case 0: return "unbound"; - case 1: return "disc bound"; - case 3: return "title bound"; - default: return "???"; - } -} - -static const char *_visibility_str(int i) -{ - switch (i) { - case 0: return "none"; - case 1: return "applications"; - case 2: return "user"; - default: return "???"; - } -} - -static void _terminal_info_print(const BDJO_TERMINAL_INFO *p) -{ - printf("Terminal Info:\n"); - printf(" Default AWT font : %s\n", p->default_font); - printf(" initial HaVi config : %d\n", p->initial_havi_config_id); - printf(" Menu call mask : %d\n", p->menu_call_mask); - printf(" Title search mask : %d\n", p->menu_call_mask); -} - -static void _app_cache_item_print(const BDJO_APP_CACHE_ITEM *p) -{ - printf(" %3.3s: %s%s\n", - p->lang_code, p->ref_to_name, - p->type == 1 ? ".jar" : p->type == 2 ? "/" : " (unknown type)"); -} - -static void _app_cache_info_print(const BDJO_APP_CACHE_INFO *p) -{ - unsigned ii; - - printf("Application cache info:\n"); - for (ii = 0; ii < p->num_item; ii++) { - _app_cache_item_print(&p->item[ii]); - } -} - -static void _accessible_playlists_print(const BDJO_ACCESSIBLE_PLAYLISTS *p) -{ - unsigned ii; - - printf("Accessible playlists:\n"); - printf(" Access to all : %s\n", _yes_no(p->access_to_all_flag)); - printf(" Autostart first : %s\n", _yes_no(p->autostart_first_playlist_flag)); - - if (p->num_pl) { - printf(" Playlists : %d\n", p->num_pl); - for (ii = 0; ii < p->num_pl; ii++) { - printf(" %s.mpls\n", p->pl[ii].name); - } - } -} - -static void _app_profile_print(BDJO_APP_PROFILE *p) -{ - printf(" Profile %d Version %d.%d.%d\n", - p->profile_number, p->major_version, p->minor_version, p->micro_version); -} - -static void _app_print(const BDJO_APP *p) -{ - unsigned ii; - - printf(" Control code: : %d (%s)\n", p->control_code, - p->control_code == 1 ? "autostart" : p->control_code == 2 ? "present" : "???"); - printf(" Type : %d (%s)\n", p->type, - p->type == 1 ? "BD-J App" : "???"); - printf(" Organization ID : %08X\n", p->org_id); - printf(" Application ID : %04X\n", p->app_id); - printf(" Priority : %d\n", p->priority); - printf(" Binding : %d (%s)\n", p->binding, _binding_str(p->binding)); - printf(" Visibility : %d (%s)\n", p->visibility, _visibility_str(p->visibility)); - - if (p->num_profile) { - printf(" Profiles:\n"); - for (ii = 0; ii < p->num_profile; ii++) { - _app_profile_print(&p->profile[ii]); - } - } - - if (p->num_name) { - printf(" Names:\n"); - for (ii = 0; ii < p->num_name; ii++) { - printf(" %s: %s\n", p->name[ii].lang, p->name[ii].name); - } - } - - printf(" Base directory : %s\n", p->base_dir); - printf(" Icon locator : %s\n", p->icon_locator); - printf(" Icon flags : 0x%04x\n", p->icon_flags); - printf(" Classpath extension : %s\n", p->classpath_extension); - printf(" Initial class : %s\n", p->initial_class); - printf(" Parameters : "); - for (ii = 0; ii < p->num_param; ii++) { - printf("%s ", p->param[ii].param); - } - printf("\n"); -} - -static void _app_management_table_print(const BDJO_APP_MANAGEMENT_TABLE *p) -{ - unsigned ii; - - for (ii = 0; ii < p->num_app; ii++) { - printf("Application %d:\n", ii); - _app_print(&p->app[ii]); - } -} - -static void _key_interest_table_print(const BDJO_KEY_INTEREST_TABLE *p) -{ - unsigned int v; - memcpy(&v, p, sizeof(unsigned int)); - if (v) { - printf("Key interest table:\n"); - printf(" %s%s%s%s%s%s%s%s%s%s%s\n", - p->vk_play ? "VK_PLAY " : "", - p->vk_stop ? "VK_STOP " : "", - p->vk_ffw ? "VK_FFW " : "", - p->vk_rew ? "VK_REW " : "", - p->vk_track_next ? "VK_TRACK_NEXT " : "", - p->vk_track_prev ? "VK_TRACK_PREV " : "", - p->vk_pause ? "VK_PAUSE " : "", - p->vk_still_off ? "VK_STILL_OFF " : "", - p->vk_sec_audio_ena_dis ? "VK_SEC_AUDIO " : "", - p->vk_sec_video_ena_dis ? "VK_SEC_VIDEO " : "", - p->pg_textst_ena_dis ? "VK_PG_TEXTST " : ""); - } -} - -static void _file_access_info_print(const BDJO_FILE_ACCESS_INFO *p) -{ - printf("File access info:\n %s\n", p->path); -} - -static void _bdjo_print(const BDJO *p) -{ - _terminal_info_print(&p->terminal_info); - _app_cache_info_print(&p->app_cache_info); - _accessible_playlists_print(&p->accessible_playlists); - _app_management_table_print(&p->app_table); - _key_interest_table_print(&p->key_interest_table); - _file_access_info_print(&p->file_access_info); -} - -int main(int argc, const char *argv[]) -{ - if (argc < 2) { - fprintf(stderr, "usage: %s <bdjo_file>\n", argv[0]); - return 1; - } - - int cnt; - for (cnt = 1; cnt < argc; cnt++) { - - printf("%s\n", argv[cnt]); - - BDJO *bdjo = bd_read_bdjo(argv[cnt]); - if (bdjo) { - _bdjo_print(bdjo); - bd_free_bdjo(bdjo); - } - printf("\n"); - } - - return 0; -} diff -Nru libbluray-0.8.1/src/examples/bdj_test.c libbluray-1.0.1/src/examples/bdj_test.c --- libbluray-0.8.1/src/examples/bdj_test.c 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/examples/bdj_test.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2010 William Hahne - * - * 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 the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - * In addition, as a special exception, the copyright holders of libbluray - * gives permission to link the code of its release of libbluray with the - * OpenSSL project's "OpenSSL" library (or with modified versions of it - * that use the same license as the "OpenSSL" library), and distribute - * the linked executables. You must obey the GNU General Public License - * in all respects for all of the code used other than "OpenSSL". If you - * modify this file, you may extend this exception to your version of the - * file, but you are not obligated to do so. If you do not wish to do - * so, delete this exception statement from your version. - */ - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> - -#include "libbluray/bluray.h" - -#if defined(_WIN32) -#include <windows.h> -#define sleep(x) Sleep(x) -#endif - -static void _usage(void) { - printf("Usage: [path to disc] [starting object]\n"); -} - -int main(int argc, char** argv) -{ - if (argc < 3) { - _usage(); - return 0; - } - - printf("%s %s\n", argv[1], argv[2]); - - BLURAY* bd = bd_open(argv[1], NULL); - - bd_get_titles(bd, TITLES_ALL, 0); - - if (!bd_start_bdj(bd, argv[2])) { - printf("Failed to start BD-J application.\n"); - } else { - while (1) { sleep(20); } - bd_stop_bdj(bd); - } - - bd_close(bd); - - return 0; -} diff -Nru libbluray-0.8.1/src/examples/bdsplice.c libbluray-1.0.1/src/examples/bdsplice.c --- libbluray-0.8.1/src/examples/bdsplice.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/examples/bdsplice.c 2017-06-23 13:34:43.000000000 +0000 @@ -17,17 +17,13 @@ * <http://www.gnu.org/licenses/>. */ -#if HAVE_CONFIG_H -#include "config.h" -#endif - #include <stdio.h> #include <stdlib.h> #include <unistd.h> #include <libgen.h> #include <inttypes.h> -#include "libbluray/bluray.h" +#include "bluray.h" #define PKT_SIZE 192 #define BUF_SIZE (PKT_SIZE * 1024) diff -Nru libbluray-0.8.1/src/examples/clpi_dump.c libbluray-1.0.1/src/examples/clpi_dump.c --- libbluray-0.8.1/src/examples/clpi_dump.c 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/examples/clpi_dump.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,487 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2009-2010 John Stebbins - * Copyright (C) 2012-2013 Petri Hintukainen <phintuka@users.sourceforge.net> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <inttypes.h> - -#include "libbluray/bdnav/clpi_data.h" -#include "libbluray/bluray.h" - -#include "util.h" - -static int verbose; - -typedef struct { - int value; - const char *str; -} VALUE_MAP; - -static inline const char* -_lookup_str(const VALUE_MAP *map, int val) -{ - int ii; - - for (ii = 0; map[ii].str; ii++) { - if (val == map[ii].value) { - return map[ii].str; - } - } - return "?"; -} - -const VALUE_MAP codec_map[] = { - {0x01, "MPEG-1 Video"}, - {0x02, "MPEG-2 Video"}, - {0x03, "MPEG-1 Audio"}, - {0x04, "MPEG-2 Audio"}, - {0x80, "LPCM"}, - {0x81, "AC-3"}, - {0x82, "DTS"}, - {0x83, "TrueHD"}, - {0x84, "AC-3 Plus"}, - {0x85, "DTS-HD"}, - {0x86, "DTS-HD Master"}, - {0xa1, "AC-3 Plus for secondary audio"}, - {0xa2, "DTS-HD for secondary audio"}, - {0xea, "VC-1"}, - {0x1b, "H.264"}, - {0x20, "H.264 MVC dep."}, - {0x90, "Presentation Graphics"}, - {0x91, "Presentation Graphics"}, - {0x92, "Interactive Graphics"}, - {0, NULL} -}; - -const VALUE_MAP video_format_map[] = { - {0, "Reserved"}, - {1, "480i"}, - {2, "576i"}, - {3, "480p"}, - {4, "1080i"}, - {5, "720p"}, - {6, "1080p"}, - {7, "576p"}, - {0, NULL} -}; - -const VALUE_MAP video_rate_map[] = { - {0, "Reserved1"}, - {1, "23.976"}, - {2, "24"}, - {3, "25"}, - {4, "29.97"}, - {5, "Reserved2"}, - {6, "50"}, - {7, "59.94"}, - {0, NULL} -}; - -const VALUE_MAP video_aspect_map[] = { - {0, "Reserved1"}, - {1, "Reserved2"}, - {2, "4:3"}, - {3, "16:9"}, - {0, NULL} -}; - -const VALUE_MAP audio_format_map[] = { - {0, "Reserved1"}, - {1, "Mono"}, - {2, "Reserved2"}, - {3, "Stereo"}, - {4, "Reserved3"}, - {5, "Reserved4"}, - {6, "Multi Channel"}, - {12, "Combo"}, - {0, NULL} -}; - -const VALUE_MAP audio_rate_map[] = { - {0, "Reserved1"}, - {1, "48 Khz"}, - {2, "Reserved2"}, - {3, "Reserved3"}, - {4, "96 Khz"}, - {5, "192 Khz"}, - {12, "48/192 Khz"}, - {14, "48/96 Khz"}, - {0, NULL} -}; - -const VALUE_MAP application_type_map[] = { - {1, "Main TS for a main-path of Movie"}, - {2, "Main TS for a main-path of Time based slide show"}, - {3, "Main TS for a main-path of Browsable slide show"}, - {4, "Sub TS for a sub-path of Browsable slide show"}, - {5, "Sub TS for a sub-path of Interactive Graphics menu"}, - {6, "Sub TS for a sub-path of Text subtitle"}, - {7, "Sub TS for a sub-path of one or more elementary streams path"}, - {0, NULL}, -}; - -static void -_show_stream(CLPI_PROG_STREAM *ss, int level) -{ - indent_printf(level, "Codec (%04x): %s", ss->coding_type, - _lookup_str(codec_map, ss->coding_type)); - indent_printf(level, "PID: %04x", ss->pid); - switch (ss->coding_type) { - case 0x01: - case 0x02: - case 0xea: - case 0x1b: - case 0x20: - indent_printf(level, "Format %02x: %s", ss->format, - _lookup_str(video_format_map, ss->format)); - indent_printf(level, "Rate %02x: %s", ss->rate, - _lookup_str(video_rate_map, ss->rate)); - indent_printf(level, "Aspect %02x: %s", ss->aspect, - _lookup_str(video_aspect_map, ss->aspect)); - indent_printf(level, "oc_flag %02x", ss->oc_flag); - break; - - case 0x03: - case 0x04: - case 0x80: - case 0x81: - case 0x82: - case 0x83: - case 0x84: - case 0x85: - case 0x86: - case 0xa1: - case 0xa2: - indent_printf(level, "Format %02x: %s", ss->format, - _lookup_str(audio_format_map, ss->format)); - indent_printf(level, "Rate %02x: %s", ss->rate, - _lookup_str(audio_rate_map, ss->rate)); - indent_printf(level, "Language: %s", ss->lang); - break; - - case 0x90: - case 0x91: - case 0xa0: - indent_printf(level, "Language: %s", ss->lang); - break; - - case 0x92: - indent_printf(level, "Char Code: %02x", ss->char_code); - indent_printf(level, "Language: %s", ss->lang); - break; - - default: - fprintf(stderr, "unrecognized coding type %02x\n", ss->coding_type); - break; - }; -} - -static void -_show_clip_info(CLPI_CL *cl, int level) -{ - CLPI_CLIP_INFO *ci = &cl->clip; - int ii; - - indent_printf(level, "Clip Info"); - indent_printf(level+1, "Clip Stream Type: %02x", ci->clip_stream_type); - indent_printf(level+1, "Clip Application Type (%02x): %s", - ci->application_type, _lookup_str(application_type_map, ci->application_type)); - indent_printf(level+1, "is_ATC_delta: %s", ci->is_atc_delta ? "True" : "False"); - indent_printf(level+1, "ATC delta count: %d", ci->atc_delta_count); - indent_printf(level+1, "TS Recording Rate: %u", ci->ts_recording_rate); - indent_printf(level+1, "Number Source Packets: %u", ci->num_source_packets); - // Show ts type info - indent_printf(level+1, "TS Type Info"); - indent_printf(level+2, "Validity Flags %02x", ci->ts_type_info.validity); - indent_printf(level+2, "Format Id %s", ci->ts_type_info.format_id); - // Show cc5 thing - for (ii = 0; ii < ci->atc_delta_count; ii++) { - indent_printf(level+1, "ATC delta[ %d ]", ii); - indent_printf(level+2, "Delta %08x", ci->atc_delta[ii].delta); - indent_printf(level+2, "File Id %s", ci->atc_delta[ii].file_id); - indent_printf(level+2, "File Code %s", ci->atc_delta[ii].file_code); - } - // show fonts - if (cl->font_info.font_count) { - indent_printf(level+1, "Font files"); - for (ii = 0; ii < cl->font_info.font_count; ii++) { - indent_printf(level+2, "Font file %d: %s.otf", ii+1, cl->font_info.font[ii].file_id); - } - } - - printf("\n"); -} - -static void -_show_seq_info(CLPI_SEQ_INFO *si, int level) -{ - CLPI_ATC_SEQ *atc; - CLPI_STC_SEQ *stc; - int ii, jj; - - indent_printf(level, "Sequence Info"); - indent_printf(level+1, "Number ATC Sequences: %d", si->num_atc_seq); - for (ii = 0; ii < si->num_atc_seq; ii++) { - atc = &si->atc_seq[ii]; - indent_printf(level+1, "ATC Sequence %d", ii); - indent_printf(level+2, "SPN ATC Start: %u", atc->spn_atc_start); - indent_printf(level+2, "Offset STC Id: %d", atc->offset_stc_id); - indent_printf(level+2, "Number STC Sequences: %d", atc->num_stc_seq); - for (jj = 0; jj < atc->num_stc_seq; jj++) { - stc = &atc->stc_seq[jj]; - indent_printf(level+2, "ATC Sequence %d", jj); - indent_printf(level+3, "SPN STC Start: %u", stc->spn_stc_start); - indent_printf(level+3, "PCR PID: %04x", stc->pcr_pid); - indent_printf(level+3, "Presentation Start: %u", - stc->presentation_start_time); - indent_printf(level+3, "Presentation End: %u", - stc->presentation_end_time); - } - } -} - -static void -_show_prog_info(CLPI_PROG_INFO *pi, int level) -{ - CLPI_PROG *prog; - int ii, jj; - - indent_printf(level, "Program Info"); - indent_printf(level+1, "Number Programs: %d", pi->num_prog); - for (ii = 0; ii < pi->num_prog; ii++) { - prog = &pi->progs[ii]; - indent_printf(level+1, "Program %d", ii); - indent_printf(level+2, "SPN Program Sequence Start: %d", - prog->spn_program_sequence_start); - indent_printf(level+2, "Program Map PID: %d", prog->program_map_pid); - indent_printf(level+2, "Number Streams: %d", prog->num_streams); - indent_printf(level+2, "Number Groups: %d", prog->num_groups); - for (jj = 0; jj < prog->num_streams; jj++) { - indent_printf(level+2, "Stream %d", jj); - _show_stream(&prog->streams[jj], level+3); - } - } -} - -static void -_show_extent_start(CLPI_EXTENT_START *es, int level) -{ - unsigned int ii; - - indent_printf(level, "Extension data: Extent Start Point"); - - if (!es->num_point) { - indent_printf(level+1, "(no data)"); - - } else { - indent_printf(level+1, "Number of Start Points: %d", es->num_point); - - if (verbose) { - for (ii = 0; ii < es->num_point; ii++) { - indent_printf(level+1, "Extent %5d: SPN 0x%08X", ii, es->point[ii]); - } - } - } -} - -static void -_show_cpi_info(CLPI_CPI *cpi, int level) -{ - CLPI_EP_MAP_ENTRY *entry; - CLPI_EP_COARSE *coarse; - CLPI_EP_FINE *fine; - int ii, jj, kk; - - indent_printf(level, "CPI"); - indent_printf(level+1, "Number Stream PID: %d", cpi->num_stream_pid); - for (ii = 0; ii < cpi->num_stream_pid; ii++) { - entry = &cpi->entry[ii]; - indent_printf(level+1, "Stream: %d", ii); - indent_printf(level+2, "PID: %04x", entry->pid); - indent_printf(level+2, "EP Stream Type: %d", entry->ep_stream_type); - indent_printf(level+2, "Number EP Coarse: %d", entry->num_ep_coarse); - indent_printf(level+2, "Number EP Fine: %d", entry->num_ep_fine); - indent_printf(level+2, "EP Map Start: %d", - entry->ep_map_stream_start_addr); - for (jj = 0; jj < entry->num_ep_coarse; jj++) { - coarse = &entry->coarse[jj]; - indent_printf(level+2, "Coarse: %d", jj); - indent_printf(level+3, "Ref EP Fine: %d", coarse->ref_ep_fine_id); - indent_printf(level+3, "PTS EP: %d", coarse->pts_ep); - indent_printf(level+3, "SPN EP: %d", coarse->spn_ep); - } - for (jj = 0; jj < entry->num_ep_fine; jj++) { - fine = &entry->fine[jj]; - indent_printf(level+2, "Fine: %d", jj); - indent_printf(level+3, "Angle Change Point: %s", - fine->is_angle_change_point ? "True":"False"); - indent_printf(level+3, "I End Offset: %d", - fine->i_end_position_offset); - indent_printf(level+3, "PTS EP: %d", fine->pts_ep); - indent_printf(level+3, "SPN EP: %d", fine->spn_ep); - } - if (verbose) { - uint64_t pts; - uint32_t spn; - - indent_printf(level+2, "PTS - SPN Map"); - for (jj = 0; jj < entry->num_ep_coarse; jj++) { - int start, end; - - indent_printf(level+3, "Coarse: %d", jj); - coarse = &entry->coarse[jj]; - start = coarse->ref_ep_fine_id; - if (jj < entry->num_ep_coarse - 1) { - end = entry->coarse[jj+1].ref_ep_fine_id; - } else { - end = entry->num_ep_fine; - } - for (kk = start; kk < end; kk++) { - fine = &entry->fine[kk]; - pts = ((uint64_t) (coarse->pts_ep & ~0x01) << 19) + - ((uint64_t)fine->pts_ep << 9); - spn = (coarse->spn_ep & ~0x1FFFF) + fine->spn_ep; - indent_printf(level+4, "PTS %8"PRIu64"/%8"PRIu64" -- SPN %u", - pts, pts >> 1, spn); - } - } - } - } -} - - -static void -_usage(char *cmd) -{ - fprintf(stderr, -"Usage: %s -vcspi <clpi file> [<clpi file> ...]\n" -"With no options, produces no output (not very useful)\n" -"Options:\n" -" v - Verbose output.\n" -" c - Shows the Clip Info structure\n" -" s - Shows the Sequence Info structure\n" -" p - Shows the Program Info structure\n" -" i - Shows the CPI. PTS to SPN map\n" -" e - Shows Extent Start Table\n" -, cmd); - - exit(EXIT_FAILURE); -} - -#define OPTS "vcspie" - -int -main(int argc, char *argv[]) -{ - CLPI_CL *cl; - int opt; - int opt_clip_info = 0, opt_seq_info = 0, opt_prog_info = 0; - int opt_cpi_info = 0, opt_extent_start = 0; - int ii; - - do { - opt = getopt(argc, argv, OPTS); - switch (opt) { - case -1: break; - - case 'v': - verbose = 1; - break; - - case 's': - opt_seq_info = 1; - break; - - case 'i': - opt_cpi_info = 1; - break; - - case 'c': - opt_clip_info = 1; - break; - - case 'p': - opt_prog_info = 1; - break; - - case 'e': - opt_extent_start = 1; - break; - - default: - _usage(argv[0]); - break; - } - } while (opt != -1); - - if (optind >= argc) { - _usage(argv[0]); - } - - for (ii = optind; ii < argc; ii++) { - cl = bd_read_clpi(argv[ii]); - if (cl == NULL) { - fprintf(stderr, "Parsing %s failed\n", argv[ii]); - continue; - } - if (opt_clip_info) { - // Show clip info - _show_clip_info(cl, 1); - } - if (opt_seq_info) { - // Show sequence info - _show_seq_info(&cl->sequence, 1); - } - if (opt_prog_info) { - // Show program info - _show_prog_info(&cl->program, 1); - } - if (opt_cpi_info) { - // Show cpi - _show_cpi_info(&cl->cpi, 1); - } - - if (opt_prog_info) { - if (cl->program_ss.num_prog) { - printf("\n"); - indent_printf(1, "Extension: Program Info SS"); - _show_prog_info(&cl->program_ss, 1); - } - } - if (opt_cpi_info) { - if (cl->program_ss.num_prog) { - printf("\n"); - indent_printf(1, "Extension: CPI SS"); - _show_cpi_info(&cl->cpi_ss, 1); - } - } - if (opt_extent_start) { - // Show extent start point - if (cl->extent_start.num_point > 0) { - _show_extent_start(&cl->extent_start, 1); - } - } - - bd_free_clpi(cl); - } - return 0; -} - diff -Nru libbluray-0.8.1/src/examples/hdmv_test.c libbluray-1.0.1/src/examples/hdmv_test.c --- libbluray-0.8.1/src/examples/hdmv_test.c 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/examples/hdmv_test.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,257 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2010 hpi1 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <inttypes.h> - -#include "util/log_control.h" -#include "libbluray/bluray.h" - -static void _print_event(BD_EVENT *ev) -{ - switch (ev->event) { - case BD_EVENT_NONE: - break; - case BD_EVENT_ERROR: - printf("EVENT_ERROR:\t%d\n", ev->param); - break; - case BD_EVENT_READ_ERROR: - printf("EVENT_READ_ERROR:\t%d\n", ev->param); - break; - case BD_EVENT_ENCRYPTED: - printf("EVENT_ENCRYPTED:\t%d\n", ev->param); - break; - - /* current playback position */ - - case BD_EVENT_ANGLE: - printf("EVENT_ANGLE:\t%d\n", ev->param); - break; - case BD_EVENT_TITLE: - printf("EVENT_TITLE:\t%d\n", ev->param); - break; - case BD_EVENT_PLAYLIST: - printf("EVENT_PLAYLIST:\t%d\n", ev->param); - break; - case BD_EVENT_PLAYITEM: - printf("EVENT_PLAYITEM:\t%d\n", ev->param); - break; - case BD_EVENT_CHAPTER: - printf("EVENT_CHAPTER:\t%d\n", ev->param); - break; - - /* */ - - case BD_EVENT_STILL: - printf("EVENT_STILL:\t%d\n", ev->param); - break; - - case BD_EVENT_SEEK: - printf("EVENT_SEEK:\t%d\n", ev->param); - break; - - case BD_EVENT_STILL_TIME: - if (ev->param) { - printf("EVENT_STILL_TIME:\t%d\n", ev->param); - } else { - printf("EVENT_STILL_TIME:\tinfinite\n"); - } - break; - - /* stream selection */ - - case BD_EVENT_AUDIO_STREAM: - printf("EVENT_AUDIO_STREAM:\t%d\n", ev->param); - break; - case BD_EVENT_IG_STREAM: - printf("EVENT_IG_STREAM:\t%d\n", ev->param); - break; - case BD_EVENT_PG_TEXTST_STREAM: - printf("EVENT_PG_TEXTST_STREAM:\t%d\n", ev->param); - break; - case BD_EVENT_SECONDARY_AUDIO_STREAM: - printf("EVENT_SECONDARY_AUDIO_STREAM:\t%d\n", ev->param); - break; - case BD_EVENT_SECONDARY_VIDEO_STREAM: - printf("EVENT_SECONDARY_VIDEO_STREAM:\t%d\n", ev->param); - break; - - case BD_EVENT_PG_TEXTST: - printf("EVENT_PG_TEXTST:\t%s\n", ev->param ? "enable" : "disable"); - break; - case BD_EVENT_SECONDARY_AUDIO: - printf("EVENT_SECONDARY_AUDIO:\t%s\n", ev->param ? "enable" : "disable"); - break; - case BD_EVENT_SECONDARY_VIDEO: - printf("EVENT_SECONDARY_VIDEO:\t%s\n", ev->param ? "enable" : "disable"); - break; - case BD_EVENT_SECONDARY_VIDEO_SIZE: - printf("EVENT_SECONDARY_VIDEO_SIZE:\t%s\n", ev->param==0 ? "PIP" : "fullscreen"); - break; - - default: - printf("UNKNOWN EVENT %d:\t%d\n", ev->event, ev->param); - break; - } - - fflush(stdout); -} - -static void _read_to_eof(BLURAY *bd) -{ - BD_EVENT ev; - int bytes; - uint64_t total = 0; - uint8_t buf[6144]; - - bd_seek(bd, bd_get_title_size(bd) - 6144); - - do { - bytes = bd_read_ext(bd, buf, 6144, &ev); - total += bytes < 0 ? 0 : bytes; - _print_event(&ev); - } while (bytes > 0); - - printf("_read_to_eof(): read %"PRIu64" bytes\n", total); -} - -static void _print_events(BLURAY *bd) -{ - BD_EVENT ev; - - do { - bd_read_ext(bd, NULL, 0, &ev); - _print_event(&ev); - } while (ev.event != BD_EVENT_NONE && ev.event != BD_EVENT_ERROR); -} - -static void _play_pl(BLURAY *bd) -{ - printf("Playing playlist\n"); - - fflush(stdout); - _read_to_eof(bd); - - printf("Playing playlist done\n\n"); - - _print_events(bd); - - printf("\n"); -} - -int main(int argc, char *argv[]) -{ - int title = -1; - int verbose = 0; - int args = 0; - - /* - * parse arguments - */ - - if (argc < 2) { - printf("\nUsage:\n %s [-v] [-t <title>] <media_path> [<keyfile_path>]\n\n", argv[0]); - return -1; - } - - if (!strcmp(argv[1+args], "-v")) { - verbose = 1; - args++; - } - - if (!strcmp(argv[1+args], "-t")) { - args++; - title = atoi(argv[1+args]); - args++; - printf("Requested title %d\n", title); - } - - if (verbose) { - printf("Enabling verbose debug\n"); - bd_set_debug_mask(bd_get_debug_mask() | DBG_HDMV | DBG_BLURAY); - } - - printf("\n"); - - /* - * open and setup - */ - - BLURAY *bd = bd_open(argv[1+args], argv[2+args]); - - if (!bd) { - printf("bd_open(\'%s\') failed\n", argv[1]); - return -1; - } - - bd_set_player_setting (bd, BLURAY_PLAYER_SETTING_PARENTAL, 99); - bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_AUDIO_LANG, "eng"); - bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_PG_LANG, "eng"); - bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_MENU_LANG, "eng"); - bd_set_player_setting_str(bd, BLURAY_PLAYER_SETTING_COUNTRY_CODE, NULL); - - /* - * play - */ - - printf("Running first play movie object\n"); - - fflush(stdout); - bd_play(bd); - - _print_events(bd); - - printf("\n"); - - /* - * play title - */ - - if (title >= 0) { - printf("Playing title %d\n", title); - - fflush(stdout); - bd_play_title(bd, title); - - _print_events(bd); - - printf("\n"); - } - - /* - * play playlist - */ - - _play_pl(bd); - - _play_pl(bd); - - _play_pl(bd); - - /* - * clean up - */ - - bd_close(bd); - - return 0; -} - diff -Nru libbluray-0.8.1/src/examples/index_dump.c libbluray-1.0.1/src/examples/index_dump.c --- libbluray-0.8.1/src/examples/index_dump.c 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/examples/index_dump.c 2017-06-23 13:34:43.000000000 +0000 @@ -19,7 +19,7 @@ #include <stdio.h> -#include "libbluray/bluray.h" +#include "bluray.h" static void _indx_print_title(const BLURAY_TITLE *title, int normal_title) { diff -Nru libbluray-0.8.1/src/examples/libbluray_test.c libbluray-1.0.1/src/examples/libbluray_test.c --- libbluray-0.8.1/src/examples/libbluray_test.c 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/examples/libbluray_test.c 2017-06-23 13:34:43.000000000 +0000 @@ -23,7 +23,7 @@ #include <string.h> #include <inttypes.h> -#include "libbluray/bluray.h" +#include "bluray.h" int main(int argc, char *argv[]) { diff -Nru libbluray-0.8.1/src/examples/list_titles.c libbluray-1.0.1/src/examples/list_titles.c --- libbluray-0.8.1/src/examples/list_titles.c 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/examples/list_titles.c 2017-06-23 13:34:43.000000000 +0000 @@ -17,14 +17,14 @@ * <http://www.gnu.org/licenses/>. */ -#include "libbluray/bluray.h" +#include "bluray.h" #include <stdio.h> #include <stdlib.h> #include <inttypes.h> #include <unistd.h> -#define OPTS "ahs:" +#define OPTS "ahs:l" static void _usage(char *cmd) { @@ -33,17 +33,38 @@ " List the titles and title info of a BD\n" " -s # - Filter out titles shorter than # seconds\n" " -a - List all titles\n" +" -l - Show language codes\n" " -h - This message\n", cmd ); exit(EXIT_FAILURE); } +static void _print_langs(const char *tag, const BLURAY_STREAM_INFO *si, int count) +{ + int ii; + printf("\t%s: ", tag); + for (ii = 0; ii < count; ii++) { + printf("%3.3s ", si[ii].lang); + } + printf("\n"); +} + +static void _dump_langs(const BLURAY_CLIP_INFO *ci) +{ + if (ci->audio_streams) { + _print_langs("AUD", ci->audio_streams, ci->audio_stream_count); + } + if (ci->pg_streams) { + _print_langs("PG ", ci->pg_streams, ci->pg_stream_count); + } +} + int main(int argc, char *argv[]) { BLURAY *bd; int count, ii, opt, main_title; - unsigned int seconds = 0; + unsigned int seconds = 0, langs = 0; unsigned int flags = TITLES_RELEVANT; char *bd_dir = NULL; @@ -66,6 +87,9 @@ case 's': seconds = strtol(optarg, NULL, 0); break; + case 'l': + langs = 1; + break; case 'h': default: _usage(argv[0]); @@ -78,7 +102,10 @@ _usage(argv[0]); } bd = bd_open(bd_dir, NULL); - + if (!bd) { + fprintf(stderr, "bd_open(%s) failed\n", bd_dir); + exit(EXIT_FAILURE); + } count = bd_get_titles(bd, flags, seconds); main_title = bd_get_main_title(bd); if (main_title >= 0) { @@ -89,7 +116,7 @@ BLURAY_TITLE_INFO* ti; ti = bd_get_title_info(bd, ii, 0); printf( - "index: %d duration: %02"PRIu64":%02"PRIu64":%02"PRIu64" chapters: %3d angles: %2u clips: %3u (playlist: %05d.mpls) " + "index: %3d duration: %02"PRIu64":%02"PRIu64":%02"PRIu64" chapters: %3d angles: %2u clips: %3u (playlist: %05d.mpls) " "V:%d A:%-2d PG:%-2d IG:%-2d SV:%d SA:%d\n", ii + 1, (ti->duration / 90000) / (3600), @@ -103,6 +130,9 @@ ti->clips[0].sec_video_stream_count, ti->clips[0].sec_audio_stream_count ); + if (langs) { + _dump_langs(&ti->clips[0]); + } bd_free_title_info(ti); } bd_close(bd); diff -Nru libbluray-0.8.1/src/examples/mobj_dump.c libbluray-1.0.1/src/examples/mobj_dump.c --- libbluray-0.8.1/src/examples/mobj_dump.c 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/examples/mobj_dump.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2010 hpi1 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -#include "libbluray/bluray.h" - -#include "libbluray/hdmv/mobj_data.h" -#include "libbluray/hdmv/mobj_print.h" - -#include <stdio.h> -#include <string.h> - -static void _mobj_print(MOBJ_OBJECTS *objects, int disasm) -{ - int o, c; - - printf("Number of objects: %d\n", objects->num_objects); - - for (o = 0; o < objects->num_objects; o++) { - - printf("Object %d:\n" - " number of commands: %d\n" - " resume intention flag: %d\n" - " menu call mask: %d\n" - " title search mask: %d\n", - o, objects->objects[o].num_cmds, - objects->objects[o].resume_intention_flag, - objects->objects[o].menu_call_mask, - objects->objects[o].title_search_mask); - - if (disasm) { - printf(" program:\n"); - for (c = 0; c < objects->objects[o].num_cmds; c++) { - char buf[256]; - mobj_sprint_cmd(buf, &objects->objects[o].cmds[c]); - printf(" %04d: %s\n", c, buf); - } - } - } -} - -int main(int argc, const char *argv[]) -{ - int disasm = 0; - MOBJ_OBJECTS *mobj = NULL; - - if (argc < 2) { - fprintf(stderr, - "usage: %s [-d] <file>\n" - "Options:\n" - " d disassemble object code\n", - argv[0]); - return 1; - } - if (argc > 2) { - disasm = !strcmp(argv[1], "-d"); - } - - mobj = bd_read_mobj(argv[argc-1]); - - if (mobj) { - _mobj_print(mobj, disasm); - - bd_free_mobj(mobj); - } - - return 0; -} diff -Nru libbluray-0.8.1/src/examples/mpls_dump.c libbluray-1.0.1/src/examples/mpls_dump.c --- libbluray-0.8.1/src/examples/mpls_dump.c 2015-03-20 10:51:10.000000000 +0000 +++ libbluray-1.0.1/src/examples/mpls_dump.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,797 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2009-2010 John Stebbins - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -#include <sys/stat.h> -#include <dirent.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <libgen.h> - -#include "libbluray/bdnav/mpls_parse.h" -#include "libbluray/bluray.h" - -#include "util.h" - -#ifdef _WIN32 -# define DIR_SEP "\\" -# define PLAYLIST_DIR "\\BDMV\\PLAYLIST" -#else -# define DIR_SEP "/" -# define PLAYLIST_DIR "/BDMV/PLAYLIST" -#endif - - -static int verbose; - -typedef struct { - int value; - const char *str; -} VALUE_MAP; - -const VALUE_MAP codec_map[] = { - {0x01, "MPEG-1 Video"}, - {0x02, "MPEG-2 Video"}, - {0x03, "MPEG-1 Audio"}, - {0x04, "MPEG-2 Audio"}, - {0x80, "LPCM"}, - {0x81, "AC-3"}, - {0x82, "DTS"}, - {0x83, "TrueHD"}, - {0x84, "AC-3 Plus"}, - {0x85, "DTS-HD"}, - {0x86, "DTS-HD Master"}, - {0xa1, "AC-3 Plus for secondary audio"}, - {0xa2, "DTS-HD for secondary audio"}, - {0xea, "VC-1"}, - {0x1b, "H.264"}, - {0x90, "Presentation Graphics"}, - {0x91, "Interactive Graphics"}, - {0x92, "Text Subtitle"}, - {0, NULL} -}; - -const VALUE_MAP video_format_map[] = { - {0, "Reserved"}, - {1, "480i"}, - {2, "576i"}, - {3, "480p"}, - {4, "1080i"}, - {5, "720p"}, - {6, "1080p"}, - {7, "576p"}, - {0, NULL} -}; - -const VALUE_MAP video_rate_map[] = { - {0, "Reserved1"}, - {1, "23.976"}, - {2, "24"}, - {3, "25"}, - {4, "29.97"}, - {5, "Reserved2"}, - {6, "50"}, - {7, "59.94"}, - {0, NULL} -}; - -const VALUE_MAP audio_format_map[] = { - {0, "Reserved1"}, - {1, "Mono"}, - {2, "Reserved2"}, - {3, "Stereo"}, - {4, "Reserved3"}, - {5, "Reserved4"}, - {6, "Multi Channel"}, - {12, "Combo"}, - {0, NULL} -}; - -const VALUE_MAP audio_rate_map[] = { - {0, "Reserved1"}, - {1, "48 Khz"}, - {2, "Reserved2"}, - {3, "Reserved3"}, - {4, "96 Khz"}, - {5, "192 Khz"}, - {12, "48/192 Khz"}, - {14, "48/96 Khz"}, - {0, NULL} -}; - -const VALUE_MAP subpath_type_map[] = { - {2, "Primary audio of the Browsable slideshow"}, - {3, "Interactive Graphics presentation menu"}, - {4, "Text Subtitle"}, - {5, "Out-of-mux Synchronous elementary streams"}, - {6, "Out-of-mux Asynchronous Picture-in-Picture presentation"}, - {7, "In-mux Synchronous Picture-in-Picture presentation"}, - {8, "SS Video"}, - {0,NULL} -}; - -const VALUE_MAP playback_type_map[] = { - {1, "Sequential"}, - {2, "Random"}, - {3, "Shuffle"}, - {0, NULL} -}; - -const VALUE_MAP connection_type_map[] = { - {1, "Non-seamless"}, - {5, "Seamless"}, - {6, "Seamless"}, - {0, NULL} -}; - -static const char* -_lookup_str(const VALUE_MAP *map, int val) -{ - int ii; - - for (ii = 0; map[ii].str; ii++) { - if (val == map[ii].value) { - return map[ii].str; - } - } - return "?"; -} - -static char * -_mk_path(const char *base, const char *sub) -{ - size_t n1 = strlen(base); - size_t n2 = strlen(sub); - char *result = (char*)malloc(n1 + n2 + strlen(DIR_SEP) + 1); - strcpy(result, base); - strcat(result, DIR_SEP); - strcat(result, sub); - - return result; -} - -static void -_show_stream(MPLS_STREAM *ss, int level) -{ - indent_printf(level, "Codec (%04x): %s", ss->coding_type, - _lookup_str(codec_map, ss->coding_type)); - switch (ss->stream_type) { - case 1: - indent_printf(level, "PID: %04x", ss->pid); - break; - - case 2: - case 4: - indent_printf(level, "SubPath Id: %02x", ss->subpath_id); - indent_printf(level, "SubClip Id: %02x", ss->subclip_id); - indent_printf(level, "PID: %04x", ss->pid); - break; - - case 3: - indent_printf(level, "SubPath Id: %02x", ss->subpath_id); - indent_printf(level, "PID: %04x", ss->pid); - break; - - default: - fprintf(stderr, "unrecognized stream type %02x\n", ss->stream_type); - break; - }; - - switch (ss->coding_type) { - case 0x01: - case 0x02: - case 0xea: - case 0x1b: - indent_printf(level, "Format %02x: %s", ss->format, - _lookup_str(video_format_map, ss->format)); - indent_printf(level, "Rate %02x: %s", ss->rate, - _lookup_str(video_rate_map, ss->rate)); - break; - - case 0x03: - case 0x04: - case 0x80: - case 0x81: - case 0x82: - case 0x83: - case 0x84: - case 0x85: - case 0x86: - case 0xa1: - case 0xa2: - indent_printf(level, "Format %02x: %s", ss->format, - _lookup_str(audio_format_map, ss->format)); - indent_printf(level, "Rate %02x: %s", ss->rate, - _lookup_str(audio_rate_map, ss->rate)); - indent_printf(level, "Language: %s", ss->lang); - break; - - case 0x90: - case 0x91: - indent_printf(level, "Language: %s", ss->lang); - break; - - case 0x92: - indent_printf(level, "Char Code: %02x", ss->char_code); - indent_printf(level, "Language: %s", ss->lang); - break; - - default: - fprintf(stderr, "unrecognized coding type %02x\n", ss->coding_type); - break; - }; -} - -static void -_show_details(MPLS_PL *pl, int level) -{ - int ii, jj, kk; - - for (ii = 0; ii < pl->list_count; ii++) { - MPLS_PI *pi; - - pi = &pl->play_item[ii]; - indent_printf(level, "Clip Id %s", pi->clip[0].clip_id); - indent_printf(level+1, "Stc Id: %02x", pi->clip[0].stc_id); - indent_printf(level+1, "Connection Condition: %s (%02x)", - _lookup_str(connection_type_map, pi->connection_condition), - pi->connection_condition); - indent_printf(level+1, "In-Time: %d", pi->in_time); - indent_printf(level+1, "Out-Time: %d", pi->out_time); - if (pi->still_mode == 1) { - indent_printf(level+1, "Still time: %ds\n", pi->still_time); - } - if (pi->still_mode == 2) { - indent_printf(level+1, "Still time: infinite\n"); - } - if (pi->angle_count > 1) { - for (jj = 1; jj < pi->angle_count; jj++) { - indent_printf(level+1, "Angle %d:", jj); - indent_printf(level+2, "Clip Id %s", pi->clip[jj].clip_id); - indent_printf(level+2, "Stc Id: %02x", pi->clip[jj].stc_id); - } - } - for (jj = 0; jj < pi->stn.num_video; jj++) { - indent_printf(level+1, "Video Stream %d:", jj); - _show_stream(&pi->stn.video[jj], level + 2); - } - for (jj = 0; jj < pi->stn.num_audio; jj++) { - indent_printf(level+1, "Audio Stream %d:", jj); - _show_stream(&pi->stn.audio[jj], level + 2); - } - for (jj = 0; jj < pi->stn.num_ig; jj++) { - indent_printf(level+1, "Interactive Graphics Stream %d:", jj); - _show_stream(&pi->stn.ig[jj], level + 2); - } - for (jj = 0; jj < (pi->stn.num_pg + pi->stn.num_pip_pg); jj++) { - if (jj < pi->stn.num_pg) { - indent_printf(level+1, "Presentation Graphics Stream %d:", jj); - } else { - indent_printf(level+1, "PIP Presentation Graphics Stream %d:", jj); - } - _show_stream(&pi->stn.pg[jj], level + 2); - } - for (jj = 0; jj < pi->stn.num_secondary_video; jj++) { - indent_printf(level+1, "Secondary Video Stream %d:", jj); - _show_stream(&pi->stn.secondary_video[jj], level + 2); - for (kk = 0; kk < pi->stn.secondary_video[jj].sv_num_secondary_audio_ref; kk++) { - indent_printf(level+2, "Secondary Audio Ref %d: %d", kk,pi->stn.secondary_video[jj].sv_secondary_audio_ref[kk]); - } - for (kk = 0; kk < pi->stn.secondary_video[jj].sv_num_pip_pg_ref; kk++) { - indent_printf(level+2, "PIP Presentation Graphic Ref %d: %d", kk,pi->stn.secondary_video[jj].sv_pip_pg_ref[kk]); - } - } - for (jj = 0; jj < pi->stn.num_secondary_audio; jj++) { - indent_printf(level+1, "Secondary Audio Stream %d:", jj); - _show_stream(&pi->stn.secondary_audio[jj], level + 2); - for (kk = 0; kk < pi->stn.secondary_audio[jj].sa_num_primary_audio_ref; kk++) { - indent_printf(level+2, "Primary Audio Ref %d: %d", kk,pi->stn.secondary_audio[jj].sa_primary_audio_ref[kk]); - } - } - printf("\n"); - } -} - -static void -_show_ai(MPLS_PL *pl, int level) -{ - indent_printf(level, "Playback type: %s (%d)", - _lookup_str(playback_type_map, pl->app_info.playback_type), - pl->app_info.playback_type); - if (pl->app_info.playback_type == 2 || pl->app_info.playback_type == 3) { - indent_printf(level+1, "Playback count: %d", pl->app_info.playback_count); - } -} - -static void -_show_marks(MPLS_PL *pl, int level) -{ - int ii; - - indent_printf(level, "PlayMark Count %d", pl->mark_count); - for (ii = 0; ii < pl->mark_count; ii++) { - MPLS_PI *pi; - MPLS_PLM *plm; - int min; - double sec; - - plm = &pl->play_mark[ii]; - indent_printf(level, "PlayMark %d", ii); - indent_printf(level+1, "Type: %02x", plm->mark_type); - if (plm->play_item_ref < pl->list_count) { - pi = &pl->play_item[plm->play_item_ref]; - indent_printf(level+1, "PlayItem: %s", pi->clip[0].clip_id); - } else { - indent_printf(level+1, "PlayItem: Invalid reference"); - } - indent_printf(level+1, "Time (ticks): %u", plm->time); - min = plm->duration / (45000*60); - sec = (double)(plm->duration - min * 45000 * 60) / 45000; - indent_printf(level+1, "Duration (mm:ss.ms, ticks): %d:%.2f, %u", - min, sec, plm->duration); - printf("\n"); - } -} - -static void -_show_clip_list(MPLS_PL *pl, int level) -{ - int ii, jj; - - for (ii = 0; ii < pl->list_count; ii++) { - MPLS_PI *pi; - - pi = &pl->play_item[ii]; - if (verbose) { - uint32_t duration; - - duration = pi->out_time - pi->in_time; - indent_printf(level, "%s.m2ts -- Duration: %3d:%02d", - pi->clip[0].clip_id, - duration / (45000 * 60), (duration / 45000) % 60); - } else { - indent_printf(level, "%s.m2ts", pi->clip[0].clip_id); - } - if (pi->angle_count > 1) { - for (jj = 1; jj < pi->angle_count; jj++) { - indent_printf(level+1, "Angle %d: %s.m2ts", jj+1, pi->clip[jj].clip_id); - } - } - } - printf("\n"); -} - -static void -_show_sub_path(MPLS_SUB *sub, int level) -{ - int ii; - - indent_printf(level+1, "Type: %d (%s)", sub->type, _lookup_str(subpath_type_map, sub->type)); - indent_printf(level+1, "Repeat: %d", sub->is_repeat); - indent_printf(level+1, "Sub playitem count: %d", sub->sub_playitem_count); - - for (ii = 0; ii < sub->sub_playitem_count; ii++) { - MPLS_SUB_PI *pi; - - pi = &sub->sub_play_item[ii]; - - if (verbose) { - indent_printf(level+1, "Sub playitem %d", ii); - indent_printf(level+2, "Clip Id %s", pi->clip[0].clip_id); - indent_printf(level+2, "Multi clip: %d", pi->is_multi_clip); - indent_printf(level+2, "Clip count: %d", pi->clip_count); - indent_printf(level+2, "Connection Condition: %s (%02x)", - _lookup_str(connection_type_map, pi->connection_condition), - pi->connection_condition); - indent_printf(level+2, "In-Time: %d", pi->in_time); - indent_printf(level+2, "Out-Time: %d", pi->out_time); - indent_printf(level+2, "Sync playitem Id: %d", pi->sync_play_item_id); - indent_printf(level+2, "Sync PTS: %d", pi->sync_pts); - } else { - indent_printf(level+1, "%s.m2ts", pi->clip[0].clip_id); - } - } -} - -static void -_show_pip_metadata_block(MPLS_PIP_METADATA *block, int level) -{ - int ii; - - indent_printf(level, "Clip ref: %d", block->clip_ref); - indent_printf(level, "Secondary video ref: %d", block->secondary_video_ref); - indent_printf(level, "Timeline type: %d", block->timeline_type); - indent_printf(level, "Luma key flag: %d", block->luma_key_flag); - if (block->luma_key_flag) { - indent_printf(level, "Upper limit luma key: %d", block->upper_limit_luma_key); - } - indent_printf(level, "Trick play flag: %d", block->trick_play_flag); - - for (ii = 0; ii < block->data_count; ii++) { - indent_printf(level, "data block %d:", ii); - indent_printf(level+1, "Timestamp: %d", block->data[ii].time); - indent_printf(level+1, "Horizontal position %d", block->data[ii].xpos); - indent_printf(level+1, "Vertical position: %d", block->data[ii].ypos); - indent_printf(level+1, "Scaling factor: %d", block->data[ii].scale_factor); - } -} - -static void -_show_pip_metadata(MPLS_PL *pl, int level) -{ - int ii; - - for (ii = 0; ii < pl->ext_pip_data_count; ii++) { - MPLS_PIP_METADATA *data; - - data = &pl->ext_pip_data[ii]; - - indent_printf(level, "PiP metadata block %d:", ii); - _show_pip_metadata_block(data, level+1); - } -} - -static void -_show_sub_paths(MPLS_PL *pl, int level) -{ - int ss; - - for (ss = 0; ss < pl->sub_count; ss++) { - MPLS_SUB *sub; - - sub = &pl->sub_path[ss]; - - indent_printf(level, "Sub Path %d:", ss); - _show_sub_path(sub, level+1); - } -} - -static void -_show_sub_paths_ss(MPLS_PL *pl, int level) -{ - int ss; - - for (ss = 0; ss < pl->ext_sub_count; ss++) { - MPLS_SUB *sub; - - sub = &pl->ext_sub_path[ss]; - - indent_printf(level, "Extension Sub Path %d:", ss); - _show_sub_path(sub, level+1); - } -} - -static uint32_t -_pl_duration(MPLS_PL *pl) -{ - int ii; - uint32_t duration = 0; - MPLS_PI *pi; - - for (ii = 0; ii < pl->list_count; ii++) { - pi = &pl->play_item[ii]; - duration += pi->out_time - pi->in_time; - } - return duration; -} - -static int -_filter_dup(MPLS_PL *pl_list[], int count, MPLS_PL *pl) -{ - int ii, jj; - - for (ii = 0; ii < count; ii++) { - if (pl->list_count != pl_list[ii]->list_count || - _pl_duration(pl) != _pl_duration(pl_list[ii])) { - continue; - } - for (jj = 0; jj < pl->list_count; jj++) { - MPLS_PI *pi1, *pi2; - - pi1 = &pl->play_item[jj]; - pi2 = &pl_list[ii]->play_item[jj]; - - if (memcmp(pi1->clip[0].clip_id, pi2->clip[0].clip_id, 5) != 0 || - pi1->in_time != pi2->in_time || - pi1->out_time != pi2->out_time) { - break; - } - } - if (jj != pl->list_count) { - continue; - } - return 0; - } - return 1; -} - -static int -_find_repeats(MPLS_PL *pl, const char *m2ts) -{ - int ii, count = 0; - - for (ii = 0; ii < pl->list_count; ii++) { - MPLS_PI *pi; - - pi = &pl->play_item[ii]; - // Ignore titles with repeated segments - if (strcmp(pi->clip[0].clip_id, m2ts) == 0) { - count++; - } - } - return count; -} - -static int -_filter_short(MPLS_PL *pl, unsigned int seconds) -{ - // Ignore short playlists - if (_pl_duration(pl) / 45000 <= seconds) { - return 0; - } - return 1; -} - -static int -_filter_repeats(MPLS_PL *pl, int repeats) -{ - int ii; - - for (ii = 0; ii < pl->list_count; ii++) { - MPLS_PI *pi; - - pi = &pl->play_item[ii]; - // Ignore titles with repeated segments - if (_find_repeats(pl, pi->clip[0].clip_id) > repeats) { - return 0; - } - } - return 1; -} - -static int clip_list = 0, playlist_info = 0, chapter_marks = 0, sub_paths = 0, pip_metadata = 0; -static int repeats = 0, seconds = 0, dups = 0; - -static MPLS_PL* -_process_file(char *name, MPLS_PL *pl_list[], int pl_count) -{ - MPLS_PL *pl; - - pl = bd_read_mpls(name); - if (pl == NULL) { - fprintf(stderr, "Parse failed: %s\n", name); - return NULL; - } - if (seconds) { - if (!_filter_short(pl, seconds)) { - bd_free_mpls(pl); - return NULL; - } - } - if (repeats) { - if (!_filter_repeats(pl, repeats)) { - bd_free_mpls(pl); - return NULL; - } - } - if (dups) { - if (!_filter_dup(pl_list, pl_count, pl)) { - bd_free_mpls(pl); - return NULL; - } - } - if (verbose) { - indent_printf(0, - "%s -- Num Clips: %3d , Duration: minutes %4u:%02u", - basename(name), - pl->list_count, - _pl_duration(pl) / (45000 * 60), - (_pl_duration(pl) / 45000) % 60); - _show_ai(pl, 1); - } else { - indent_printf(0, "%s -- Duration: minutes %4u:%02u", - basename(name), - _pl_duration(pl) / (45000 * 60), - (_pl_duration(pl) / 45000) % 60); - } - if (playlist_info) { - _show_details(pl, 1); - } - if (chapter_marks) { - _show_marks(pl, 1); - } - if (pip_metadata) { - _show_pip_metadata(pl, 1); - } - if (clip_list) { - _show_clip_list(pl, 1); - } - if (sub_paths) { - _show_sub_paths(pl, 1); - _show_sub_paths_ss(pl, 1); - } - return pl; -} - -static void -_usage(char *cmd) -{ - fprintf(stderr, -"Usage: %s -vli <mpls file> [<mpls file> ...]\n" -"With no options, produces a list of the playlist(s) with durations\n" -"Options:\n" -" v - Verbose output.\n" -" l - Produces a list of the m2ts clips\n" -" i - Dumps detailed information about each clip\n" -" c - Show chapter marks\n" -" p - Show sub paths\n" -" P - Show picture-in-picture metadata\n" -" r <N> - Filter out titles that have >N repeating clips\n" -" d - Filter out duplicate titles\n" -" s <seconds> - Filter out short titles\n" -" f - Filter combination -r2 -d -s900\n" -, cmd); - - exit(EXIT_FAILURE); -} - -#define OPTS "vlicpPfr:ds:" - -static int -_qsort_str_cmp(const void *a, const void *b) -{ - const char *stra = *(char * const *)a; - const char *strb = *(char * const *)b; - - return strcmp(stra, strb); -} - -int -main(int argc, char *argv[]) -{ - MPLS_PL *pl; - int opt; - int ii, pl_ii; - MPLS_PL *pl_list[1000]; - struct stat st; - char *path = NULL; - DIR *dir = NULL; - - do { - opt = getopt(argc, argv, OPTS); - switch (opt) { - case -1: - break; - - case 'v': - verbose = 1; - break; - - case 'l': - clip_list = 1; - break; - - case 'i': - playlist_info = 1; - break; - - case 'c': - chapter_marks = 1; - break; - - case 'p': - sub_paths = 1; - break; - - case 'P': - pip_metadata = 1; - break; - - case 'd': - dups = 1; - break; - - case 'r': - repeats = atoi(optarg); - break; - - case 'f': - repeats = 2; - dups = 1; - seconds = 900; - break; - - case 's': - seconds = atoi(optarg); - break; - - default: - _usage(argv[0]); - break; - } - } while (opt != -1); - - if (optind >= argc) { - _usage(argv[0]); - } - - for (pl_ii = 0, ii = optind; pl_ii < 1000 && ii < argc; ii++) { - - if (stat(argv[ii], &st)) { - continue; - } - dir = NULL; - if (S_ISDIR(st.st_mode)) { - - printf("Directory: %s:\n", argv[ii]); - path = _mk_path(argv[ii], PLAYLIST_DIR); - if (path == NULL) { - fprintf(stderr, "Failed to find playlist path: %s\n", argv[ii]); - continue; - } - dir = opendir(path); - if (dir == NULL) { - fprintf(stderr, "Failed to open dir: %s\n", path); - free(path); - continue; - } - } - if (dir != NULL) { - char **dirlist = (char**)calloc(10001, sizeof(char*)); - struct dirent *ent; - int jj = 0; - for (ent = readdir(dir); ent != NULL; ent = readdir(dir)) { - dirlist[jj++] = strcpy((char*)malloc(strlen(ent->d_name)), ent->d_name); - } - qsort(dirlist, jj, sizeof(char*), _qsort_str_cmp); - for (jj = 0; dirlist[jj] != NULL; jj++) { - char *name = NULL; - name = _mk_path(path, dirlist[jj]); - free(dirlist[jj]); - if (stat(name, &st)) { - free(name); - continue; - } - if (!S_ISREG(st.st_mode)) { - free(name); - continue; - } - pl = _process_file(name, pl_list, pl_ii); - free(name); - if (pl != NULL) { - pl_list[pl_ii++] = pl; - } - } - free(dirlist); - free(path); - } else { - pl = _process_file(argv[ii], pl_list, pl_ii); - if (pl != NULL) { - pl_list[pl_ii++] = pl; - } - } - } - // Cleanup - for (ii = 0; ii < pl_ii; ii++) { - bd_free_mpls(pl_list[ii]); - } - return 0; -} - diff -Nru libbluray-0.8.1/src/examples/sound_dump.c libbluray-1.0.1/src/examples/sound_dump.c --- libbluray-0.8.1/src/examples/sound_dump.c 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/examples/sound_dump.c 2017-06-23 13:34:43.000000000 +0000 @@ -20,7 +20,7 @@ #include <stdio.h> #include <stdlib.h> -#include "libbluray/bluray.h" +#include "bluray.h" static void _sound_print(int sound_index, BLURAY_SOUND_EFFECT *data) diff -Nru libbluray-0.8.1/src/examples/util.c libbluray-1.0.1/src/examples/util.c --- libbluray-0.8.1/src/examples/util.c 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/examples/util.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2009-2010 John Stebbins - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -#include <stdio.h> -#include <stdarg.h> - -#include "util.h" - -void -indent_printf(int level, const char *fmt, ...) -{ - va_list ap; - int ii; - - for (ii = 0; ii < level; ii++) - { - printf(" "); - } - va_start(ap, fmt); - vprintf(fmt, ap); - va_end(ap); - printf("\n"); -} - diff -Nru libbluray-0.8.1/src/examples/util.h libbluray-1.0.1/src/examples/util.h --- libbluray-0.8.1/src/examples/util.h 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/examples/util.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2009-2010 John Stebbins - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -#include <stdint.h> - -#include "util/attributes.h" - -#if defined( __MINGW32__ ) -# undef lseek -# define lseek _lseeki64 -# undef fseeko -# define fseeko fseeko64 -# undef ftello -# define ftello ftello64 -# define flockfile(...) -# define funlockfile(...) -# define getc_unlocked getc -# undef off_t -# define off_t off64_t -# undef stat -# define stat _stati64 -# define fstat _fstati64 -# define wstat _wstati64 -#endif - -void indent_printf(int level, const char *fmt, ...) BD_ATTR_FORMAT_PRINTF(2,3); - diff -Nru libbluray-0.8.1/src/file/dirs_win32.c libbluray-1.0.1/src/file/dirs_win32.c --- libbluray-0.8.1/src/file/dirs_win32.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/file/dirs_win32.c 2017-06-23 13:34:43.000000000 +0000 @@ -38,8 +38,16 @@ { wchar_t wdir[MAX_PATH]; if (S_OK != SHGetFolderPathW(NULL, CSIDL_FONTS, NULL, SHGFP_TYPE_CURRENT, wdir)) { - GetWindowsDirectoryW(wdir, MAX_PATH); - wcscat(wdir, L"\\fonts"); + int lenght = GetWindowsDirectoryW(wdir, MAX_PATH); + if (lenght == 0 || lenght > (MAX_PATH - 8)) { + BD_DEBUG(DBG_FILE, "Font directory path too long!\n"); + return NULL; + } + if (!wcscat(wdir, L"\\fonts")) { + BD_DEBUG(DBG_FILE, "Could not construct font directory path!\n"); + return NULL; + } + } int len = WideCharToMultiByte (CP_UTF8, 0, wdir, -1, NULL, 0, NULL, NULL); diff -Nru libbluray-0.8.1/src/file/dir_win32.c libbluray-1.0.1/src/file/dir_win32.c --- libbluray-0.8.1/src/file/dir_win32.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/file/dir_win32.c 2017-06-23 13:34:43.000000000 +0000 @@ -62,7 +62,9 @@ if (!priv->info.name[0]) { return 1; } - WideCharToMultiByte(CP_UTF8, 0, priv->info.name, -1, entry->d_name, sizeof(entry->d_name), NULL, NULL); + if (!WideCharToMultiByte(CP_UTF8, 0, priv->info.name, -1, entry->d_name, sizeof(entry->d_name), NULL, NULL)) { + return -1; + } priv->info.name[0] = 0; _wfindnext(priv->handle, &priv->info); @@ -70,37 +72,58 @@ return 0; } +static dir_data_t *_open_impl(const char *dirname) +{ + dir_data_t *priv; + char *filespec; + wchar_t wfilespec[MAX_PATH]; + int result; + + filespec = str_printf("%s" DIR_SEP "*", dirname); + if (!filespec) { + return NULL; + } + + result = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filespec, -1, wfilespec, MAX_PATH); + X_FREE(filespec); + if (!result) { + return NULL; + } + + priv = calloc(1, sizeof(dir_data_t)); + if (!priv) { + return NULL; + } + + priv->handle = _wfindfirst(wfilespec, &priv->info); + if (priv->handle == -1) { + X_FREE(priv); + } + + return priv; +} + static BD_DIR_H *_dir_open_win32(const char* dirname) { BD_DIR_H *dir = calloc(1, sizeof(BD_DIR_H)); + dir_data_t *priv = NULL; BD_DEBUG(DBG_DIR, "Opening WIN32 dir %s... (%p)\n", dirname, (void*)dir); + if (!dir) { return NULL; } - dir->close = _dir_close_win32; - dir->read = _dir_read_win32; - char *filespec = str_printf("%s/*", dirname); - dir_data_t *priv = calloc(1, sizeof(dir_data_t)); + priv = _open_impl(dirname); + if (priv) { + dir->close = _dir_close_win32; + dir->read = _dir_read_win32; + dir->internal = priv; - dir->internal = priv; - - wchar_t wfilespec[MAX_PATH]; - if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, filespec, -1, wfilespec, MAX_PATH)) - priv->handle = _wfindfirst(wfilespec, &priv->info); - else - priv->handle = -1; - - X_FREE(filespec); - - if (priv->handle != -1) { return dir; } - BD_DEBUG(DBG_DIR, "Error opening dir! (%p)\n", (void*)dir); - - X_FREE(dir->internal); + BD_DEBUG(DBG_DIR, "Error opening dir %s\n", dirname); X_FREE(dir); return NULL; diff -Nru libbluray-0.8.1/src/file/dl_posix.c libbluray-1.0.1/src/file/dl_posix.c --- libbluray-0.8.1/src/file/dl_posix.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/file/dl_posix.c 2017-06-23 13:34:43.000000000 +0000 @@ -39,12 +39,12 @@ { void *result; - BD_DEBUG(DBG_FILE, "searching for library '%s' ...\n", path); - result = dlopen(path, RTLD_LAZY); if (!result) { BD_DEBUG(DBG_FILE, "can't open library '%s': %s\n", path, dlerror()); + } else { + BD_DEBUG(DBG_FILE, "opened library '%s'\n", path); } return result; @@ -86,8 +86,6 @@ continue; } - BD_DEBUG(DBG_FILE, "Attempting to open %s\n", name); - dll = _dl_dlopen (name); X_FREE(name); if (dll) { diff -Nru libbluray-0.8.1/src/file/dl_win32.c libbluray-1.0.1/src/file/dl_win32.c --- libbluray-0.8.1/src/file/dl_win32.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/file/dl_win32.c 2017-06-23 13:34:43.000000000 +0000 @@ -37,12 +37,12 @@ DWORD error_code = GetLastError(); wchar_t wbuf[256]; - if (FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | - FORMAT_MESSAGE_MAX_WIDTH_MASK, - NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - wbuf, sizeof(wbuf)/sizeof(wbuf[0]), NULL)) { - WideCharToMultiByte(CP_UTF8, 0, wbuf, -1, buf, buf_size, NULL, NULL); - } else { + if (!FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | + FORMAT_MESSAGE_MAX_WIDTH_MASK, + NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + wbuf, sizeof(wbuf)/sizeof(wbuf[0]), NULL) || + !WideCharToMultiByte(CP_UTF8, 0, wbuf, -1, buf, buf_size, NULL, NULL)) { + #ifdef _MSC_VER _snprintf(buf, buf_size, "error %d", (int)error_code); #else @@ -60,6 +60,8 @@ wchar_t wname[MAX_PATH]; char *name; void *result; + int iresult; + DWORD flags = 0; name = str_printf("%s.dll", path); if (!name) { @@ -67,14 +69,28 @@ return NULL; } - MultiByteToWideChar(CP_UTF8, 0, name, -1, wname, MAX_PATH); + iresult = MultiByteToWideChar(CP_UTF8, 0, name, -1, wname, MAX_PATH); X_FREE(name); - result = LoadLibraryW(wname); + if (!iresult) { + BD_DEBUG(DBG_FILE, "can't convert file name '%s'\n", path); + return NULL; + } + +#if (_WIN32_WINNT < _WIN32_WINNT_WIN8) + if (GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), + "SetDefaultDllDirectories") != NULL) +#endif + flags = LOAD_LIBRARY_SEARCH_APPLICATION_DIR | + LOAD_LIBRARY_SEARCH_SYSTEM32; + + result = LoadLibraryExW(wname, NULL, flags); if (!result) { char buf[128]; BD_DEBUG(DBG_FILE, "can't open library '%s': %s\n", path, dlerror(buf, sizeof(buf))); + } else { + BD_DEBUG(DBG_FILE, "opened library '%s'\n", path); } return result; @@ -113,10 +129,19 @@ HMODULE hModule; wchar_t wpath[MAX_PATH]; - GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCTSTR)&dl_get_path, &hModule); - GetModuleFileNameW(hModule, wpath, MAX_PATH); - WideCharToMultiByte(CP_UTF8, 0, wpath, -1, path, MAX_PATH, NULL, NULL); - lib_path = path; + if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | + GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, + (LPCTSTR)&dl_get_path, &hModule)) { + + DWORD dw = GetModuleFileNameW(hModule, wpath, MAX_PATH); + if (dw > 0 && dw < MAX_PATH) { + + if (WideCharToMultiByte(CP_UTF8, 0, wpath, -1, path, MAX_PATH, NULL, NULL)) { + + lib_path = path; + } + } + } if (lib_path) { /* cut library name from path */ @@ -126,7 +151,7 @@ } BD_DEBUG(DBG_FILE, "library file is %s\n", lib_path); } else { - BD_DEBUG(DBG_FILE, "Can't determine libbluray.dll install path\n"); + BD_DEBUG(DBG_FILE | DBG_CRIT, "Can't determine libbluray.dll install path\n"); } } diff -Nru libbluray-0.8.1/src/file/file.c libbluray-1.0.1/src/file/file.c --- libbluray-0.8.1/src/file/file.c 2015-03-04 08:34:15.000000000 +0000 +++ libbluray-1.0.1/src/file/file.c 2017-06-23 13:34:43.000000000 +0000 @@ -52,6 +52,10 @@ char *end = dir; char *p; + if (!dir) { + return -1; + } + /* strip file name */ if (!(end = strrchr(end, DIR_SEP_CHAR))) { X_FREE(dir); diff -Nru libbluray-0.8.1/src/file/file.h libbluray-1.0.1/src/file/file.h --- libbluray-0.8.1/src/file/file.h 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/file/file.h 2017-06-23 13:34:43.000000000 +0000 @@ -26,6 +26,7 @@ #include "util/attributes.h" #include <stdint.h> +#include <stddef.h> #ifdef _WIN32 # define DIR_SEP "\\" @@ -39,12 +40,29 @@ * file access */ -#define file_close(X) X->close(X) -#define file_seek(X,Y,Z) X->seek(X,Y,Z) -#define file_tell(X) X->tell(X) //#define file_eof(X) X->eof(X) -#define file_read(X,Y,Z) (size_t)X->read(X,Y,Z) //#define file_write(X,Y,Z) (size_t)X->write(X,Y,Z) + +static inline void file_close(BD_FILE_H *fp) +{ + fp->close(fp); +} + +static inline int64_t file_tell(BD_FILE_H *fp) +{ + return fp->tell(fp); +} + +static inline BD_USED int64_t file_seek(BD_FILE_H *fp, int64_t offset, int32_t origin) +{ + return fp->seek(fp, offset, origin); +} + +static inline BD_USED size_t file_read(BD_FILE_H *fp, uint8_t *buf, size_t size) +{ + return (size_t)fp->read(fp, buf, (int64_t)size); +} + BD_PRIVATE int64_t file_size(BD_FILE_H *fp); BD_PRIVATE extern BD_FILE_H* (*file_open)(const char* filename, const char *mode); diff -Nru libbluray-0.8.1/src/file/file_posix.c libbluray-1.0.1/src/file/file_posix.c --- libbluray-0.8.1/src/file/file_posix.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/file/file_posix.c 2017-06-23 13:34:43.000000000 +0000 @@ -38,10 +38,19 @@ #include <sys/stat.h> #include <fcntl.h> +#ifdef __ANDROID__ +# undef lseek +# define lseek lseek64 +# undef off_t +# define off_t off64_t +#endif + static void _file_close(BD_FILE_H *file) { if (file) { - close((int)(intptr_t)file->internal); + if (close((int)(intptr_t)file->internal)) { + BD_DEBUG(DBG_CRIT | DBG_FILE, "Error closing POSIX file (%p)\n", (void*)file); + } BD_DEBUG(DBG_FILE, "Closed POSIX file (%p)\n", (void*)file); @@ -101,6 +110,13 @@ ssize_t written, result; if (size <= 0 || size >= BD_MAX_SSIZE) { + if (size == 0) { + if (fsync((int)(intptr_t)file->internal)) { + BD_DEBUG(DBG_FILE, "fsync() failed (%p)\n", (void*)file); + return -1; + } + return 0; + } BD_DEBUG(DBG_FILE | DBG_CRIT, "Ignoring invalid write of size %"PRId64" (%p)\n", size, (void*)file); return 0; } diff -Nru libbluray-0.8.1/src/file/filesystem.h libbluray-1.0.1/src/file/filesystem.h --- libbluray-0.8.1/src/file/filesystem.h 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/file/filesystem.h 2017-06-23 13:34:43.000000000 +0000 @@ -71,6 +71,7 @@ * @param p function pointer * @return previous function pointer registered */ +/* deprecated - use bd_open_files() instead */ BD_FILE_OPEN bd_register_file(BD_FILE_OPEN p); /** @@ -80,6 +81,7 @@ * @param p function pointer * @return previous function pointer registered */ +/* deprecated - use bd_open_files() instead */ BD_DIR_OPEN bd_register_dir(BD_DIR_OPEN p); #ifdef __cplusplus diff -Nru libbluray-0.8.1/src/file/file_win32.c libbluray-1.0.1/src/file/file_win32.c --- libbluray-0.8.1/src/file/file_win32.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/file/file_win32.c 2017-06-23 13:34:44.000000000 +0000 @@ -40,7 +40,9 @@ static void _file_close(BD_FILE_H *file) { if (file) { - fclose((FILE *)file->internal); + if (fclose((FILE *)file->internal)) { + BD_DEBUG(DBG_FILE | DBG_CRIT, "Error closing WIN32 file (%p)\n", (void*)file); + } BD_DEBUG(DBG_FILE, "Closed WIN32 file (%p)\n", (void*)file); @@ -89,6 +91,14 @@ return (int64_t)fwrite(buf, 1, (size_t)size, (FILE *)file->internal); } + if (size == 0) { + if (fflush((FILE *)file->internal)) { + BD_DEBUG(DBG_FILE, "fflush() failed (%p)\n", (void*)file); + return -1; + } + return 0; + } + BD_DEBUG(DBG_FILE | DBG_CRIT, "Ignoring invalid write of size %"PRId64" (%p)\n", size, (void*)file); return 0; } @@ -142,7 +152,10 @@ { wchar_t wfile[MAX_PATH]; - MultiByteToWideChar(CP_UTF8, 0, file, -1, wfile, MAX_PATH); + if (!MultiByteToWideChar(CP_UTF8, 0, file, -1, wfile, MAX_PATH)) { + return -1; + } + return _wremove(wfile); } @@ -150,7 +163,9 @@ { wchar_t wpath[MAX_PATH]; - MultiByteToWideChar(CP_UTF8, 0, path, -1, wpath, MAX_PATH); + if (!MultiByteToWideChar(CP_UTF8, 0, path, -1, wpath, MAX_PATH)) { + return -1; + } DWORD dwAttrib = GetFileAttributesW(wpath); if (dwAttrib != INVALID_FILE_ATTRIBUTES) { @@ -163,7 +178,9 @@ { wchar_t wdir[MAX_PATH]; - MultiByteToWideChar(CP_UTF8, 0, dir, -1, wdir, MAX_PATH); + if (!MultiByteToWideChar(CP_UTF8, 0, dir, -1, wdir, MAX_PATH)) { + return -1; + } if (!CreateDirectoryW(wdir, NULL)) return -1; return 0; diff -Nru libbluray-0.8.1/src/file/mount.c libbluray-1.0.1/src/file/mount.c --- libbluray-0.8.1/src/file/mount.c 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/file/mount.c 2017-06-23 13:34:43.000000000 +0000 @@ -33,6 +33,7 @@ char *mount_get_mountpoint(const char *device_path) { +#ifndef __ANDROID__ #ifdef HAVE_MNTENT_H struct stat st; if (stat (device_path, &st) ) { @@ -62,6 +63,7 @@ endmntent (f); } #endif /* HAVE_MNTENT_H */ +#endif /* __ANDROID__ */ return str_dup(device_path); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/bdj.c libbluray-1.0.1/src/libbluray/bdj/bdj.c --- libbluray-0.8.1/src/libbluray/bdj/bdj.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/bdj.c 2017-06-23 13:34:46.000000000 +0000 @@ -26,6 +26,7 @@ #include "native/register_native.h" +#include "file/file.h" #include "file/dirs.h" #include "file/dl.h" #include "util/strutl.h" @@ -38,12 +39,16 @@ #include <stdlib.h> #include <string.h> +#ifdef __APPLE__ +#include <sys/types.h> +#include <sys/wait.h> +#include <limits.h> +#include <unistd.h> +#endif + #ifdef _WIN32 #include <windows.h> #include <winreg.h> -#define DIR_SEP "\\" -#else -#define DIR_SEP "/" #endif #ifdef HAVE_BDJ_J2ME @@ -53,6 +58,9 @@ #endif struct bdjava_s { +#if defined(__APPLE__) && !defined(HAVE_BDJ_J2ME) + void *h_libjli; +#endif void *h_libjvm; JavaVM *jvm; }; @@ -60,6 +68,44 @@ typedef jint (JNICALL * fptr_JNI_CreateJavaVM) (JavaVM **pvm, void **penv,void *args); typedef jint (JNICALL * fptr_JNI_GetCreatedJavaVMs) (JavaVM **vmBuf, jsize bufLen, jsize *nVMs); + +#if defined(_WIN32) && !defined(HAVE_BDJ_J2ME) +static void *_load_dll(const wchar_t *lib_path, const wchar_t *dll_search_path) +{ + void *result; + + typedef PVOID(WINAPI *AddDllDirectoryF) (PCWSTR); + typedef BOOL(WINAPI *RemoveDllDirectoryF)(PVOID); + AddDllDirectoryF pAddDllDirectory; + RemoveDllDirectoryF pRemoveDllDirectory; + pAddDllDirectory = (AddDllDirectoryF)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "AddDllDirectory"); + pRemoveDllDirectory = (RemoveDllDirectoryF)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "RemoveDllDirectory"); + + if (pAddDllDirectory && pRemoveDllDirectory) { + + result = LoadLibraryExW(lib_path, NULL, + LOAD_LIBRARY_SEARCH_SYSTEM32); + + if (!result) { + PVOID cookie = pAddDllDirectory(dll_search_path); + result = LoadLibraryExW(lib_path, NULL, + LOAD_LIBRARY_SEARCH_SYSTEM32 | + LOAD_LIBRARY_SEARCH_USER_DIRS); + pRemoveDllDirectory(cookie); + } + } else { + result = LoadLibraryW(lib_path); + if (!result) { + SetDllDirectoryW(dll_search_path); + result = LoadLibraryW(lib_path); + SetDllDirectoryW(L""); + } + } + + return result; +} +#endif + #if defined(_WIN32) && !defined(HAVE_BDJ_J2ME) static void *_load_jvm_win32(const char **p_java_home) { @@ -67,7 +113,7 @@ wchar_t buf_loc[4096] = L"SOFTWARE\\JavaSoft\\Java Runtime Environment\\"; wchar_t buf_vers[128]; - + wchar_t java_path[4096] = L""; char strbuf[256]; LONG r; @@ -77,19 +123,21 @@ r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buf_loc, 0, KEY_READ, &hkey); if (r != ERROR_SUCCESS) { - BD_DEBUG(DBG_BDJ | DBG_CRIT, "Error opening registry key SOFTWARE\\JavaSoft\\Java Runtime Environment\\"); + BD_DEBUG(DBG_BDJ | DBG_CRIT, "Error opening registry key SOFTWARE\\JavaSoft\\Java Runtime Environment\\\n"); return NULL; } r = RegQueryValueExW(hkey, L"CurrentVersion", NULL, &lType, (LPBYTE)buf_vers, &dSize); RegCloseKey(hkey); if (r != ERROR_SUCCESS) { - BD_DEBUG(DBG_BDJ | DBG_CRIT, "CurrentVersion registry value not found"); + BD_DEBUG(DBG_BDJ | DBG_CRIT, "CurrentVersion registry value not found\n"); return NULL; } if (debug_mask & DBG_BDJ) { - WideCharToMultiByte(CP_UTF8, 0, buf_vers, -1, strbuf, sizeof(strbuf), NULL, NULL); + if (!WideCharToMultiByte(CP_UTF8, 0, buf_vers, -1, strbuf, sizeof(strbuf), NULL, NULL)) { + strbuf[0] = 0; + } BD_DEBUG(DBG_BDJ, "JRE version: %s\n", strbuf); } wcscat(buf_loc, buf_vers); @@ -97,7 +145,7 @@ dSize = sizeof(buf_loc); r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buf_loc, 0, KEY_READ, &hkey); if (r != ERROR_SUCCESS) { - BD_DEBUG(DBG_BDJ | DBG_CRIT, "Error opening JRE version-specific registry key"); + BD_DEBUG(DBG_BDJ | DBG_CRIT, "Error opening JRE version-specific registry key\n"); return NULL; } @@ -105,9 +153,13 @@ if (r == ERROR_SUCCESS) { /* do not fail even if not found */ - WideCharToMultiByte(CP_UTF8, 0, buf_loc, -1, java_home, sizeof(java_home), NULL, NULL); - *p_java_home = java_home; + if (WideCharToMultiByte(CP_UTF8, 0, buf_loc, -1, java_home, sizeof(java_home), NULL, NULL)) { + *p_java_home = java_home; + } BD_DEBUG(DBG_BDJ, "JavaHome: %s\n", java_home); + + wcscat(java_path, buf_loc); + wcscat(java_path, L"\\bin"); } dSize = sizeof(buf_loc); @@ -115,13 +167,16 @@ RegCloseKey(hkey); if (r != ERROR_SUCCESS) { - BD_DEBUG(DBG_BDJ | DBG_CRIT, "RuntimeLib registry value not found"); + BD_DEBUG(DBG_BDJ | DBG_CRIT, "RuntimeLib registry value not found\n"); return NULL; } - void *result = LoadLibraryW(buf_loc); - WideCharToMultiByte(CP_UTF8, 0, buf_loc, -1, strbuf, sizeof(strbuf), NULL, NULL); + void *result = _load_dll(buf_loc, java_path); + + if (!WideCharToMultiByte(CP_UTF8, 0, buf_loc, -1, strbuf, sizeof(strbuf), NULL, NULL)) { + strbuf[0] = 0; + } if (!result) { BD_DEBUG(DBG_BDJ | DBG_CRIT, "can't open library '%s'\n", strbuf); } else { @@ -132,10 +187,113 @@ } #endif +#ifdef _WIN32 +static inline char *_utf8_to_cp(const char *utf8) +{ + int wlen = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, NULL, 0); + if (wlen <= 0) { + return NULL; + } + + wchar_t *wide = (wchar_t *)malloc(wlen * sizeof(wchar_t)); + if (!wide) { + return NULL; + } + if (!MultiByteToWideChar(CP_UTF8, 0, utf8, -1, wide, wlen)) { + X_FREE(wide); + return NULL; + } + + size_t len = WideCharToMultiByte(CP_ACP, 0, wide, -1, NULL, 0, NULL, NULL); + if (len <= 0) { + X_FREE(wide); + return NULL; + } + + char *out = (char *)malloc(len); + if (out != NULL) { + if (!WideCharToMultiByte(CP_ACP, 0, wide, -1, out, len, NULL, NULL)) { + X_FREE(out); + } + } + X_FREE(wide); + return out; +} +#endif + +#if defined(__APPLE__) && !defined(HAVE_BDJ_J2ME) + +#define MACOS_JAVA_HOME "/usr/libexec/java_home" +static char *_java_home_macos() +{ + static char result[PATH_MAX] = ""; + + if (result[0]) + return result; + + pid_t java_home_pid; + int fd[2], exitcode; + + if (pipe(fd)) { + BD_DEBUG(DBG_BDJ | DBG_CRIT, "unable to set up pipes\n"); + return NULL; + } + + switch (java_home_pid = vfork()) + { + case -1: + BD_DEBUG(DBG_BDJ | DBG_CRIT, "vfork failed\n"); + return NULL; + + case 0: + if (dup2(fd[1], STDOUT_FILENO) == -1) { + _exit(-1); + } + + close(fd[1]); + close(fd[0]); + + execl(MACOS_JAVA_HOME, MACOS_JAVA_HOME); + + _exit(-1); + + default: + close(fd[1]); + + for (int len = 0; ;) { + int n = read(fd[0], result + len, sizeof result - len); + if (n <= 0) + break; + + len += n; + result[len-1] = '\0'; + } + + waitpid(java_home_pid, &exitcode, 0); + } + + if (result[0] == '\0' || exitcode) { + BD_DEBUG(DBG_BDJ | DBG_CRIT, + "Unable to read path from " MACOS_JAVA_HOME "\n"); + result[0] = '\0'; + return NULL; + } + + BD_DEBUG(DBG_BDJ, "macos java home: '%s'\n", result ); + return result; +} +#undef MACOS_JAVA_HOME + +#endif + static void *_jvm_dlopen(const char *java_home, const char *jvm_dir, const char *jvm_lib) { if (java_home) { - char *path = str_printf("%s/%s/%s", java_home, jvm_dir, jvm_lib); + char *path = str_printf("%s" DIR_SEP "%s" DIR_SEP "%s", java_home, jvm_dir, jvm_lib); + if (!path) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return NULL; + } BD_DEBUG(DBG_BDJ, "Opening %s ...\n", path); void *h = dl_dlopen(path, NULL); X_FREE(path); @@ -146,33 +304,85 @@ } } +static void *_jvm_dlopen_a(const char *java_home, + const char * const *jvm_dir, unsigned num_jvm_dir, + const char *jvm_lib) +{ + unsigned ii; + void *dll = NULL; + + for (ii = 0; !dll && ii < num_jvm_dir; ii++) { + dll = _jvm_dlopen(java_home, jvm_dir[ii], jvm_lib); + } + + return dll; +} + +#if defined(__APPLE__) && !defined(HAVE_BDJ_J2ME) +static void *_load_jli_macos() +{ + const char *java_home = NULL; + static const char jli_dir[] = "jre/lib/jli"; + static const char jli_lib[] = "libjli"; + + /* JAVA_HOME set, use it */ + java_home = getenv("JAVA_HOME"); + if (java_home) { + return _jvm_dlopen(java_home, jli_dir, jli_lib); + } + + java_home = _java_home_macos(); + if (java_home) { + return _jvm_dlopen(java_home, jli_dir, jli_lib); + } + return NULL; +} +#endif + static void *_load_jvm(const char **p_java_home) { #ifdef HAVE_BDJ_J2ME # ifdef _WIN32 - static const char *jvm_path[] = {NULL, JDK_HOME}; - static const char jvm_dir[] = "bin"; - static const char jvm_lib[] = "cvmi"; + static const char * const jvm_path[] = {NULL, JDK_HOME}; + static const char * const jvm_dir[] = {"bin"}; + static const char jvm_lib[] = "cvmi"; # else - static const char *jvm_path[] = {NULL, JDK_HOME, "/opt/PhoneME"}; - static const char jvm_dir[] = "bin"; - static const char jvm_lib[] = "libcvm"; + static const char * const jvm_path[] = {NULL, JDK_HOME, "/opt/PhoneME"}; + static const char * const jvm_dir[] = {"bin"}; + static const char jvm_lib[] = "libcvm"; # endif -#else +#else /* HAVE_BDJ_J2ME */ # ifdef _WIN32 - static const char *jvm_path[] = {NULL, JDK_HOME}; - static const char jvm_dir[] = "jre/bin/server"; - static const char jvm_lib[] = "jvm"; + static const char * const jvm_path[] = {NULL, JDK_HOME}; + static const char * const jvm_dir[] = {"jre\\bin\\server", + "bin\\server", + "jre\\bin\\client", + "bin\\client", + }; + static const char jvm_lib[] = "jvm"; # else - static const char *jvm_path[] = {NULL, JDK_HOME, - "/usr/lib/jvm/default-java", - "/usr/lib/jvm/java-6-openjdk", - "/usr/lib/jvm/java-7-openjdk", - "/etc/java-config-2/current-system-vm"}; - static const char jvm_dir[] = "jre/lib/" JAVA_ARCH "/server"; - static const char jvm_lib[] = "libjvm"; +# ifdef __APPLE__ + static const char * const jvm_path[] = {NULL, JDK_HOME}; + static const char * const jvm_dir[] = {"jre/lib/server"}; +# else + static const char * const jvm_path[] = {NULL, + JDK_HOME, + "/usr/lib/jvm/default-java", + "/usr/lib/jvm/default", + "/usr/lib/jvm/", + "/etc/java-config-2/current-system-vm", + "/usr/lib/jvm/java-7-openjdk", + "/usr/lib/jvm/java-8-openjdk", + "/usr/lib/jvm/java-6-openjdk", + }; + static const char * const jvm_dir[] = {"jre/lib/" JAVA_ARCH "/server"}; +# endif + static const char jvm_lib[] = "libjvm"; # endif #endif + const unsigned num_jvm_dir = sizeof(jvm_dir) / sizeof(jvm_dir[0]); + const unsigned num_jvm_path = sizeof(jvm_path) / sizeof(jvm_path[0]); + const char *java_home = NULL; unsigned path_ind; void *handle = NULL; @@ -181,7 +391,7 @@ java_home = getenv("JAVA_HOME"); if (java_home) { *p_java_home = java_home; - return _jvm_dlopen(java_home, jvm_dir, jvm_lib); + return _jvm_dlopen_a(java_home, jvm_dir, num_jvm_dir, jvm_lib); } #if defined(_WIN32) && !defined(HAVE_BDJ_J2ME) @@ -191,12 +401,20 @@ } #endif +#if defined(__APPLE__) && !defined(HAVE_BDJ_J2ME) + java_home = _java_home_macos(); + if (java_home) { + *p_java_home = java_home; + return _jvm_dlopen_a(java_home, jvm_dir, num_jvm_dir, jvm_lib); + } +#endif + BD_DEBUG(DBG_BDJ, "JAVA_HOME not set, trying default locations\n"); /* try our pre-defined locations */ - for (path_ind = 0; !handle && path_ind < sizeof(jvm_path) / sizeof(jvm_path[0]); path_ind++) { + for (path_ind = 0; !handle && path_ind < num_jvm_path; path_ind++) { *p_java_home = jvm_path[path_ind]; - handle = _jvm_dlopen(jvm_path[path_ind], jvm_dir, jvm_lib); + handle = _jvm_dlopen_a(jvm_path[path_ind], jvm_dir, num_jvm_dir, jvm_lib); } if (!*p_java_home) { @@ -208,11 +426,17 @@ static int _can_read_file(const char *fn) { - FILE *fp = fopen(fn, "rb"); + BD_FILE_H *fp; + + if (!fn) { + return 0; + } + + fp = file_open(fn, "rb"); if (fp) { - char b; - int result = (int)fread(&b, 1, 1, fp); - fclose(fp); + uint8_t b; + int result = (int)file_read(fp, &b, 1); + file_close(fp); if (result == 1) { return 1; } @@ -225,12 +449,11 @@ { // pre-defined search paths for libbluray.jar static const char * const jar_paths[] = { -#ifdef _WIN32 - "" BDJ_JARFILE, -#else +#ifndef _WIN32 "/usr/share/java/" BDJ_JARFILE, "/usr/share/libbluray/lib/" BDJ_JARFILE, #endif + BDJ_JARFILE, }; unsigned i; @@ -251,6 +474,11 @@ storage->classpath = str_dup(classpath); } + if (!storage->classpath) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return NULL; + } + if (_can_read_file(storage->classpath)) { return storage->classpath; } @@ -266,6 +494,11 @@ const char *lib_path = dl_get_path(); if (lib_path) { char *cp = str_printf("%s" BDJ_JARFILE, lib_path); + if (!cp) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return NULL; + } + BD_DEBUG(DBG_BDJ, "Checking %s ...\n", cp); if (_can_read_file(cp)) { storage->classpath = cp; @@ -285,13 +518,6 @@ } } - // try from current directory - if (_can_read_file(BDJ_JARFILE)) { - storage->classpath = str_dup(BDJ_JARFILE); - BD_DEBUG(DBG_BDJ, "using %s\n", storage->classpath); - return storage->classpath; - } - BD_DEBUG(DBG_BDJ | DBG_CRIT, BDJ_JARFILE" not found.\n"); return NULL; } @@ -301,6 +527,10 @@ const char *root; char *data_home; + if (storage->no_persistent_storage) { + return NULL; + } + if (!storage->persistent_root) { root = getenv("LIBBLURAY_PERSISTENT_ROOT"); @@ -309,10 +539,15 @@ } data_home = file_get_data_home(); - storage->persistent_root = str_printf("%s" DIR_SEP "bluray" DIR_SEP "dvb.persistent.root" DIR_SEP, data_home ? data_home : ""); - X_FREE(data_home); + if (data_home) { + storage->persistent_root = str_printf("%s" DIR_SEP "bluray" DIR_SEP "dvb.persistent.root" DIR_SEP, data_home); + X_FREE(data_home); + BD_DEBUG(DBG_BDJ, "LIBBLURAY_PERSISTENT_ROOT not set, using %s\n", storage->persistent_root); + } - BD_DEBUG(DBG_BDJ, "LIBBLURAY_PERSISTENT_ROOT not set, using %s\n", storage->persistent_root); + if (!storage->persistent_root) { + BD_DEBUG(DBG_BDJ | DBG_CRIT, "WARNING: BD-J persistent root not set\n"); + } } return storage->persistent_root; @@ -323,6 +558,10 @@ const char *root; char *cache_home; + if (storage->no_persistent_storage) { + return NULL; + } + if (!storage->cache_root) { root = getenv("LIBBLURAY_CACHE_ROOT"); @@ -331,10 +570,15 @@ } cache_home = file_get_cache_home(); - storage->cache_root = str_printf("%s" DIR_SEP "bluray" DIR_SEP "bluray.bindingunit.root" DIR_SEP, cache_home ? cache_home : ""); - X_FREE(cache_home); + if (cache_home) { + storage->cache_root = str_printf("%s" DIR_SEP "bluray" DIR_SEP "bluray.bindingunit.root" DIR_SEP, cache_home); + X_FREE(cache_home); + BD_DEBUG(DBG_BDJ, "LIBBLURAY_CACHE_ROOT not set, using %s\n", storage->cache_root); + } - BD_DEBUG(DBG_BDJ, "LIBBLURAY_CACHE_ROOT not set, using %s\n", storage->cache_root); + if (!storage->cache_root) { + BD_DEBUG(DBG_BDJ | DBG_CRIT, "WARNING: BD-J cache root not set\n"); + } } return storage->cache_root; @@ -393,6 +637,12 @@ param_bdjava_ptr, param_disc_id, param_disc_root, param_persistent_root, param_buda_root); + (*env)->DeleteLocalRef(env, init_class); + (*env)->DeleteLocalRef(env, param_disc_id); + (*env)->DeleteLocalRef(env, param_disc_root); + (*env)->DeleteLocalRef(env, param_persistent_root); + (*env)->DeleteLocalRef(env, param_buda_root); + if ((*env)->ExceptionOccurred(env)) { (*env)->ExceptionDescribe(env); BD_DEBUG(DBG_BDJ | DBG_CRIT, "Failed to initialize BD-J (uncaught exception)\n"); @@ -400,10 +650,6 @@ return 0; } - (*env)->DeleteLocalRef(env, init_class); - (*env)->DeleteLocalRef(env, param_disc_id); - (*env)->DeleteLocalRef(env, param_disc_root); - return 1; } @@ -429,7 +675,9 @@ static int _find_jvm(void *jvm_lib, JNIEnv **env, JavaVM **jvm) { - fptr_JNI_GetCreatedJavaVMs JNI_GetCreatedJavaVMs_fp = (fptr_JNI_GetCreatedJavaVMs)(intptr_t)dl_dlsym(jvm_lib, "JNI_GetCreatedJavaVMs"); + fptr_JNI_GetCreatedJavaVMs JNI_GetCreatedJavaVMs_fp; + + *(void **)(&JNI_GetCreatedJavaVMs_fp) = dl_dlsym(jvm_lib, "JNI_GetCreatedJavaVMs"); if (JNI_GetCreatedJavaVMs_fp == NULL) { BD_DEBUG(DBG_BDJ | DBG_CRIT, "Couldn't find symbol JNI_GetCreatedJavaVMs.\n"); return 0; @@ -453,17 +701,25 @@ { (void)java_home; /* used only with J2ME */ - fptr_JNI_CreateJavaVM JNI_CreateJavaVM_fp = (fptr_JNI_CreateJavaVM)(intptr_t)dl_dlsym(jvm_lib, "JNI_CreateJavaVM"); + fptr_JNI_CreateJavaVM JNI_CreateJavaVM_fp; + + *(void **)(&JNI_CreateJavaVM_fp) = dl_dlsym(jvm_lib, "JNI_CreateJavaVM"); if (JNI_CreateJavaVM_fp == NULL) { BD_DEBUG(DBG_BDJ | DBG_CRIT, "Couldn't find symbol JNI_CreateJavaVM.\n"); return 0; } JavaVMOption* option = calloc(1, sizeof(JavaVMOption) * 20); + if (!option) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } + int n = 0; JavaVMInitArgs args; option[n++].optionString = str_dup ("-Dawt.toolkit=java.awt.BDToolkit"); option[n++].optionString = str_dup ("-Djava.awt.graphicsenv=java.awt.BDGraphicsEnvironment"); + option[n++].optionString = str_dup ("-Djavax.accessibility.assistive_technologies= "); option[n++].optionString = str_printf("-Xbootclasspath/p:%s", jar_file); option[n++].optionString = str_dup ("-Xms256M"); option[n++].optionString = str_dup ("-Xmx256M"); @@ -499,6 +755,21 @@ args.options = option; args.ignoreUnrecognized = JNI_FALSE; // don't ignore unrecognized options +#ifdef _WIN32 + /* ... in windows, JVM options are not UTF8 but current system code page ... */ + /* luckily, most BD-J options can be passed in as java strings later. But, not class path. */ + int ii; + for (ii = 0; ii < n; ii++) { + char *tmp = _utf8_to_cp(option[ii].optionString); + if (tmp) { + X_FREE(option[ii].optionString); + option[ii].optionString = tmp; + } else { + BD_DEBUG(DBG_BDJ | DBG_CRIT, "Failed to convert %s\n", option[ii].optionString); + } + } +#endif + int result = JNI_CreateJavaVM_fp(jvm, (void**) env, &args); while (--n >= 0) { @@ -525,6 +796,16 @@ return NULL; } +#if defined(__APPLE__) && !defined(HAVE_BDJ_J2ME) + /* On macOS we need to load libjli to workaround a bug where the wrong + * version would be used: https://bugs.openjdk.java.net/browse/JDK-7131356 + */ + void* jli_lib = _load_jli_macos(); + if (!jli_lib) { + BD_DEBUG(DBG_BDJ, "Wasn't able to load JLI\n"); + } +#endif + // first load the jvm using dlopen const char *java_home = NULL; void* jvm_lib = _load_jvm(&java_home); @@ -534,16 +815,25 @@ return 0; } + BDJAVA* bdjava = calloc(1, sizeof(BDJAVA)); + if (!bdjava) { + dl_dlclose(jvm_lib); + return NULL; + } + JNIEnv* env = NULL; JavaVM *jvm = NULL; if (!_find_jvm(jvm_lib, &env, &jvm) && !_create_jvm(jvm_lib, java_home, jar_file, &env, &jvm)) { + X_FREE(bdjava); dl_dlclose(jvm_lib); return NULL; } - BDJAVA* bdjava = calloc(1, sizeof(BDJAVA)); +#if defined(__APPLE__) && !defined(HAVE_BDJ_J2ME) + bdjava->h_libjli = jli_lib; +#endif bdjava->h_libjvm = jvm_lib; bdjava->jvm = jvm; @@ -606,31 +896,42 @@ dl_dlclose(bdjava->h_libjvm); } +#if defined(__APPLE__) && !defined(HAVE_BDJ_J2ME) + if (bdjava->h_libjli) { + dl_dlclose(bdjava->h_libjli); + } +#endif + X_FREE(bdjava); } int bdj_process_event(BDJAVA *bdjava, unsigned ev, unsigned param) { static const char * const ev_name[] = { - "NONE", - "CHAPTER", - "PLAYITEM", - "ANGLE", - "SUBTITLE", - "END_OF_PLAYLIST", - "PTS", - "VK_KEY", - "MARK", - "PSR102", - "PLAYLIST", - - "START", - "STOP", - - "RATE", - "AUDIO_STREAM", - "SECONDARY_STREAM", - "UO_MASKED", + /* 0 */ "NONE", + + /* 1 */ "START", + /* 2 */ "STOP", + /* 3 */ "PSR102", + + /* 4 */ "PLAYLIST", + /* 5 */ "PLAYITEM", + /* 6 */ "CHAPTER", + /* 7 */ "MARK", + /* 8 */ "PTS", + /* 9 */ "END_OF_PLAYLIST", + + /* 10 */ "SEEK", + /* 11 */ "RATE", + + /* 12 */ "ANGLE", + /* 13 */ "AUDIO_STREAM", + /* 14 */ "SUBTITLE", + /* 15 */ "SECONDARY_STREAM", + + /* 16 */ "VK_KEY", + /* 17 */ "UO_MASKED", + /* 18 */ "MOUSE", }; JNIEnv* env; @@ -643,8 +944,11 @@ return -1; } + if (ev > BDJ_EVENT_LAST) { + BD_DEBUG(DBG_BDJ | DBG_CRIT, "bdj_process_event(%d,%d): unknown event\n", ev, param); + } // Disable too verbose logging (PTS) - if (ev != BDJ_EVENT_PTS) { + else if (ev != BDJ_EVENT_PTS) { BD_DEBUG(DBG_BDJ, "bdj_process_event(%s,%d)\n", ev_name[ev], param); } @@ -655,7 +959,7 @@ if (_get_method(env, &event_class, &event_id, "org/videolan/Libbluray", "processEvent", "(II)Z")) { - if ((*env)->CallStaticBooleanMethod(env, event_class, event_id, ev, param)) { + if ((*env)->CallStaticBooleanMethod(env, event_class, event_id, (jint)ev, (jint)param)) { result = 0; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/bdj.h libbluray-1.0.1/src/libbluray/bdj/bdj.h --- libbluray-0.8.1/src/libbluray/bdj/bdj.h 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/bdj.h 2017-06-23 13:35:13.000000000 +0000 @@ -22,33 +22,53 @@ #include "util/attributes.h" +#include <stdint.h> + typedef enum { - BDJ_EVENT_NONE = 0, - BDJ_EVENT_CHAPTER, - BDJ_EVENT_PLAYITEM, - BDJ_EVENT_ANGLE, - BDJ_EVENT_SUBTITLE, - BDJ_EVENT_END_OF_PLAYLIST, - BDJ_EVENT_PTS, - BDJ_EVENT_VK_KEY, - BDJ_EVENT_MARK, - BDJ_EVENT_PSR102, - BDJ_EVENT_PLAYLIST, - - BDJ_EVENT_START, /* param: title number */ - BDJ_EVENT_STOP, - - BDJ_EVENT_RATE, - BDJ_EVENT_AUDIO_STREAM, - BDJ_EVENT_SECONDARY_STREAM, - BDJ_EVENT_UO_MASKED, + /* Note: these must be in sync with Libbluray.java ! */ + + BDJ_EVENT_NONE = 0, + + /* Application control */ + + BDJ_EVENT_START = 1, /* param: title number */ + BDJ_EVENT_STOP = 2, + BDJ_EVENT_PSR102 = 3, + + /* Playback status */ + + BDJ_EVENT_PLAYLIST = 4, + BDJ_EVENT_PLAYITEM = 5, + BDJ_EVENT_CHAPTER = 6, + BDJ_EVENT_MARK = 7, + BDJ_EVENT_PTS = 8, + BDJ_EVENT_END_OF_PLAYLIST = 9, + + BDJ_EVENT_SEEK = 10, + BDJ_EVENT_RATE = 11, + + BDJ_EVENT_ANGLE = 12, + BDJ_EVENT_AUDIO_STREAM = 13, + BDJ_EVENT_SUBTITLE = 14, + BDJ_EVENT_SECONDARY_STREAM = 15, + + /* User interaction */ + + BDJ_EVENT_VK_KEY = 16, + BDJ_EVENT_UO_MASKED = 17, + BDJ_EVENT_MOUSE = 18, + + BDJ_EVENT_LAST = 18, + } BDJ_EVENT; typedef struct { - char *persistent_root; - char *cache_root; + char *persistent_root; /* BD-J Xlet persistent storage */ + char *cache_root; /* BD-J binding unit data area */ + + char *classpath; /* BD-J implementation class path (location of libbluray.jar) */ - char *classpath; + uint8_t no_persistent_storage; /* disable persistent storage (remove files at close) */ } BDJ_STORAGE; typedef struct bdjava_s BDJAVA; diff -Nru libbluray-0.8.1/src/libbluray/bdj/bdjo_parse.c libbluray-1.0.1/src/libbluray/bdj/bdjo_parse.c --- libbluray-0.8.1/src/libbluray/bdj/bdjo_parse.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/bdjo_parse.c 2017-06-23 13:35:13.000000000 +0000 @@ -178,7 +178,9 @@ // seek back if (bytes_read) { - bs_seek_byte(bs, pos); + if (bs_seek_byte(bs, pos) < 0) { + return -1; + } } if (bytes_read != data_length) { @@ -252,9 +254,14 @@ static int _parse_app_names(BITSTREAM *bs, BDJO_APP *p) { unsigned ii; + int r; uint32_t data_length = bs_read(bs, 16); - p->num_name = _count_app_strings(bs, data_length, 3, "names"); + r = _count_app_strings(bs, data_length, 3, "names"); + if (r < 0) { + return -1; + } + p->num_name = r; if (data_length == 0) return 1; @@ -286,9 +293,14 @@ static int _parse_app_params(BITSTREAM *bs, BDJO_APP *p) { unsigned ii; + int r; uint32_t data_length = bs_read(bs, 8); - p->num_param = _count_app_strings(bs, data_length, 0, "params"); + r = _count_app_strings(bs, data_length, 0, "params"); + if (r < 0) { + return -1; + } + p->num_param = r; if (p->num_param) { p->param = calloc(p->num_param, sizeof(BDJO_APP_PARAM)); @@ -507,7 +519,10 @@ BITSTREAM bs; BDJO *p; - bs_init(&bs, fp); + if (bs_init(&bs, fp) < 0) { + BD_DEBUG(DBG_BDJ, "?????.bdjo: read error\n"); + return NULL; + } p = calloc(1, sizeof(BDJO)); if (!p) { diff -Nru libbluray-0.8.1/src/libbluray/bdj/build.xml libbluray-1.0.1/src/libbluray/bdj/build.xml --- libbluray-0.8.1/src/libbluray/bdj/build.xml 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/build.xml 2017-06-23 13:35:13.000000000 +0000 @@ -7,6 +7,7 @@ <property name="build" location="build"/> <property name="dist" location="../../.libs"/> <property name="src_awt" value=""/> + <property name="src_asm" value="../../../contrib/asm/src/"/> <property name="bootclasspath" value=""/> <property name="version" value=""/> @@ -18,6 +19,12 @@ <target name="compile" depends="init" description="compile the source " > + <javac srcdir="${src_asm}" destdir="${build}" debug="yes" + bootclasspath="${bootclasspath}" + source="1.5" target="1.5"> + <compilerarg value="-XDignore.symbol.file"/> + <compilerarg value="-Xlint:-deprecation"/> + </javac> <javac srcdir="${src}${src_awt}" destdir="${build}" debug="yes" bootclasspath="${bootclasspath}" source="1.4" target="1.4"> diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/com/aacsla/bluray/online/ContentAttribute.java libbluray-1.0.1/src/libbluray/bdj/java/com/aacsla/bluray/online/ContentAttribute.java --- libbluray-0.8.1/src/libbluray/bdj/java/com/aacsla/bluray/online/ContentAttribute.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/com/aacsla/bluray/online/ContentAttribute.java 2017-06-23 13:34:54.000000000 +0000 @@ -27,10 +27,33 @@ } public byte[] getContentCertID() { + byte[] id = getContentCertID("AACS" + File.separator + "Content000.cer"); + if (id != null) { + return id; + } + + id = getContentCertID("MAKEMKV" + File.separator + "AACS" + File.separator + "Content000.cer"); + if (id != null) { + return id; + } + + id = getContentCertID("ANY!" + File.separator + "Content000.cer"); + if (id != null) { + return id; + } + + return new byte[6]; + } + + private byte[] getContentCertID(String file) { FileInputStream is = null; try { is = new FileInputStream( - System.getProperty("bluray.vfs.root") + File.separator + "AACS/Content000.cer"); + System.getProperty("bluray.vfs.root") + File.separator + file); + } catch (Exception e) { + return null; + } + try { if (is.skip(14) != 14) return null; byte[] bytes = new byte[6]; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/com/aacsla/bluray/online/DeviceAttribute.java libbluray-1.0.1/src/libbluray/bdj/java/com/aacsla/bluray/online/DeviceAttribute.java --- libbluray-0.8.1/src/libbluray/bdj/java/com/aacsla/bluray/online/DeviceAttribute.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/com/aacsla/bluray/online/DeviceAttribute.java 2017-06-23 13:34:54.000000000 +0000 @@ -30,6 +30,7 @@ byte bid[] = Libbluray.getAacsData(Libbluray.AACS_DEVICE_BINDING_ID); if (bid == null) { Logger.getLogger(DeviceAttribute.class.getName()).warning("getDeviceBindingID() failed"); + return new byte[16]; } return bid; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/java/awt/Area.java libbluray-1.0.1/src/libbluray/bdj/java/java/awt/Area.java --- libbluray-0.8.1/src/libbluray/bdj/java/java/awt/Area.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/java/awt/Area.java 2017-06-23 13:34:47.000000000 +0000 @@ -26,7 +26,7 @@ public int y1; public Area() { - clear(); + this(Integer.MAX_VALUE, Integer.MAX_VALUE, -1, -1); } public Area(int width, int height) { @@ -40,21 +40,21 @@ this.y1 = y1; } - public void clear() { + private void clear() { x0 = Integer.MAX_VALUE; y0 = Integer.MAX_VALUE; x1 = -1; y1 = -1; } - public void add(int newx, int newy) { + public synchronized void add(int newx, int newy) { x0 = Math.min(x0, newx); x1 = Math.max(x1, newx); y0 = Math.min(y0, newy); y1 = Math.max(y1, newy); } - public void add(Rectangle r) { + public synchronized void add(Rectangle r) { if ((r.x | r.width | r.y | r.height) >= 0) { x0 = Math.min(x0, r.x); x1 = Math.max(x1, r.x + r.width - 1); @@ -63,11 +63,21 @@ } } - public boolean isEmpty() { + public synchronized boolean isEmpty() { return (x1 < x0) || (y1 < y0); } - public Area getBounds() { + private synchronized Area getBounds() { return new Area(x0, y0, x1, y1); } + + protected synchronized Area getBoundsAndClear() { + Area a = getBounds(); + clear(); + return a; + } + + public String toString() { + return getClass().getName() + "[" + x0 + "," + y0 + "-" + x1 + "," + y1 + "]"; + } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDFontMetrics.java libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDFontMetrics.java --- libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDFontMetrics.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDFontMetrics.java 2017-06-23 13:34:47.000000000 +0000 @@ -130,8 +130,8 @@ if (fm != null) { fm.destroy(); } - } catch (Throwable e) { - e.printStackTrace(); + } catch (Exception e) { + logger.error("shutdown() failed: " + e); } } destroyN(BDFontMetrics.ftLib); @@ -192,7 +192,14 @@ } static synchronized String[] getFontList() { - init(); + try { + init(); + } catch (ThreadDeath td) { + throw td; + } catch (Throwable t) { + logger.error("getFontList() failed: " + t); + return new String[0]; + } ArrayList fontNames = new ArrayList(); @@ -215,6 +222,9 @@ /** Cache of first 256 Unicode characters as these map to ASCII characters and are often used. */ private int[] widths; + /* synchronize access to ftFace (native functions) */ + private final Object faceLock = new Object(); + /** * Creates a font metrics for the supplied font. To get a font metrics for a font * use the static method getFontMetrics instead which does caching. @@ -223,9 +233,10 @@ super(font); ftFace = loadFontN(ftLib, nativeName, font.getSize()); - if (ftFace == 0) + if (ftFace == 0) { + logger.error("Error loading font"); throw new AWTError("font face:" + nativeName + " not loaded"); - + } widths = null; } @@ -235,20 +246,24 @@ private native int stringWidthN(long ftFace, String string); private native int charsWidthN(long ftFace, char chars[], int offset, int len); - private synchronized void loadWidths() { + private void loadWidths() { /* Cache first 256 char widths for use by the getWidths method and for faster metric calculation as they are commonly used (ASCII) characters. */ if (widths == null) { - widths = new int[256]; - for (int i = 0; i < 256; i++) { - widths[i] = charWidthN(ftFace, (char)i); + int[] widths = new int[256]; + synchronized (faceLock) { + for (int i = 0; i < 256; i++) { + widths[i] = charWidthN(ftFace, (char)i); + } } + this.widths = widths; } } - - protected synchronized void drawString(BDGraphics g, String string, int x, int y, int rgb) { - g.drawStringN(ftFace, string, x, y, rgb); + protected void drawString(BDGraphics g, String string, int x, int y, int rgb) { + synchronized (faceLock) { + g.drawStringN(ftFace, string, x, y, rgb); + } } public int getAscent() { @@ -270,31 +285,37 @@ /** * Fast lookup of first 256 chars as these are always the same eg. ASCII charset. */ - public synchronized int charWidth(char c) { + public int charWidth(char c) { if (c < 256) { loadWidths(); return widths[c]; } - return charWidthN(ftFace, c); + synchronized (faceLock) { + return charWidthN(ftFace, c); + } } /** * Return the width of the specified string in this Font. */ - public synchronized int stringWidth(String string) { + public int stringWidth(String string) { /* Allow only one call at time. * (calling this function from multiple threads caused crashes in freetype) */ synchronized (BDFontMetrics.class) { - return stringWidthN(ftFace, string); + synchronized (faceLock) { + return stringWidthN(ftFace, string); + } } } /** * Return the width of the specified char[] in this Font. */ - public synchronized int charsWidth(char chars[], int offset, int length) { - return charsWidthN(ftFace, chars, offset, length); + public int charsWidth(char chars[], int offset, int length) { + synchronized (faceLock) { + return charsWidthN(ftFace, chars, offset, length); + } } /** diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDGraphicsBase.java libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDGraphicsBase.java --- libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDGraphicsBase.java 2015-04-10 06:39:25.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDGraphicsBase.java 2017-06-23 13:34:47.000000000 +0000 @@ -31,13 +31,16 @@ import java.awt.image.ImageObserver; import org.dvb.ui.DVBBufferedImage; +import org.dvb.ui.DVBAlphaComposite; +import org.dvb.ui.DVBGraphics; +import org.dvb.ui.UnsupportedDrawingOperationException; import sun.awt.ConstrainableGraphics; import org.videolan.GUIManager; import org.videolan.Logger; -abstract class BDGraphicsBase extends Graphics2D implements ConstrainableGraphics { +abstract class BDGraphicsBase extends DVBGraphics implements ConstrainableGraphics { private static final Color DEFAULT_COLOR = Color.BLACK; private static final Font DEFAULT_FONT = new Font("Dialog", Font.PLAIN, 12); @@ -146,6 +149,52 @@ return new BDGraphics((BDGraphics)this); } + /* + * DVBGraphics methods + */ + + public int[] getAvailableCompositeRules() + { + /* + int[] rules = { DVBAlphaComposite.CLEAR, DVBAlphaComposite.SRC, + DVBAlphaComposite.SRC_OVER, DVBAlphaComposite.DST_OVER, + DVBAlphaComposite.SRC_IN, DVBAlphaComposite.DST_IN, + DVBAlphaComposite.SRC_OUT, DVBAlphaComposite.DST_OUT }; + */ + int[] rules = { + DVBAlphaComposite.CLEAR, + DVBAlphaComposite.SRC, + DVBAlphaComposite.SRC_OVER }; + + return rules; + } + + public DVBAlphaComposite getDVBComposite() + { + Composite comp = getComposite(); + if (!(comp instanceof AlphaComposite)) + return null; + return DVBAlphaComposite.getInstance( + ((AlphaComposite)comp).getRule(), + ((AlphaComposite)comp).getAlpha()); + } + + public void setDVBComposite(DVBAlphaComposite comp) + throws UnsupportedDrawingOperationException + { + if ((comp.getRule() < DVBAlphaComposite.CLEAR) || + (comp.getRule() > DVBAlphaComposite.SRC_OVER)) { + logger.error("setDVBComposite() FAILED: unsupported rule " + comp.getRule()); + throw new UnsupportedDrawingOperationException("Unsupported composition rule: " + comp.getRule()); + } + + setComposite(AlphaComposite.getInstance(comp.getRule(), comp.getAlpha())); + } + + /* + * + */ + public void translate(int x, int y) { originX += x; originY += y; @@ -159,6 +208,8 @@ } public Font getFont() { + if (font == null) + return DEFAULT_FONT; return font; } @@ -166,11 +217,18 @@ if (font != null && fontMetrics == null) { fontMetrics = BDFontMetrics.getFontMetrics(font); } + if (fontMetrics == null) { + logger.error("getFontMetrics() failed"); + } return fontMetrics; } public FontMetrics getFontMetrics(Font font) { - return BDFontMetrics.getFontMetrics(font); + if (font != null) { + return BDFontMetrics.getFontMetrics(font); + } + logger.error("getFontMetrics(null) from " + Logger.dumpStack()); + return null; } public void setColor(Color c) { @@ -187,13 +245,17 @@ } public GraphicsConfiguration getDeviceConfiguration() { + if (gc == null) + logger.error("getDeviceConfiguration() failed"); return gc; } public void setComposite(Composite comp) { if ((comp != null) && (comp != composite)) { - if (!(comp instanceof AlphaComposite)) + if (!(comp instanceof AlphaComposite)) { + logger.error("Composite is not AlphaComposite"); throw new IllegalArgumentException("Only AlphaComposite is supported"); + } composite = (AlphaComposite) comp; } } @@ -255,8 +317,10 @@ } else if (clip instanceof Rectangle) { Rectangle rect = (Rectangle) clip; setClip(rect.x, rect.y, rect.width, rect.height); - } else + } else { + logger.error("Shape is not Rectangle: " + clip.getClass().getName()); throw new IllegalArgumentException("setClip(Shape) only supports Rectangle objects"); + } } private void setupClip() { @@ -306,7 +370,7 @@ Rectangle rect = new Rectangle(x, y, length, 1); rect = actualClip.intersection(rect); - if (rect.width <= 0 || rect.height <= 0 || rect.x < 0 || rect.y < 0) { + if (rect.width <= 0 || rect.height <= 0 || rect.x < 0 || rect.y < 0 || backBuffer == null) { return; } @@ -364,7 +428,7 @@ Rectangle rect = new Rectangle(x, y, length, 1); rect = actualClip.intersection(rect); - if (rect.width <= 0 || rect.height <= 0 || rect.x < 0 || rect.y < 0) { + if (rect.width <= 0 || rect.height <= 0 || rect.x < 0 || rect.y < 0 || backBuffer == null) { return; } @@ -458,7 +522,7 @@ y += originY; Rectangle rect = new Rectangle(x, y, w, h); rect = actualClip.intersection(rect); - if (rect.isEmpty()) { + if (rect.isEmpty() || backBuffer == null) { return; } x = rect.x; @@ -572,7 +636,7 @@ Rectangle rect = new Rectangle(x, y, w, h); rect = actualClip.intersection(rect); - if (rect.width <= 0 || rect.height <= 0) { + if (rect.width <= 0 || rect.height <= 0 || backBuffer == null) { return; } @@ -1463,9 +1527,11 @@ try { return (Image)bufferedImagePeer.get(image); } catch (IllegalArgumentException e) { - e.printStackTrace(); + logger.error("Failed getting buffered image peer: " + e + "\n" + + Logger.dumpStack(e)); } catch (IllegalAccessException e) { - e.printStackTrace(); + logger.error("Failed getting buffered image peer: " + e + "\n" + + Logger.dumpStack(e)); } return null; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDGraphicsConfigurationBase.java libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDGraphicsConfigurationBase.java --- libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDGraphicsConfigurationBase.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDGraphicsConfigurationBase.java 2017-06-23 13:34:47.000000000 +0000 @@ -45,7 +45,7 @@ return BufferedImage.TYPE_INT_ARGB; } - public synchronized ColorModel getColorModel() { + public ColorModel getColorModel() { return new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB), 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, true, DataBuffer.TYPE_INT); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDGraphicsEnvironment.java libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDGraphicsEnvironment.java --- libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDGraphicsEnvironment.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDGraphicsEnvironment.java 2017-06-23 13:34:47.000000000 +0000 @@ -31,7 +31,7 @@ graphicsDevice = new BDGraphicsDevice(this); } - public synchronized GraphicsDevice[] getScreenDevices() { + public GraphicsDevice[] getScreenDevices() { return new GraphicsDevice[] { graphicsDevice }; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDImageConsumer.java libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDImageConsumer.java --- libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDImageConsumer.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDImageConsumer.java 2017-06-23 13:34:47.000000000 +0000 @@ -25,7 +25,7 @@ import java.awt.image.ImageConsumer; import java.awt.image.ColorModel; -public class BDImageConsumer extends BDImage implements ImageConsumer { +class BDImageConsumer extends BDImage implements ImageConsumer { private Hashtable properties; private ImageProducer producer; private int status; @@ -158,6 +158,7 @@ for (Y = y; Y < (y + h); Y++) for (X = x; X < (x + w); X++) backBuffer[Y * width + X] = cm.getRGB(pixels[offset + (Y - y) * scansize + (X - x)] & 0xFF); + dirty.add(new Rectangle(x, y, w, h)); status |= ImageObserver.SOMEBITS; notifyObservers(this, ImageObserver.SOMEBITS, x, y, w, h); } @@ -167,6 +168,7 @@ for (Y = y; Y < (y + h); Y++) for (X = x; X < (x + w); X++) backBuffer[Y * width + X] = cm.getRGB(pixels[offset + (Y - y) * scansize + (X - x)]); + dirty.add(new Rectangle(x, y, w, h)); status |= ImageObserver.SOMEBITS; notifyObservers(this, ImageObserver.SOMEBITS, x, y, w, h); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDJHelper.java libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDJHelper.java --- libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDJHelper.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDJHelper.java 2017-06-23 13:34:47.000000000 +0000 @@ -68,6 +68,14 @@ } } + public static boolean postMouseEvent(int x, int y) { + return false; + } + + public static boolean postMouseEvent(int button) { + return false; + } + public static boolean postKeyEvent(int id, int modifiers, int keyCode) { Component focusOwner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getGlobalFocusOwner(); if (focusOwner != null) { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDOffScreenImageSource.java libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDOffScreenImageSource.java --- libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDOffScreenImageSource.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDOffScreenImageSource.java 2017-06-23 13:34:47.000000000 +0000 @@ -39,16 +39,16 @@ this.buffer = buffer; } - public synchronized void addConsumer(ImageConsumer ic) { + public void addConsumer(ImageConsumer ic) { consumer = ic; produce(); } - public synchronized boolean isConsumer(ImageConsumer ic) { + public boolean isConsumer(ImageConsumer ic) { return (ic == consumer); } - public synchronized void removeConsumer(ImageConsumer ic) { + public void removeConsumer(ImageConsumer ic) { if (consumer == ic) { consumer = null; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDRootWindow.java libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDRootWindow.java --- libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDRootWindow.java 2015-04-15 08:30:17.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDRootWindow.java 2017-06-23 13:34:47.000000000 +0000 @@ -82,6 +82,13 @@ return null; } + private boolean isBackBufferClear() { + int v = 0; + for (int i = 0; i < height * width; i++) + v |= backBuffer[i]; + return v == 0; + } + public void notifyChanged() { if (!isVisible()) { logger.error("sync(): not visible"); @@ -108,11 +115,26 @@ } changeCount = 0; - Area a = dirty.getBounds(); - dirty.clear(); + if (!isVisible()) { + if (overlay_open) { + logger.info("sync(): close OSD (not visible)"); + close(); + } + logger.info("sync() ignored (not visible)"); + return; + } + + Area a = dirty.getBoundsAndClear(); if (!a.isEmpty()) { if (!overlay_open) { + + /* delay opening overlay until something has been drawn */ + if (isBackBufferClear()) { + logger.info("sync() ignored (overlay not open, empty overlay)"); + return; + } + Libbluray.updateGraphic(getWidth(), getHeight(), null); overlay_open = true; a = new Area(getWidth(), getHeight()); /* force full plane update */ @@ -122,7 +144,7 @@ } } - private class RefreshTimerTask extends TimerTask { + private static class RefreshTimerTask extends TimerTask { public RefreshTimerTask(BDRootWindow window) { this.window = window; this.changeCount = window.changeCount; @@ -165,8 +187,8 @@ if (overlay_open) { logger.error("clearOverlay() ignored (overlay is visible)"); } else { + dirty.getBoundsAndClear(); Arrays.fill(backBuffer, 0); - dirty.clear(); } } } @@ -196,10 +218,10 @@ } private int[] backBuffer = null; - private Area dirty = new Area(); - private int changeCount = 0; - private Timer timer = new Timer(); - private TimerTask timerTask = null; + private transient Area dirty = new Area(); + private transient int changeCount = 0; + private transient Timer timer = new Timer(); + private transient TimerTask timerTask = null; private boolean overlay_open = false; private Font defaultFont = null; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDToolkitBase.java libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDToolkitBase.java --- libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDToolkitBase.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDToolkitBase.java 2017-06-23 13:34:47.000000000 +0000 @@ -61,7 +61,7 @@ if (toolkit instanceof BDToolkit) { ((BDToolkit)toolkit).shutdown(); } - } catch (Throwable t) { + } catch (Exception t) { logger.error("shutdownDisc() failed: " + t + "\n" + Logger.dumpStack(t)); } } @@ -124,6 +124,10 @@ } public Image getImage(String filename) { + if (BDJXletContext.getCurrentContext() == null) { + logger.error("getImage(): no context " + Logger.dumpStack()); + } + if (cachedImages.containsKey(filename)) return (Image)cachedImages.get(filename); Image newImage = createImage(filename); @@ -133,6 +137,10 @@ } public Image getImage(URL url) { + if (BDJXletContext.getCurrentContext() == null) { + logger.error("getImage(): no context " + Logger.dumpStack()); + } + if (cachedImages.containsKey(url)) return (Image)cachedImages.get(url); Image newImage = createImage(url); @@ -142,6 +150,10 @@ } public Image createImage(String filename) { + if (BDJXletContext.getCurrentContext() == null) { + logger.error("createImage(): no context " + Logger.dumpStack()); + } + if (!new File(filename).isAbsolute()) { String home = BDJXletContext.getCurrentXletHome(); if (home != null) { @@ -161,6 +173,9 @@ } public Image createImage(URL url) { + if (BDJXletContext.getCurrentContext() == null) { + logger.error("createImage(): no context " + Logger.dumpStack()); + } ImageProducer ip = new URLImageSource(url); Image newImage = createImage(ip); return newImage; @@ -169,12 +184,20 @@ public Image createImage(byte[] imagedata, int imageoffset, int imagelength) { + + if (BDJXletContext.getCurrentContext() == null) { + logger.error("createImage(): no context " + Logger.dumpStack()); + } + ImageProducer ip = new ByteArrayImageSource(imagedata, imageoffset, imagelength); Image newImage = createImage(ip); return newImage; } public Image createImage(ImageProducer producer) { + if (BDJXletContext.getCurrentContext() == null) { + logger.error("createImage(): no context " + Logger.dumpStack()); + } return new BDImageConsumer(producer); } @@ -243,7 +266,7 @@ } } - logger.warning("getSystemEventQueue(): no context"); + logger.warning("getSystemEventQueue(): no context from:" + logger.dumpStack()); return eventQueue; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDWindowGraphics.java libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDWindowGraphics.java --- libbluray-0.8.1/src/libbluray/bdj/java/java/awt/BDWindowGraphics.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/java/awt/BDWindowGraphics.java 2017-06-23 13:34:47.000000000 +0000 @@ -39,6 +39,7 @@ } public void clearRect(int x, int y, int w, int h) { + if (window == null) return; synchronized (window) { super.clearRect(x, y, w, h); window.notifyChanged(); @@ -46,6 +47,7 @@ } public void fillRect(int x, int y, int w, int h) { + if (window == null) return; synchronized (window) { super.fillRect(x, y, w, h); window.notifyChanged(); @@ -53,6 +55,7 @@ } public void drawRect(int x, int y, int w, int h) { + if (window == null) return; synchronized (window) { super.drawRect(x, y, w, h); window.notifyChanged(); @@ -60,6 +63,7 @@ } public void drawLine(int x1, int y1, int x2, int y2) { + if (window == null) return; synchronized (window) { super.drawLine(x1, y1, x2, y2); window.notifyChanged(); @@ -67,6 +71,7 @@ } public void copyArea(int x, int y, int w, int h, int dx, int dy) { + if (window == null) return; synchronized (window) { super.copyArea(x, y, w, h, dx, dy); window.notifyChanged(); @@ -74,6 +79,7 @@ } public void drawPolyline(int xPoints[], int yPoints[], int nPoints) { + if (window == null) return; synchronized (window) { super.drawPolyline(xPoints, yPoints, nPoints); window.notifyChanged(); @@ -81,6 +87,7 @@ } public void drawPolygon(int xPoints[], int yPoints[], int nPoints) { + if (window == null) return; synchronized (window) { super.drawPolygon(xPoints, yPoints, nPoints); window.notifyChanged(); @@ -88,6 +95,7 @@ } public void fillPolygon(int xPoints[], int yPoints[], int nPoints) { + if (window == null) return; synchronized (window) { super.fillPolygon(xPoints, yPoints, nPoints); window.notifyChanged(); @@ -95,6 +103,7 @@ } public void drawOval(int x, int y, int w, int h) { + if (window == null) return; synchronized (window) { super.drawOval(x, y, w, h); window.notifyChanged(); @@ -102,6 +111,7 @@ } public void fillOval(int x, int y, int w, int h) { + if (window == null) return; synchronized (window) { super.fillOval(x, y, w, h); window.notifyChanged(); @@ -109,6 +119,7 @@ } public void drawArc(int x, int y, int w, int h, int startAngle, int endAngle) { + if (window == null) return; synchronized (window) { super.drawArc(x, y, w, h, startAngle, endAngle); window.notifyChanged(); @@ -116,6 +127,7 @@ } public void fillArc(int x, int y, int w, int h, int startAngle, int endAngle) { + if (window == null) return; synchronized (window) { super.fillArc(x, y, w, h, startAngle, endAngle); window.notifyChanged(); @@ -123,6 +135,7 @@ } public void drawRoundRect(int x, int y, int w, int h, int arcWidth, int arcHeight) { + if (window == null) return; synchronized (window) { super.drawRoundRect(x, y, w, h, arcWidth, arcHeight); window.notifyChanged(); @@ -130,6 +143,7 @@ } public void fillRoundRect(int x, int y, int w, int h, int arcWidth, int arcHeight) { + if (window == null) return; synchronized (window) { super.fillRoundRect(x, y, w, h, arcWidth, arcHeight); window.notifyChanged(); @@ -137,6 +151,7 @@ } protected void drawStringN(long ftFace, String string, int x, int y, int rgb) { + if (window == null) return; synchronized (window) { super.drawStringN(ftFace, string, x, y, rgb); window.notifyChanged(); @@ -154,6 +169,8 @@ boolean flipX, boolean flipY, Color bg, ImageObserver observer) { + if (window == null) return true; + synchronized (window) { boolean complete = super.drawImageN( img, dx, dy, dw, dh, sx, sy, sw, sh, diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/java/awt/Font.java libbluray-1.0.1/src/libbluray/bdj/java/java/awt/Font.java --- libbluray-0.8.1/src/libbluray/bdj/java/java/awt/Font.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/java/awt/Font.java 2017-06-23 13:34:47.000000000 +0000 @@ -198,6 +198,9 @@ public Font deriveFont(int style, int size) { return new Font(name, style, size, fontFile, family); } + public Font deriveFont(int style, float size) { + return new Font(name, style, (int)size, fontFile, family); + } /* constructor */ private Font(String name, int style, int size, File fontFile, String family) { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/java/io/FileInputStream.java libbluray-1.0.1/src/libbluray/bdj/java/java/io/FileInputStream.java --- libbluray-0.8.1/src/libbluray/bdj/java/java/io/FileInputStream.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/java/io/FileInputStream.java 2017-06-23 13:34:47.000000000 +0000 @@ -51,9 +51,11 @@ if (file.isAbsolute()) { String cachedName = BDJLoader.getCachedFile(name); if (cachedName != name) { + synchronized (FileInputStream.class) { if (logger == null) { logger = Logger.getLogger(FileInputStream.class.getName()); } + } logger.info("Using cached " + cachedName + " for " + name); name = cachedName; } @@ -64,9 +66,11 @@ String home = BDJXletContext.getCurrentXletHome(); if (home == null) { + synchronized (FileInputStream.class) { if (logger == null) { logger = Logger.getLogger(FileInputStream.class.getName()); } + } logger.error("no home found for " + name + " at " + Logger.dumpStack()); throw new FileNotFoundException(name); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/CachingControlEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/CachingControlEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/CachingControlEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/CachingControlEvent.java 2017-06-23 13:34:50.000000000 +0000 @@ -21,25 +21,27 @@ public class CachingControlEvent extends ControllerEvent { public CachingControlEvent(Controller from, CachingControl cacheControl, - long progress) - { + long progress) { super(from); this.cacheControl = cacheControl; this.progress = progress; } - public CachingControl getCachingControl() - { + public CachingControl getCachingControl() { return cacheControl; } - public long getContentProgress() - { + public long getContentProgress() { return progress; } - private CachingControl cacheControl; - private long progress; + public String toString() { + return getClass().getName() + "[source=" + source + ",cacheControl=" + cacheControl + ",progress=" + progress + "]"; + } + + private final CachingControl cacheControl; + private final long progress; + private static final long serialVersionUID = 8877038236738665179L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ClockStartedError.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ClockStartedError.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ClockStartedError.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ClockStartedError.java 2017-06-23 13:34:48.000000000 +0000 @@ -20,13 +20,11 @@ package javax.media; public class ClockStartedError extends MediaError { - public ClockStartedError() - { + public ClockStartedError() { super(); } - public ClockStartedError(String reason) - { + public ClockStartedError(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ClockStoppedException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ClockStoppedException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ClockStoppedException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ClockStoppedException.java 2017-06-23 13:34:49.000000000 +0000 @@ -20,13 +20,11 @@ package javax.media; public class ClockStoppedException extends MediaException { - public ClockStoppedException() - { + public ClockStoppedException() { super(); } - public ClockStoppedException(String reason) - { + public ClockStoppedException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ConnectionErrorEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ConnectionErrorEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ConnectionErrorEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ConnectionErrorEvent.java 2017-06-23 13:34:50.000000000 +0000 @@ -22,13 +22,11 @@ import javax.media.Controller; public class ConnectionErrorEvent extends ControllerErrorEvent { - public ConnectionErrorEvent(Controller source) - { + public ConnectionErrorEvent(Controller source) { super(source); } - public ConnectionErrorEvent(Controller source, String reason) - { + public ConnectionErrorEvent(Controller source, String reason) { super(source, reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ControllerClosedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ControllerClosedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ControllerClosedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ControllerClosedEvent.java 2017-06-23 13:34:48.000000000 +0000 @@ -20,23 +20,24 @@ package javax.media; public class ControllerClosedEvent extends ControllerEvent { - public ControllerClosedEvent(Controller source) - { + public ControllerClosedEvent(Controller source) { super(source); } - public ControllerClosedEvent(Controller source, String reason) - { + public ControllerClosedEvent(Controller source, String reason) { super(source); this.reason = reason; } - public String getMessage() - { + public String getMessage() { return reason; } + public String toString() { + return getClass().getName() + "[source=" + source + ",reason=" + reason + "]"; + } + private String reason = ""; private static final long serialVersionUID = 5868546288299613691L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ControllerErrorEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ControllerErrorEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ControllerErrorEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ControllerErrorEvent.java 2017-06-23 13:34:50.000000000 +0000 @@ -20,13 +20,11 @@ package javax.media; public class ControllerErrorEvent extends ControllerClosedEvent { - public ControllerErrorEvent(Controller source) - { + public ControllerErrorEvent(Controller source) { super(source); } - public ControllerErrorEvent(Controller source, String reason) - { + public ControllerErrorEvent(Controller source, String reason) { super(source, reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ControllerEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ControllerEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ControllerEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ControllerEvent.java 2017-06-23 13:34:48.000000000 +0000 @@ -22,23 +22,24 @@ import java.util.EventObject; public class ControllerEvent extends EventObject implements MediaEvent { - public ControllerEvent(Controller source) - { + public ControllerEvent(Controller source) { super(source); this.source = source; } - public Controller getSourceController() - { + public Controller getSourceController() { return source; } - public Object getSource() - { + public Object getSource() { return source; } - private Controller source; + public String toString() { + return getClass().getName() + "[source=" + source + "]"; + } + + protected final Controller source; private static final long serialVersionUID = 2637536605185993242L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/DataStarvedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/DataStarvedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/DataStarvedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/DataStarvedEvent.java 2017-06-23 13:34:48.000000000 +0000 @@ -21,8 +21,7 @@ public class DataStarvedEvent extends StopEvent { public DataStarvedEvent(Controller source, int previous, int current, - int target, Time mediaTime) - { + int target, Time mediaTime) { super(source, previous, current, target, mediaTime); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/DeallocateEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/DeallocateEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/DeallocateEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/DeallocateEvent.java 2017-06-23 13:34:50.000000000 +0000 @@ -21,8 +21,7 @@ public class DeallocateEvent extends StopEvent { public DeallocateEvent(Controller source, int previous, int current, - int target, Time mediaTime) - { + int target, Time mediaTime) { super(source, previous, current, target, mediaTime); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/DurationUpdateEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/DurationUpdateEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/DurationUpdateEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/DurationUpdateEvent.java 2017-06-23 13:34:50.000000000 +0000 @@ -20,18 +20,20 @@ package javax.media; public class DurationUpdateEvent extends ControllerEvent { - public DurationUpdateEvent(Controller source, Time duration) - { + public DurationUpdateEvent(Controller source, Time duration) { super(source); this.duration = duration; } - public Time getDuration() - { + public Time getDuration() { return duration; } - private Time duration; + public String toString() { + return getClass().getName() + "[source=" + source + ",duration=" + duration + "]"; + } + + private final Time duration; private static final long serialVersionUID = 400898256354068250L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/EndOfMediaEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/EndOfMediaEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/EndOfMediaEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/EndOfMediaEvent.java 2017-06-23 13:34:48.000000000 +0000 @@ -21,8 +21,7 @@ public class EndOfMediaEvent extends StopEvent { public EndOfMediaEvent(Controller source, int previous, int current, - int target, Time mediaTime) - { + int target, Time mediaTime) { super(source, previous, current, target, mediaTime); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/GainChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/GainChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/GainChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/GainChangeEvent.java 2017-06-23 13:34:48.000000000 +0000 @@ -23,8 +23,7 @@ public class GainChangeEvent extends EventObject implements MediaEvent { public GainChangeEvent(GainControl source, boolean mute, float dB, - float level) - { + float level) { super(source); this.source = source; this.mute = mute; @@ -32,34 +31,34 @@ this.level = level; } - public Object getSource() - { + public Object getSource() { return source; } - public GainControl getSourceGainControl() - { + public GainControl getSourceGainControl() { return source; } - public boolean getMute() - { + public boolean getMute() { return mute; } - public float getDB() - { + public float getDB() { return dB; } - public float getLevel() - { + public float getLevel() { return level; } - private GainControl source; - private boolean mute; - private float dB; - private float level; + public String toString() { + return getClass().getName() + "[source=" + source + ",mute=" + mute + ",db=" + dB + ",level=" + level + "]"; + } + + private final GainControl source; + private final boolean mute; + private final float dB; + private final float level; + private static final long serialVersionUID = -3685931181525562650L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/IncompatibleSourceException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/IncompatibleSourceException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/IncompatibleSourceException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/IncompatibleSourceException.java 2017-06-23 13:34:50.000000000 +0000 @@ -20,13 +20,11 @@ package javax.media; public class IncompatibleSourceException extends MediaException { - public IncompatibleSourceException() - { + public IncompatibleSourceException() { super(); } - public IncompatibleSourceException(String reason) - { + public IncompatibleSourceException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/IncompatibleTimeBaseException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/IncompatibleTimeBaseException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/IncompatibleTimeBaseException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/IncompatibleTimeBaseException.java 2017-06-23 13:34:49.000000000 +0000 @@ -20,13 +20,11 @@ package javax.media; public class IncompatibleTimeBaseException extends MediaException { - public IncompatibleTimeBaseException() - { + public IncompatibleTimeBaseException() { super(); } - public IncompatibleTimeBaseException(String reason) - { + public IncompatibleTimeBaseException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/InternalErrorEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/InternalErrorEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/InternalErrorEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/InternalErrorEvent.java 2017-06-23 13:34:48.000000000 +0000 @@ -20,13 +20,11 @@ package javax.media; public class InternalErrorEvent extends ControllerErrorEvent { - public InternalErrorEvent(Controller source) - { + public InternalErrorEvent(Controller source) { super(source); } - public InternalErrorEvent(Controller source, String reason) - { + public InternalErrorEvent(Controller source, String reason) { super(source, reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/Manager.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/Manager.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/Manager.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/Manager.java 2017-06-23 13:34:48.000000000 +0000 @@ -1,3 +1,21 @@ +/* + * This file is part of libbluray + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + package javax.media; import java.io.IOException; @@ -16,14 +34,12 @@ */ public final class Manager { public static Player createPlayer(URL sourceURL) throws IOException, - NoPlayerException - { + NoPlayerException { return createPlayer(new MediaLocator(sourceURL)); } public static Player createPlayer(MediaLocator sourceLocator) - throws IOException, NoPlayerException - { + throws IOException, NoPlayerException { final String protocol = sourceLocator.getProtocol(); final Vector dataSourceList = getDataSourceList(protocol); for (int i = 0; i < dataSourceList.size(); ++i) { @@ -83,20 +99,17 @@ } public static Player createPlayer(DataSource source) throws IOException, - NoPlayerException - { + NoPlayerException { return createPlayer(source, source.getContentType()); } public static DataSource createDataSource(URL sourceURL) - throws IOException, NoDataSourceException - { + throws IOException, NoDataSourceException { return createDataSource(new MediaLocator(sourceURL)); } public static DataSource createDataSource(MediaLocator sourceLocator) - throws IOException, NoDataSourceException - { + throws IOException, NoDataSourceException { final String protocol = sourceLocator.getProtocol(); final Vector dataSourceList = getDataSourceList(protocol); for (int i = 0; i < dataSourceList.size(); ++i) { @@ -140,24 +153,20 @@ return dataSource; } - public static TimeBase getSystemTimeBase() - { + public static TimeBase getSystemTimeBase() { return systemTimeBase; } - public static Vector getDataSourceList(String protocolName) - { + public static Vector getDataSourceList(String protocolName) { return getClassList(protocolName, PackageManager.getProtocolPrefixList(), "protocol", "DataSource"); } - public static Vector getHandlerClassList(String contentName) - { + public static Vector getHandlerClassList(String contentName) { return getClassList(toPackageFriendly(contentName), PackageManager.getContentPrefixList(), "content", "Handler"); } private static Player createPlayer(DataSource source, String contentType) - throws IOException, NoPlayerException - { + throws IOException, NoPlayerException { final Vector handlerClassList = getHandlerClassList(contentType); for (int i = 0; i < handlerClassList.size(); ++i) { final String handlerClassName = (String) handlerClassList.get(i); @@ -210,8 +219,7 @@ throw new NoPlayerException("No player found for " + source.getLocator()); } - private static char toPackageFriendly(char c) - { + private static char toPackageFriendly(char c) { if (c >= 'a' && c <= 'z') return c; else if (c >= 'A' && c <= 'Z') @@ -226,8 +234,7 @@ return '_'; } - private static String toPackageFriendly(String contentName) - { + private static String toPackageFriendly(String contentName) { final StringBuffer b = new StringBuffer(); for (int i = 0; i < contentName.length(); ++i) { final char c = contentName.charAt(i); @@ -236,8 +243,7 @@ return b.toString(); } - public static Vector getClassList(String contentName, Vector packages, String component2, String className) - { + public static Vector getClassList(String contentName, Vector packages, String component2, String className) { final Vector result = new Vector(); //result.add("media." + component2 + "." + contentName + "." + className); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/MediaError.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/MediaError.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/MediaError.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/MediaError.java 2017-06-23 13:34:50.000000000 +0000 @@ -20,13 +20,11 @@ package javax.media; public class MediaError extends Error { - public MediaError() - { + public MediaError() { super(); } - public MediaError(String reason) - { + public MediaError(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/MediaException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/MediaException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/MediaException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/MediaException.java 2017-06-23 13:34:48.000000000 +0000 @@ -20,13 +20,11 @@ package javax.media; public class MediaException extends Exception { - public MediaException() - { + public MediaException() { super(); } - public MediaException(String reason) - { + public MediaException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/MediaLocator.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/MediaLocator.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/MediaLocator.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/MediaLocator.java 2017-06-23 13:34:50.000000000 +0000 @@ -25,27 +25,40 @@ public class MediaLocator implements Serializable { - public MediaLocator(URL url) { - this(url.toExternalForm()); + public MediaLocator(URL url) { + this.url = url; + if (url != null) { + this.locatorString = url.toString().trim(); + } } - public MediaLocator(String locatorString) { - int index = locatorString.indexOf(":"); - if (index <= 0) - throw new IllegalArgumentException("Bad locator string."); - protocol = locatorString.substring(0, index); - remainder = locatorString.substring(index + 1); + public MediaLocator(String locatorString) { + if (locatorString != null) + this.locatorString = locatorString.trim(); } public URL getURL() throws MalformedURLException { - return new URL(toExternalForm()); + if (url == null) { + url = new URL(locatorString); + } + return url; } public String getProtocol() { + String protocol = ""; + int col = locatorString.indexOf(":"); + if (col >= 0) { + protocol = locatorString.substring(0, col); + } return protocol; } public String getRemainder() { + String remainder = ""; + int col = locatorString.indexOf(":"); + if (col >= 0) { + remainder = locatorString.substring(col + 1); + } return remainder; } @@ -54,11 +67,11 @@ } public String toExternalForm() { - return protocol + ":" + remainder; + return locatorString; } - - private String protocol = ""; - private String remainder = ""; + + private String locatorString = ""; + private URL url = null; private static final long serialVersionUID = 1L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/MediaTimeSetEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/MediaTimeSetEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/MediaTimeSetEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/MediaTimeSetEvent.java 2017-06-23 13:34:49.000000000 +0000 @@ -20,18 +20,21 @@ package javax.media; public class MediaTimeSetEvent extends ControllerEvent { - public MediaTimeSetEvent(Controller from, Time mediaTime) - { + public MediaTimeSetEvent(Controller from, Time mediaTime) { super(from); - + this.mediaTime = mediaTime; } - public Time getMediaTime() - { + public Time getMediaTime() { return mediaTime; } - private Time mediaTime; + public String toString() { + return getClass().toString() + "[source=" + source + ",mediaTime=" + mediaTime + "]"; + } + + private final Time mediaTime; + private static final long serialVersionUID = -628446955261317468L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/NoDataSourceException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/NoDataSourceException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/NoDataSourceException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/NoDataSourceException.java 2017-06-23 13:34:48.000000000 +0000 @@ -20,13 +20,11 @@ package javax.media; public class NoDataSourceException extends MediaException { - public NoDataSourceException() - { + public NoDataSourceException() { super(); } - public NoDataSourceException(String reason) - { + public NoDataSourceException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/NoPlayerException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/NoPlayerException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/NoPlayerException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/NoPlayerException.java 2017-06-23 13:34:48.000000000 +0000 @@ -20,13 +20,11 @@ package javax.media; public class NoPlayerException extends MediaException { - public NoPlayerException() - { + public NoPlayerException() { super(); } - public NoPlayerException(String reason) - { + public NoPlayerException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/NotPrefetchedError.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/NotPrefetchedError.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/NotPrefetchedError.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/NotPrefetchedError.java 2017-06-23 13:34:48.000000000 +0000 @@ -20,8 +20,7 @@ package javax.media; public class NotPrefetchedError extends MediaError { - public NotPrefetchedError(String reason) - { + public NotPrefetchedError(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/NotRealizedError.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/NotRealizedError.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/NotRealizedError.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/NotRealizedError.java 2017-06-23 13:34:48.000000000 +0000 @@ -20,8 +20,7 @@ package javax.media; public class NotRealizedError extends MediaError { - public NotRealizedError(String reason) - { + public NotRealizedError(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/PackageManager.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/PackageManager.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/PackageManager.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/PackageManager.java 2017-06-23 13:34:48.000000000 +0000 @@ -22,46 +22,39 @@ import java.util.Vector; public class PackageManager { - public PackageManager() - { + public PackageManager() { } - public static Vector getProtocolPrefixList() - { + public static Vector getProtocolPrefixList() { return protocolPrefix; } - public static void setProtocolPrefixList(Vector list) - { + public static void setProtocolPrefixList(Vector list) { protocolPrefixTemp = list; } - public static void commitProtocolPrefixList() - { + public static void commitProtocolPrefixList() { SecurityManager sec = System.getSecurityManager(); if (sec != null) sec.checkPropertiesAccess(); protocolPrefix = (Vector) protocolPrefixTemp.clone(); } - public static Vector getContentPrefixList() - { + public static Vector getContentPrefixList() { return contentPrefix; } - public static void setContentPrefixList(Vector list) - { + public static void setContentPrefixList(Vector list) { contentPrefixTemp = list; } - public static void commitContentPrefixList() - { + public static void commitContentPrefixList() { SecurityManager sec = System.getSecurityManager(); if (sec != null) sec.checkPropertiesAccess(); contentPrefix = (Vector) contentPrefixTemp.clone(); } - + private static Vector protocolPrefixTemp = null; private static Vector contentPrefixTemp = null; private static Vector protocolPrefix = null; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/PrefetchCompleteEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/PrefetchCompleteEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/PrefetchCompleteEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/PrefetchCompleteEvent.java 2017-06-23 13:34:49.000000000 +0000 @@ -21,8 +21,7 @@ public class PrefetchCompleteEvent extends TransitionEvent { public PrefetchCompleteEvent(Controller source, int previous, int current, - int target) - { + int target) { super(source, previous, current, target); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/ContentDescriptor.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/ContentDescriptor.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/ContentDescriptor.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/ContentDescriptor.java 2017-06-23 13:34:49.000000000 +0000 @@ -22,18 +22,15 @@ import java.lang.Character; public class ContentDescriptor { - public ContentDescriptor(String cdName) - { + public ContentDescriptor(String cdName) { this.cdName = cdName; } - public String getContentType() - { + public String getContentType() { return cdName; } - public static final String mimeTypeToPackageName(String mimeType) - { + public static final String mimeTypeToPackageName(String mimeType) { char[] name = mimeType.toLowerCase().toCharArray(); for (int i = 0; i < name.length; i++) { char c = name[i]; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/DataSource.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/DataSource.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/DataSource.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/DataSource.java 2017-06-23 13:34:49.000000000 +0000 @@ -25,22 +25,18 @@ import javax.media.MediaLocator; public abstract class DataSource implements Controls, Duration { - public DataSource() - { + public DataSource() { } - public DataSource(MediaLocator source) - { + public DataSource(MediaLocator source) { locator = source; } - public void setLocator(MediaLocator source) - { + public void setLocator(MediaLocator source) { locator = source; } - public MediaLocator getLocator() - { + public MediaLocator getLocator() { return locator; } @@ -54,8 +50,7 @@ public abstract void stop() throws IOException; - protected void initCheck() - { + protected void initCheck() { if (locator == null) throw new Error("Locator can't be null"); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/PullDataSource.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/PullDataSource.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/PullDataSource.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/PullDataSource.java 2017-06-23 13:34:49.000000000 +0000 @@ -20,8 +20,7 @@ package javax.media.protocol; public abstract class PullDataSource extends DataSource { - public PullDataSource() - { + public PullDataSource() { } public abstract PullSourceStream[] getStreams(); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/PushDataSource.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/PushDataSource.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/PushDataSource.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/PushDataSource.java 2017-06-23 13:34:49.000000000 +0000 @@ -20,8 +20,7 @@ package javax.media.protocol; public abstract class PushDataSource extends DataSource { - public PushDataSource() - { + public PushDataSource() { } public abstract PushSourceStream[] getStreams(); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/RateRange.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/RateRange.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/RateRange.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/RateRange.java 2017-06-23 13:34:49.000000000 +0000 @@ -20,45 +20,38 @@ package javax.media.protocol; public class RateRange { - public RateRange(RateRange r) - { + public RateRange(RateRange r) { this.current = r.current; this.min = r.min; this.max = r.max; this.isExact = r.isExact; } - public RateRange(float init, float min, float max, boolean isExact) - { + public RateRange(float init, float min, float max, boolean isExact) { this.current = init; this.min = min; this.max = max; this.isExact = isExact; } - public float setCurrentRate(float rate) - { + public float setCurrentRate(float rate) { this.current = rate; return current; } - public float getCurrentRate() - { + public float getCurrentRate() { return current; } - public float getMinimumRate() - { + public float getMinimumRate() { return min; } - public float getMaximumRate() - { + public float getMaximumRate() { return max; } - public boolean isExact() - { + public boolean isExact() { return isExact; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/URLDataSource.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/URLDataSource.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/URLDataSource.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/URLDataSource.java 2017-06-23 13:34:49.000000000 +0000 @@ -27,78 +27,63 @@ import javax.media.MediaLocator; public class URLDataSource extends PullDataSource { - protected URLDataSource() - { + protected URLDataSource() { } - public URLDataSource(URL url) throws IOException - { + public URLDataSource(URL url) throws IOException { setLocator(new MediaLocator(url)); - this.connected = false; + connected = false; } - public PullSourceStream[] getStreams() - { - if (!this.connected) + public PullSourceStream[] getStreams() { + if (!connected) throw new Error("Unconnected source."); - return this.sources; + return sources; } - public void connect() throws IOException - { - this.conn = getLocator().getURL().openConnection(); - this.conn.connect(); - this.connected = true; - String str = this.conn.getContentType(); + public void connect() throws IOException { + conn = getLocator().getURL().openConnection(); + conn.connect(); + connected = true; + String str = conn.getContentType(); if (str == null) str = "UnknownContent"; - this.contentType = new ContentDescriptor(ContentDescriptor.mimeTypeToPackageName(str)); - this.sources = new URLSourceStream[1]; - this.sources[0] = new URLSourceStream(this.conn, this.contentType); + contentType = new ContentDescriptor(ContentDescriptor.mimeTypeToPackageName(str)); + sources = new URLSourceStream[1]; + sources[0] = new URLSourceStream(conn, contentType); } - public String getContentType() - { - if (!this.connected) + public String getContentType() { + if (!connected) throw new Error("Source is unconnected."); - return this.contentType.getContentType(); + return contentType.getContentType(); } - public void disconnect() - { - if (this.connected) - { - try - { - this.sources[0].close(); + public void disconnect() { + if (connected) { + try { + sources[0].close(); + } catch (IOException ioe) { } - catch (IOException localIOException) - { - } - this.connected = false; + connected = false; } } - public void start() throws IOException - { + public void start() throws IOException { } - public void stop() throws IOException - { + public void stop() throws IOException { } - public Time getDuration() - { + public Time getDuration() { return Duration.DURATION_UNKNOWN; } - public Object[] getControls() - { + public Object[] getControls() { return new Object[0]; } - public Object getControl(String controlName) - { + public Object getControl(String controlName) { return null; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/URLSourceStream.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/URLSourceStream.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/protocol/URLSourceStream.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/protocol/URLSourceStream.java 2017-06-23 13:34:49.000000000 +0000 @@ -1,98 +1,84 @@ -/* - * This file is part of libbluray - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -package javax.media.protocol; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URLConnection; - -class URLSourceStream - implements PullSourceStream -{ - protected URLConnection conn; - protected InputStream stream; - protected boolean eosReached; - ContentDescriptor contentType; - - public URLSourceStream(URLConnection conn, ContentDescriptor type) - throws IOException - { - this.conn = conn; - this.stream = conn.getInputStream(); - this.eosReached = false; - this.contentType = type; - } - - public ContentDescriptor getContentDescriptor() - { - return this.contentType; - } - - public boolean willReadBlock() - { - if (this.eosReached == true) - return true; - try - { - return this.stream.available() == 0; - } - catch (IOException e) - { - } - return true; - } - - public int read(byte[] buffer, int offset, int length) - throws IOException - { - int bytesRead = this.stream.read(buffer, offset, length); - if (bytesRead == -1) - this.eosReached = true; - return bytesRead; - } - - public void close() - throws IOException - { - this.stream.close(); - } - - public boolean endOfStream() - { - return this.eosReached; - } - - public Object[] getControls() - { - return new Object[0]; - } - - public Object getControl(String controlName) - { - return null; - } - - public long getContentLength() - { - long len = this.conn.getContentLength(); - len = len == -1L ? -1L : len; - - return len; - } -} +/* + * This file is part of libbluray + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package javax.media.protocol; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URLConnection; + +class URLSourceStream implements PullSourceStream { + + protected URLConnection conn; + protected InputStream stream; + protected boolean eosReached; + ContentDescriptor contentType; + + public URLSourceStream(URLConnection conn, ContentDescriptor type) + throws IOException { + + this.conn = conn; + this.stream = conn.getInputStream(); + this.eosReached = false; + this.contentType = type; + } + + public ContentDescriptor getContentDescriptor() { + return contentType; + } + + public boolean willReadBlock() { + if (eosReached == true) + return true; + try { + return stream.available() == 0; + } + catch (IOException e) { + } + return true; + } + + public int read(byte[] buffer, int offset, int length) + throws IOException { + + int bytesRead = stream.read(buffer, offset, length); + if (bytesRead == -1) + this.eosReached = true; + return bytesRead; + } + + public void close() throws IOException { + stream.close(); + } + + public boolean endOfStream() { + return eosReached; + } + + public Object[] getControls() { + return new Object[0]; + } + + public Object getControl(String controlName) { + return null; + } + + public long getContentLength() { + return conn.getContentLength(); + } +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/RateChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/RateChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/RateChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/RateChangeEvent.java 2017-06-23 13:34:50.000000000 +0000 @@ -20,18 +20,21 @@ package javax.media; public class RateChangeEvent extends ControllerEvent { - public RateChangeEvent(Controller source, float rate) - { + public RateChangeEvent(Controller source, float rate) { super(source); this.rate = rate; } - public float getRate() - { + public float getRate() { return rate; } - private float rate; + public String toString() { + return getClass().getName() + "[source=" + source + ",rate=" + rate + "]"; + } + + private final float rate; + private static final long serialVersionUID = -4420398478601444547L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/RealizeCompleteEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/RealizeCompleteEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/RealizeCompleteEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/RealizeCompleteEvent.java 2017-06-23 13:34:48.000000000 +0000 @@ -21,8 +21,7 @@ public class RealizeCompleteEvent extends TransitionEvent { public RealizeCompleteEvent(Controller source, int previous, int current, - int target) - { + int target) { super(source, previous, current, target); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ResourceUnavailableEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ResourceUnavailableEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/ResourceUnavailableEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/ResourceUnavailableEvent.java 2017-06-23 13:34:49.000000000 +0000 @@ -20,13 +20,11 @@ package javax.media; public class ResourceUnavailableEvent extends ControllerErrorEvent { - public ResourceUnavailableEvent(Controller source) - { + public ResourceUnavailableEvent(Controller source) { super(source); } - public ResourceUnavailableEvent(Controller source, String message) - { + public ResourceUnavailableEvent(Controller source, String message) { super(source); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/RestartingEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/RestartingEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/RestartingEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/RestartingEvent.java 2017-06-23 13:34:50.000000000 +0000 @@ -21,8 +21,7 @@ public class RestartingEvent extends StopEvent { public RestartingEvent(Controller source, int previous, int current, - int target, Time mediaTime) - { + int target, Time mediaTime) { super(source, previous, current, target, mediaTime); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/StartEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/StartEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/StartEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/StartEvent.java 2017-06-23 13:34:49.000000000 +0000 @@ -21,24 +21,26 @@ public class StartEvent extends TransitionEvent { public StartEvent(Controller source, int previous, int current, int target, - Time mediaTime, Time tbTime) - { + Time mediaTime, Time tbTime) { super(source, previous, current, target); this.mediaTime = mediaTime; this.tbTime = tbTime; } - public Time getMediaTime() - { + public Time getMediaTime() { return mediaTime; } - public Time getTimeBaseTime() - { + public Time getTimeBaseTime() { return tbTime; } - private Time mediaTime; - private Time tbTime; + public String toString() { + return getClass().toString() + "[source=" + source + ",mediaTime=" + mediaTime + ",tbTime=" + tbTime + "]"; + } + + private final Time mediaTime; + private final Time tbTime; + private static final long serialVersionUID = -6779753774143606328L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/StopAtTimeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/StopAtTimeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/StopAtTimeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/StopAtTimeEvent.java 2017-06-23 13:34:49.000000000 +0000 @@ -21,8 +21,7 @@ public class StopAtTimeEvent extends StopEvent { public StopAtTimeEvent(Controller source, int previous, int current, - int target, Time mediaTime) - { + int target, Time mediaTime) { super(source, previous, current, target, mediaTime); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/StopByRequestEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/StopByRequestEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/StopByRequestEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/StopByRequestEvent.java 2017-06-23 13:34:50.000000000 +0000 @@ -21,8 +21,7 @@ public class StopByRequestEvent extends StopEvent { public StopByRequestEvent(Controller source, int previous, int current, - int target, Time mediaTime) - { + int target, Time mediaTime) { super(source, previous, current, target, mediaTime); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/StopEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/StopEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/StopEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/StopEvent.java 2017-06-23 13:34:48.000000000 +0000 @@ -23,18 +23,21 @@ public class StopEvent extends TransitionEvent { public StopEvent(Controller source, int previous, int current, int target, - Time mediaTime) - { + Time mediaTime) { super(source, previous, current, target); this.mediaTime = mediaTime; } - public Time getMediaTime() - { + public Time getMediaTime() { return mediaTime; } - private Time mediaTime; + public String toString() { + return getClass().toString() + "[source=" + source + ",mediaTime=" + mediaTime + "]"; + } + + private final Time mediaTime; + private static final long serialVersionUID = -4224879148377028872L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/StopTimeChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/StopTimeChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/StopTimeChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/StopTimeChangeEvent.java 2017-06-23 13:34:48.000000000 +0000 @@ -20,18 +20,21 @@ package javax.media; public class StopTimeChangeEvent extends ControllerEvent { - public StopTimeChangeEvent(Controller from, Time stopTime) - { + public StopTimeChangeEvent(Controller from, Time stopTime) { super(from); this.stopTime = stopTime; } - public Time getStopTime() - { + public Time getStopTime() { return stopTime; } - private Time stopTime; + public String toString() { + return getClass().getName() + "[source=" + source + ",stopTime=" + stopTime + "]"; + } + + private final Time stopTime; + private static final long serialVersionUID = -3236645692389122978L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/StopTimeSetError.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/StopTimeSetError.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/StopTimeSetError.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/StopTimeSetError.java 2017-06-23 13:34:49.000000000 +0000 @@ -20,8 +20,7 @@ package javax.media; public class StopTimeSetError extends MediaError { - public StopTimeSetError(String reason) - { + public StopTimeSetError(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/SystemTimeBase.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/SystemTimeBase.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/SystemTimeBase.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/SystemTimeBase.java 2017-06-23 13:34:48.000000000 +0000 @@ -1,31 +1,46 @@ +/* + * This file is part of libbluray + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + package javax.media; /** * This file is from FMJ (fmj-sf.net) - * + * * Complete. * @author Ken Larson * */ -public final class SystemTimeBase implements TimeBase -{ +public final class SystemTimeBase implements TimeBase { - private static long start = -1L; - public long getNanoseconds() - { + private static long start = -1L; + + public long getNanoseconds() { // This version only has millisecond accuracy. - - if (start < 0) - { start = System.currentTimeMillis(); + + if (start < 0) { + start = System.currentTimeMillis(); return 0; } return (System.currentTimeMillis() - start) * 1000000L; - //return System.nanoTime(); // TODO: does this need to be relative to a specific point in time? } - public Time getTime() - { + public Time getTime() { return new Time(getNanoseconds()); } -} \ No newline at end of file +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/Time.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/Time.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/Time.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/Time.java 2017-06-23 13:34:50.000000000 +0000 @@ -25,28 +25,23 @@ public static final long ONE_SECOND = 1000000000L; protected long nanoseconds; - public Time(long nano) - { + public Time(long nano) { this.nanoseconds = nano; } - public Time(double seconds) - { + public Time(double seconds) { this.nanoseconds = secondsToNanoseconds(seconds); } - protected long secondsToNanoseconds(double seconds) - { + protected long secondsToNanoseconds(double seconds) { return (long) (seconds * ONE_SECOND); } - public long getNanoseconds() - { + public long getNanoseconds() { return nanoseconds; } - public double getSeconds() - { + public double getSeconds() { return nanoseconds / (double) ONE_SECOND; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/media/TransitionEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/media/TransitionEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/media/TransitionEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/media/TransitionEvent.java 2017-06-23 13:34:48.000000000 +0000 @@ -21,31 +21,32 @@ public class TransitionEvent extends ControllerEvent { public TransitionEvent(Controller from, int previous, int current, - int target) - { + int target) { super(from); this.previous = previous; this.current = current; this.target = target; } - public int getPreviousState() - { + public int getPreviousState() { return previous; } - public int getCurrentState() - { + public int getCurrentState() { return current; } - public int getTargetState() - { + public int getTargetState() { return target; } - private int previous; - private int current; - private int target; + public String toString() { + return getClass().toString() + "[source=" + source + ",previous=" + previous + ",current=" + current + ",target=" + target + "]"; + } + + private final int previous; + private final int current; + private final int target; + private static final long serialVersionUID = 6818216020447063912L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/graphics/AlphaColor.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/graphics/AlphaColor.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/graphics/AlphaColor.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/graphics/AlphaColor.java 2017-06-23 13:34:53.000000000 +0000 @@ -39,7 +39,25 @@ public AlphaColor(Color c) { - super(c.getRGB()); + super(c.getRGB(), true); + } + + public Color brighter() + { + Color c = super.brighter(); + int a = getAlpha(); + + // JSR927: "Returns: A new AlphaColor object" + return new AlphaColor(c.getRed(), c.getGreen(), c.getBlue(), a); + } + + public Color darker() + { + Color c = super.darker(); + int a = getAlpha(); + + // JSR927: "Returns: A new AlphaColor object" + return new AlphaColor(c.getRed(), c.getGreen(), c.getBlue(), a); } private static final long serialVersionUID = -3466072971590811211L; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/graphics/TVContainer.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/graphics/TVContainer.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/graphics/TVContainer.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/graphics/TVContainer.java 2017-06-23 13:34:53.000000000 +0000 @@ -20,17 +20,28 @@ import java.awt.Container; import javax.tv.xlet.XletContext; -import org.havi.ui.HScene; import org.havi.ui.HSceneFactory; +import org.videolan.BDJXletContext; +import org.videolan.Logger; + public class TVContainer { public static Container getRootContainer(XletContext context) { if (context == null) { + Logger.getLogger(TVContainer.class.getName()).error("null context"); throw new NullPointerException(); } - HScene scene = HSceneFactory.getInstance().getDefaultHScene(); - return scene; + if (!(context instanceof BDJXletContext) || (BDJXletContext)context != BDJXletContext.getCurrentContext()) { + Logger.getLogger(TVContainer.class.getName()).error("wrong context"); + } + + /* GEM: return instance of org.havi.ui.HScene or NULL */ + HSceneFactory sf = HSceneFactory.getInstance(); + if (sf != null) { + return sf.getDefaultHScene(); + } + return null; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/locator/LocatorFactoryImpl.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/locator/LocatorFactoryImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/locator/LocatorFactoryImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/locator/LocatorFactoryImpl.java 2017-06-23 13:34:53.000000000 +0000 @@ -21,27 +21,40 @@ package javax.tv.locator; import org.bluray.net.BDLocator; +import org.videolan.Logger; public class LocatorFactoryImpl extends LocatorFactory { public Locator createLocator(String url) throws MalformedLocatorException { + if (url == null) { + logger.error("null locator"); + throw new NullPointerException("Source Locator is null"); + } // check if it is a bluray locator if (url.startsWith("bd:/")) { try { return new BDLocator(url); } catch (org.davic.net.InvalidLocatorException ex) { + logger.error("invalid locator: " + url); throw new MalformedLocatorException(ex.getMessage()); } } else { // just return a generic locator + logger.error("unknown locator type: " + url); return new LocatorImpl(url); } } - public Locator[] transformLocator(Locator source) - throws InvalidLocatorException - { - org.videolan.Logger.unimplemented(LocatorFactoryImpl.class.getName(), "transformLocator"); - throw new Error("Not implemented."); + public Locator[] transformLocator(Locator source) throws InvalidLocatorException { + if (source == null) { + logger.error("null locator"); + throw new NullPointerException("Source Locator is null"); + } + if (source instanceof BDLocator){ + return new Locator[] { source }; + } + logger.error("unsupported locator: " + source); + throw new InvalidLocatorException(source, "Source locator is invalid."); } + private static final Logger logger = Logger.getLogger(LocatorFactoryImpl.class.getName()); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/locator/LocatorFactory.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/locator/LocatorFactory.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/locator/LocatorFactory.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/locator/LocatorFactory.java 2017-06-23 13:34:53.000000000 +0000 @@ -21,7 +21,6 @@ public abstract class LocatorFactory extends Object { protected LocatorFactory() { - } public static LocatorFactory getInstance() { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/locator/LocatorImpl.java 2017-06-23 13:34:53.000000000 +0000 @@ -24,7 +24,7 @@ this.url = url; } - public boolean hasMultipleTransformations() { + public boolean hasMultipleTransformations() { return false; } @@ -44,19 +44,15 @@ } public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) + if (!(obj instanceof Locator)) return false; - if (getClass() != obj.getClass()) - return false; - LocatorImpl other = (LocatorImpl) obj; - if (url == null) { - if (other.url != null) - return false; - } else if (!url.equals(other.url)) - return false; - return true; + + Locator other = (Locator) obj; + String extForm = toExternalForm(); + if (extForm == null) { + return other.toExternalForm() == null; + } + return extForm.equals(other.toExternalForm()); } private String url; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/media/AWTVideoSize.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/media/AWTVideoSize.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/media/AWTVideoSize.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/media/AWTVideoSize.java 2017-06-23 13:34:53.000000000 +0000 @@ -23,9 +23,13 @@ public class AWTVideoSize { - public AWTVideoSize(Rectangle source, Rectangle dest) { - this.source = source; - this.dest = dest; + public AWTVideoSize(Rectangle source, Rectangle dest) { + if (source == null || dest == null) { + System.err.println("null rect"); + throw new NullPointerException("null rect"); + } + this.source = (Rectangle)source.clone(); + this.dest = (Rectangle)dest.clone(); } public Rectangle getSource() { @@ -37,15 +41,14 @@ } public float getXScale() { - return getDestination().width / getSource().width; + return dest.width / source.width; } public float getYScale() { - return getDestination().height / getSource().height; + return dest.height / source.height; } - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = 1; result = prime * result + ((dest == null) ? 0 : dest.hashCode()); @@ -53,33 +56,18 @@ return result; } - public boolean equals(Object obj) - { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) + public boolean equals(Object obj) { + if (!(obj instanceof AWTVideoSize)) { return false; + } AWTVideoSize other = (AWTVideoSize) obj; - if (dest == null) { - if (other.dest != null) - return false; - } else if (!dest.equals(other.dest)) - return false; - if (source == null) { - if (other.source != null) - return false; - } else if (!source.equals(other.source)) - return false; - return true; + return dest.equals(other.dest) && source.equals(other.source); } - public String toString() - { - return "AWTVideoSize [dest=" + dest + ", source=" + source + "]"; + public String toString() { + return getClass().getName() + "[dest=" + dest + ",source=" + source + "]"; } - + private Rectangle source; private Rectangle dest; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectCARefusedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectCARefusedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectCARefusedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectCARefusedEvent.java 2017-06-23 13:34:54.000000000 +0000 @@ -23,10 +23,9 @@ import javax.media.Controller; public class MediaSelectCARefusedEvent extends MediaSelectFailedEvent { - public MediaSelectCARefusedEvent(Controller source, Locator[] selection) - { + public MediaSelectCARefusedEvent(Controller source, Locator[] selection) { super(source, selection); } - + private static final long serialVersionUID = -8706477571753234088L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectEvent.java 2017-06-23 13:34:54.000000000 +0000 @@ -23,21 +23,18 @@ import javax.media.Controller; public abstract class MediaSelectEvent extends java.util.EventObject { - public MediaSelectEvent(Controller controller, Locator[] selection) - { + public MediaSelectEvent(Controller controller, Locator[] selection) { super(controller); this.controller = controller; this.selection = selection; } - public Controller getController() - { + public Controller getController() { return controller; } - public Locator[] getSelection() - { + public Locator[] getSelection() { return selection; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectFailedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectFailedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectFailedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectFailedEvent.java 2017-06-23 13:34:54.000000000 +0000 @@ -23,8 +23,7 @@ import javax.media.Controller; public class MediaSelectFailedEvent extends MediaSelectEvent { - public MediaSelectFailedEvent(Controller source, Locator[] selection) - { + public MediaSelectFailedEvent(Controller source, Locator[] selection) { super(source, selection); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectPermission.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectPermission.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectPermission.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectPermission.java 2017-06-23 13:34:54.000000000 +0000 @@ -32,31 +32,36 @@ if (locator == null) this.locator = "*"; else - this.locator = locator.toExternalForm(); + this.locator = locator.toExternalForm(); } public MediaSelectPermission(String locator, String actions) { super("javax.tv.media.MediaSelectPermission"); + if (locator == null) + throw new NullPointerException("null locator"); + this.locator = locator; } public boolean implies(Permission perm) { - return (perm instanceof MediaSelectPermission) && (this.equals(perm) || this.locator.equals("*")); + if (perm == null) + throw new NullPointerException("permission is null"); + + if (!(perm instanceof MediaSelectPermission)) + return false; + + return equals(perm) || locator.equals("*"); } public boolean equals(Object obj) { - if (obj == null) - return false; if (this == obj) return true; - if (getClass() != obj.getClass()) + if (!(obj instanceof MediaSelectPermission)) return false; + MediaSelectPermission other = (MediaSelectPermission) obj; - if (locator == null) { - if (other.locator != null) - return false; - } else if (!locator.equals(other.locator)) + if (!locator.equals(other.locator)) return false; return true; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectSucceededEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectSucceededEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectSucceededEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/media/MediaSelectSucceededEvent.java 2017-06-23 13:34:53.000000000 +0000 @@ -23,8 +23,7 @@ import javax.media.Controller; public class MediaSelectSucceededEvent extends MediaSelectEvent { - public MediaSelectSucceededEvent(Controller source, Locator[] selection) - { + public MediaSelectSucceededEvent(Controller source, Locator[] selection) { super(source, selection); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/net/InterfaceMap.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/net/InterfaceMap.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/net/InterfaceMap.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/net/InterfaceMap.java 2017-06-23 13:34:50.000000000 +0000 @@ -0,0 +1,35 @@ +/* + * This file is part of libbluray + * Copyright (C) 2016 VideoLAN + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package javax.tv.net; + +import java.io.IOException; +import java.net.InetAddress; +import javax.tv.locator.InvalidLocatorException; +import javax.tv.locator.Locator; + +public class InterfaceMap +{ + public static InetAddress getLocalAddress(Locator locator) + throws InvalidLocatorException, IOException { + + org.videolan.Logger.unimplemented(InterfaceMap.class.getName(), "getLocalAddress"); + throw new InvalidLocatorException(locator, "Unsupported"); + } +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/guide/ProgramScheduleChangeType.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/guide/ProgramScheduleChangeType.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/guide/ProgramScheduleChangeType.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/guide/ProgramScheduleChangeType.java 2017-06-23 13:34:53.000000000 +0000 @@ -23,15 +23,13 @@ public class ProgramScheduleChangeType extends SIChangeType { - - - protected ProgramScheduleChangeType(String name) { + protected ProgramScheduleChangeType(String name) { super(name); } public String toString() { - return name; + return super.toString(); } - + public static final ProgramScheduleChangeType CURRENT_PROGRAM_EVENT = new ProgramScheduleChangeType("CURRENT_PROGRAM_EVENT"); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/guide/ProgramScheduleEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/guide/ProgramScheduleEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/guide/ProgramScheduleEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/guide/ProgramScheduleEvent.java 2017-06-23 13:34:53.000000000 +0000 @@ -24,18 +24,15 @@ public class ProgramScheduleEvent extends SIChangeEvent { public ProgramScheduleEvent(ProgramSchedule schedule, SIChangeType type, - ProgramEvent event) - { + ProgramEvent event) { super(schedule, type, event); } - public ProgramSchedule getProgramSchedule() - { + public ProgramSchedule getProgramSchedule() { return (ProgramSchedule)getSource(); } - public ProgramEvent getProgramEvent() - { + public ProgramEvent getProgramEvent() { return (ProgramEvent)getSIElement(); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/DeliverySystemType.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/DeliverySystemType.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/DeliverySystemType.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/DeliverySystemType.java 2017-06-23 13:34:51.000000000 +0000 @@ -20,13 +20,13 @@ package javax.tv.service.navigation; public class DeliverySystemType { - protected DeliverySystemType(String name) - { + protected DeliverySystemType(String name) { + if (name == null) + throw new NullPointerException("no name"); this.name = name; } - public String toString() - { + public String toString() { return name; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/FilterNotSupportedException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/FilterNotSupportedException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/FilterNotSupportedException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/FilterNotSupportedException.java 2017-06-23 13:34:51.000000000 +0000 @@ -22,13 +22,11 @@ import javax.tv.service.SIException; public class FilterNotSupportedException extends SIException { - public FilterNotSupportedException() - { + public FilterNotSupportedException() { super(); } - public FilterNotSupportedException(String reason) - { + public FilterNotSupportedException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/LocatorFilter.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/LocatorFilter.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/LocatorFilter.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/LocatorFilter.java 2017-06-23 13:34:51.000000000 +0000 @@ -23,8 +23,24 @@ import javax.tv.locator.InvalidLocatorException; import javax.tv.service.Service; +import org.bluray.net.BDLocator; +import org.bluray.ti.TitleImpl; + public final class LocatorFilter extends ServiceFilter { public LocatorFilter(Locator[] locators) throws InvalidLocatorException { + if (locators == null) + throw new NullPointerException(); + + for (int i = 0; i < locators.length; i++) { + try { + if (locators[i] == null) + throw new InvalidLocatorException(locators[i]); + new BDLocator(locators[i].toExternalForm()); + } catch (org.davic.net.InvalidLocatorException e) { + throw new InvalidLocatorException(locators[i]); + } + } + this.locators = locators; } @@ -36,9 +52,17 @@ if (service == null) throw new NullPointerException(); + if (!(service instanceof TitleImpl)) + return false; + + int num = ((TitleImpl)service).getTitleNum(); for (int i = 0; i < locators.length; i++) { - if (locators[i].equals(service.getLocator())) - return true; + + try { + BDLocator bdl = new BDLocator(locators[i].toExternalForm()); + if (bdl.getTitleNumber() == num) + return true; + } catch (org.davic.net.InvalidLocatorException e) { } } return false; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/PreferenceFilter.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/PreferenceFilter.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/PreferenceFilter.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/PreferenceFilter.java 2017-06-23 13:34:51.000000000 +0000 @@ -23,24 +23,22 @@ public final class PreferenceFilter extends ServiceFilter { - public PreferenceFilter(FavoriteServicesName name) - { + public PreferenceFilter(FavoriteServicesName name) { + System.err.println("No preference"); + if (name == null) + throw new NullPointerException(); throw new IllegalArgumentException(); } - public static FavoriteServicesName[] listPreferences() - { + public static FavoriteServicesName[] listPreferences() { return new FavoriteServicesName[0]; } - public FavoriteServicesName getFilterValue() - { + public FavoriteServicesName getFilterValue() { return null; } - public boolean accept(Service service) - { + public boolean accept(Service service) { return false; } - } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceComponentChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceComponentChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceComponentChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceComponentChangeEvent.java 2017-06-23 13:34:51.000000000 +0000 @@ -23,15 +23,13 @@ public class ServiceComponentChangeEvent extends ServiceDetailsSIChangeEvent { public ServiceComponentChangeEvent(ServiceDetails details, - SIChangeType type, ServiceComponent component) - { + SIChangeType type, ServiceComponent component) { super(details, type, component); this.component = component; } - public ServiceComponent getServiceComponent() - { + public ServiceComponent getServiceComponent() { return component; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceDetailsSIChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceDetailsSIChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceDetailsSIChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceDetailsSIChangeEvent.java 2017-06-23 13:34:51.000000000 +0000 @@ -23,14 +23,12 @@ public abstract class ServiceDetailsSIChangeEvent extends SIChangeEvent { public ServiceDetailsSIChangeEvent(ServiceDetails details, - SIChangeType type, SIElement element) - { + SIChangeType type, SIElement element) { super(details, type, element); this.details = details; } - public ServiceDetails getServiceDetails() - { + public ServiceDetails getServiceDetails() { return details; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceFilter.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceFilter.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceFilter.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceFilter.java 2017-06-23 13:34:50.000000000 +0000 @@ -22,8 +22,7 @@ import javax.tv.service.Service; public abstract class ServiceFilter { - protected ServiceFilter() - { + protected ServiceFilter() { } public abstract boolean accept(Service service); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceIteratorImpl.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceIteratorImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceIteratorImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceIteratorImpl.java 2017-06-23 13:34:51.000000000 +0000 @@ -19,6 +19,7 @@ package javax.tv.service.navigation; import java.util.LinkedList; +import java.util.NoSuchElementException; import javax.tv.service.Service; @@ -36,15 +37,15 @@ } public Service nextService() { - if (index < services.size()) - return (Service)services.get(index++); - return null; + if (!hasNext()) + throw new NoSuchElementException("End of list reached"); + return (Service)services.get(index++); } public Service previousService() { - if (index > 0) - return (Service)services.get(--index); - return null; + if (!hasPrevious()) + throw new NoSuchElementException("Start of list reached"); + return (Service)services.get(--index); } public boolean hasNext() { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceListImpl.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceListImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceListImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceListImpl.java 2017-06-23 13:34:51.000000000 +0000 @@ -22,6 +22,8 @@ import java.util.Comparator; import java.util.LinkedList; +import java.io.Serializable; + import javax.tv.locator.Locator; import javax.tv.locator.InvalidLocatorException; import javax.tv.service.Service; @@ -53,27 +55,34 @@ try { bdLocator = new BDLocator(locator.toExternalForm()); } catch (org.davic.net.InvalidLocatorException e) { + System.err.println("invalid locator"); throw new InvalidLocatorException(locator); } } else { bdLocator = (BDLocator)locator; } int title = bdLocator.getTitleNumber(); - if (title < 0) + if (title < 0) { + System.err.println("invalid title in locator"); throw new InvalidLocatorException(locator); + } for (int i = 0; i < size(); i++) { TitleImpl ti = (TitleImpl)services.get(i); if (((TitleImpl)services.get(i)).getTitleNum() == title) return ti; } + System.err.println("findService: " + locator + " not found"); return null; } public ServiceList filterServices(ServiceFilter filter) { + if (filter == null) { + System.err.println("null service filter"); + } LinkedList list = new LinkedList(); for (int i = 0; i < size(); i++) { Service service = getService(i); - if (filter.accept(service)) + if (filter == null || filter.accept(service)) list.add(service); } return new ServiceListImpl(list); @@ -113,7 +122,7 @@ services.add(service); } - private class TitleComparator implements Comparator { + private static class TitleComparator implements Comparator, Serializable { public int compare(Object obj1, Object obj2) { return ((TitleImpl)obj1).getTitleNum() - ((TitleImpl)obj2).getTitleNum(); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceTypeFilter.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceTypeFilter.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceTypeFilter.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/ServiceTypeFilter.java 2017-06-23 13:34:51.000000000 +0000 @@ -22,19 +22,20 @@ import javax.tv.service.ServiceType; public final class ServiceTypeFilter extends ServiceFilter { - public ServiceTypeFilter(ServiceType type) - { + public ServiceTypeFilter(ServiceType type) { + if (type == null) + throw new NullPointerException(); this.type = type; } - public ServiceType getFilterValue() - { + public ServiceType getFilterValue() { return type; } - public boolean accept(Service service) - { - return service.getServiceType().equals(type); + public boolean accept(Service service) { + if (service == null) + throw new NullPointerException(); + return service.getServiceType() == type; } private ServiceType type; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/SIElementFilter.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/SIElementFilter.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/SIElementFilter.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/SIElementFilter.java 2017-06-23 13:34:51.000000000 +0000 @@ -1,6 +1,7 @@ /* * This file is part of libbluray * Copyright (C) 2010 William Hahne + * Copyright (C) 2015-2016 Petri Hintukainen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,15 +20,32 @@ package javax.tv.service.navigation; -import javax.tv.service.SIRetrievable; import javax.tv.service.Service; import javax.tv.service.SIElement; -import javax.tv.service.SIRequest; -import javax.tv.service.SIRequestorImpl; + +import org.bluray.net.BDLocator; + +import org.bluray.ti.PlayItem; +import org.bluray.ti.PlayItemImpl; +import org.bluray.ti.PlayList; +import org.bluray.ti.PlayListImpl; +import org.bluray.ti.TitleImpl; public final class SIElementFilter extends ServiceFilter { public SIElementFilter(SIElement element) throws FilterNotSupportedException { + if (element == null) { + System.err.println("null element"); + throw new NullPointerException(); + } + + try { + new BDLocator(element.getLocator().toExternalForm()); + } catch (Exception e) { + System.err.println("Invalid SI element: " + e + " at " + org.videolan.Logger.dumpStack(e)); + throw new FilterNotSupportedException(); + } + this.element = element; } @@ -36,10 +54,56 @@ } public boolean accept(Service service) { + + if (service == null) { + System.err.println("null service"); + throw new NullPointerException(); + } + + if (!(service instanceof TitleImpl)) + return false; + TitleImpl title = (TitleImpl)service; + + if (element instanceof PlayListImpl) { + int id = ((PlayListImpl)element).getId(); + PlayList[] pls = title.getPlayLists(); + for (int i = 0; i < pls.length; i++) { + if (id == pls[i].getId()) { + return true; + } + } + return false; + + } else if (element instanceof PlayItemImpl) { + + int piId = ((PlayItemImpl)element).getPlayItemId(); + int plId = ((PlayItemImpl)element).getPlayListId(); + + PlayList[] pls = title.getPlayLists(); + for (int i = 0; i < pls.length; i++) { + if (plId == pls[i].getId()) { + + PlayItem pis[] = pls[i].getPlayItems(); + for (int j = 0; j < pis.length; j++) { + if (piId == ((PlayItemImpl)pis[j]).getPlayItemId()) { + return true; + } + } + } + } + return false; + + } else if (element instanceof ServiceDetails) { + return element.getLocator() == service.getLocator(); + } + + System.err.println("Unsupported SI element"); + return false; + /* SIRequestorImpl requestor = new SIRequestorImpl(); - + SIRequest req = service.retrieveDetails(requestor); - + // TODO: This may be a bit excessive int timeout = 0; while (!requestor.getResponse() && timeout < 1000) { @@ -48,27 +112,28 @@ } catch (InterruptedException e) { // ignore } - + timeout++; } - + // if we still don't have a response just cancel the request if (!requestor.getResponse()) { if (req != null) req.cancel(); } - + if (requestor.getResult() == null) return false; - + SIRetrievable[] rets = requestor.getResult(); for (int i = 0; i < rets.length; i++) { if (rets[i].equals(element)) return true; } - + return false; + */ } - + SIElement element; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/SortNotAvailableException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/SortNotAvailableException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/SortNotAvailableException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/SortNotAvailableException.java 2017-06-23 13:34:50.000000000 +0000 @@ -23,9 +23,12 @@ public class SortNotAvailableException extends SIException { - public SortNotAvailableException() { } + public SortNotAvailableException() { + } + + public SortNotAvailableException(String reason) { + super(reason); + } - public SortNotAvailableException(String reason) { } - private static final long serialVersionUID = 5524379730037808067L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/StreamType.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/StreamType.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/navigation/StreamType.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/navigation/StreamType.java 2017-06-23 13:34:51.000000000 +0000 @@ -20,13 +20,13 @@ package javax.tv.service.navigation; public class StreamType { - protected StreamType(String name) - { + protected StreamType(String name) { + if (name == null) + throw new NullPointerException(); this.name = name; } - public String toString() - { + public String toString() { return name; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/ReadPermission.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/ReadPermission.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/ReadPermission.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/ReadPermission.java 2017-06-23 13:34:50.000000000 +0000 @@ -24,54 +24,54 @@ import java.io.Serializable; public final class ReadPermission extends Permission implements Serializable { - public ReadPermission(Locator locator) - { - super(locator.toExternalForm()); - - this.locator = locator.toExternalForm(); + public ReadPermission(Locator locator) { + super(locator == null ? "*" : locator.toExternalForm()); + + if (locator == null) + this.locator = "*"; + else + this.locator = locator.toExternalForm(); } - public ReadPermission(String locator, String actions) - { - super(null); - + public ReadPermission(String locator, String actions) { + super(locator == null ? "*" : locator); + + if (locator == null) + throw new NullPointerException(); + this.locator = locator; } - public boolean implies(Permission perm) - { - return (perm instanceof ReadPermission) && (this.equals(perm) || this.equals("*")); + public boolean implies(Permission perm) { + if (perm == null) + throw new NullPointerException(); + if (!(perm instanceof ReadPermission)) + return false; + + ReadPermission other = (ReadPermission)perm; + return locator.equals(other.locator) || locator.equals("*"); } - public boolean equals(Object obj) - { - if (obj == null) - return false; + public boolean equals(Object obj) { if (this == obj) return true; - if (getClass() != obj.getClass()) + if (!(obj instanceof ReadPermission)) return false; + ReadPermission other = (ReadPermission) obj; - if (locator == null) { - if (other.locator != null) - return false; - } else if (!locator.equals(other.locator)) - return false; - return true; + return locator.equals(other.locator); } - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = prime + ((locator == null) ? 0 : locator.hashCode()); return result; } - public String getActions() - { + public String getActions() { return ""; } - + private String locator; private static final long serialVersionUID = 3887436671296398427L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/AlternativeContentEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/AlternativeContentEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/AlternativeContentEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/AlternativeContentEvent.java 2017-06-23 13:34:52.000000000 +0000 @@ -20,10 +20,9 @@ package javax.tv.service.selection; public class AlternativeContentEvent extends PresentationChangedEvent { - public AlternativeContentEvent(ServiceContext context) - { + public AlternativeContentEvent(ServiceContext context) { super(context); } - + private static final long serialVersionUID = -4788942169012231066L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/InsufficientResourcesException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/InsufficientResourcesException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/InsufficientResourcesException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/InsufficientResourcesException.java 2017-06-23 13:34:52.000000000 +0000 @@ -20,15 +20,13 @@ package javax.tv.service.selection; public class InsufficientResourcesException extends ServiceContextException { - public InsufficientResourcesException() - { + public InsufficientResourcesException() { super(); } - public InsufficientResourcesException(String reason) - { + public InsufficientResourcesException(String reason) { super(reason); } - + private static final long serialVersionUID = 4013749854109414180L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/InvalidServiceComponentException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/InvalidServiceComponentException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/InvalidServiceComponentException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/InvalidServiceComponentException.java 2017-06-23 13:34:52.000000000 +0000 @@ -22,22 +22,19 @@ import javax.tv.locator.Locator; public class InvalidServiceComponentException extends ServiceContextException { - public InvalidServiceComponentException(Locator locator) - { + public InvalidServiceComponentException(Locator locator) { super(); this.locator = locator; } - public InvalidServiceComponentException(Locator locator, String reason) - { + public InvalidServiceComponentException(Locator locator, String reason) { super(reason); this.locator = locator; } - public Locator getInvalidServiceComponent() - { + public Locator getInvalidServiceComponent() { return locator; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/NormalContentEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/NormalContentEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/NormalContentEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/NormalContentEvent.java 2017-06-23 13:34:52.000000000 +0000 @@ -21,9 +21,9 @@ public class NormalContentEvent extends PresentationChangedEvent { - public NormalContentEvent(ServiceContext context) { + public NormalContentEvent(ServiceContext context) { super(context); } - + private static final long serialVersionUID = 1246777807760132155L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/PresentationChangedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/PresentationChangedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/PresentationChangedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/PresentationChangedEvent.java 2017-06-23 13:34:52.000000000 +0000 @@ -21,9 +21,9 @@ public class PresentationChangedEvent extends ServiceContextEvent { - public PresentationChangedEvent(ServiceContext context) { + public PresentationChangedEvent(ServiceContext context) { super(context); } - + private static final long serialVersionUID = 4514300927949211901L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/PresentationTerminatedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/PresentationTerminatedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/PresentationTerminatedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/PresentationTerminatedEvent.java 2017-06-23 13:34:52.000000000 +0000 @@ -20,17 +20,20 @@ package javax.tv.service.selection; public class PresentationTerminatedEvent extends ServiceContextEvent { - public PresentationTerminatedEvent(ServiceContext context, int reason) - { + public PresentationTerminatedEvent(ServiceContext context, int reason) { super(context); this.reason = reason; } - public int getReason() - { + public int getReason() { return reason; } + public String toString() { + return getClass().getName() + "[source=" + source + ",reason=" + reason + "]"; + } + + private final int reason; public static final int SERVICE_VANISHED = 1; public static final int TUNED_AWAY = 2; @@ -39,6 +42,5 @@ public static final int USER_STOP = 5; public static final int OTHER = 255; - private int reason; private static final long serialVersionUID = 4787886890628229164L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/SelectionFailedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/SelectionFailedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/SelectionFailedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/SelectionFailedEvent.java 2017-06-23 13:34:52.000000000 +0000 @@ -20,18 +20,22 @@ package javax.tv.service.selection; public class SelectionFailedEvent extends ServiceContextEvent { - public SelectionFailedEvent(ServiceContext context, int reason) - { + public SelectionFailedEvent(ServiceContext context, int reason) { super(context); this.reason = reason; } - public int getReason() - { + public int getReason() { return reason; } + public String toString() { + return getClass().getName() + "[source=" + source + ",reason=" + reason + "]"; + } + + private final int reason; + public static final int INTERRUPTED = 1; public static final int CA_REFUSAL = 2; public static final int CONTENT_NOT_FOUND = 3; @@ -40,6 +44,5 @@ public static final int INSUFFICIENT_RESOURCES = 6; public static final int OTHER = 255; - private int reason; private static final long serialVersionUID = 3991728273494160910L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/SelectPermission.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/SelectPermission.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/SelectPermission.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/SelectPermission.java 2017-06-23 13:34:52.000000000 +0000 @@ -24,67 +24,54 @@ import java.io.Serializable; public final class SelectPermission extends Permission implements Serializable { - public SelectPermission(Locator locator, String actions) - { - super(locator.toExternalForm()); + public SelectPermission(Locator locator, String actions) { + super(locator == null ? "*" : locator.toExternalForm()); - if (!actions.equals("own") && !actions.equals("*")) - throw new IllegalArgumentException(); + if (actions == null) + throw new NullPointerException(); - this.locator = locator.toExternalForm(); + this.locator = locator == null ? "*" : locator.toExternalForm(); this.actions = actions; } - public SelectPermission(String locator, String actions) - { - super(locator); + public SelectPermission(String locator, String actions) { + super(locator == null ? "*" : locator); - if (!actions.equals("own") && !actions.equals("*")) - throw new IllegalArgumentException(); + if (actions == null) + throw new NullPointerException(); - this.locator = locator; + this.locator = locator == null ? "*" : locator; this.actions = actions; } - public boolean implies(Permission perm) - { + public boolean implies(Permission perm) { if (!(perm instanceof SelectPermission)) return false; - if (!perm.getActions().equals(actions) && !actions.equals("*")) - return false; SelectPermission sperm = (SelectPermission) perm; + if (!sperm.actions.equals(actions) && !actions.equals("*")) + return false; + if (!sperm.locator.equals(locator) && !locator.equals("*")) return false; return true; } - public boolean equals(Object obj) - { - if (obj == null) - return false; - if (this == obj) - return true; - if (getClass() != obj.getClass()) + public boolean equals(Object obj) { + if (!(obj instanceof SelectPermission)) return false; + SelectPermission other = (SelectPermission) obj; - if (actions == null) { - if (other.actions != null) - return false; - } else if (!actions.equals(other.actions)) - return false; - if (locator == null) { - if (other.locator != null) - return false; - } else if (!locator.equals(other.locator)) + if (!actions.equals(other.actions)) + return false; + if (!locator.equals(other.locator)) return false; return true; } - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = 1; result = prime * result + ((actions == null) ? 0 : actions.hashCode()); @@ -92,8 +79,7 @@ return result; } - public String getActions() - { + public String getActions() { return actions; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextDestroyedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextDestroyedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextDestroyedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextDestroyedEvent.java 2017-06-23 13:34:52.000000000 +0000 @@ -20,10 +20,9 @@ package javax.tv.service.selection; public class ServiceContextDestroyedEvent extends ServiceContextEvent { - public ServiceContextDestroyedEvent(ServiceContext context) - { + public ServiceContextDestroyedEvent(ServiceContext context) { super(context); } - + private static final long serialVersionUID = -5793301376652925098L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextEvent.java 2017-06-23 13:34:52.000000000 +0000 @@ -23,13 +23,16 @@ public class ServiceContextEvent extends EventObject { - public ServiceContextEvent(ServiceContext context) { + public ServiceContextEvent(ServiceContext context) { super(context); + this.context = context; } public ServiceContext getServiceContext() { - return (ServiceContext)source; + return context; } - + + protected ServiceContext context; + private static final long serialVersionUID = -1865592897966055645L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextException.java 2017-06-23 13:34:52.000000000 +0000 @@ -20,13 +20,11 @@ package javax.tv.service.selection; public class ServiceContextException extends Exception { - public ServiceContextException() - { + public ServiceContextException() { super(); } - public ServiceContextException(String reason) - { + public ServiceContextException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextFactoryImpl.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextFactoryImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextFactoryImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextFactoryImpl.java 2017-06-23 13:34:52.000000000 +0000 @@ -24,21 +24,26 @@ import org.bluray.ti.selection.TitleContextImpl; public class ServiceContextFactoryImpl extends ServiceContextFactory { - protected ServiceContextFactoryImpl() { - serviceContexts = new ServiceContext[1]; - serviceContexts[0] = new TitleContextImpl(); - } + + private static final Object instanceLock = new Object(); public static ServiceContextFactory getInstance() { - synchronized (ServiceContextFactoryImpl.class) { + synchronized (instanceLock) { if (instance == null) instance = new ServiceContextFactoryImpl(); + return instance; } - return instance; } public static void shutdown() { - instance = null; + synchronized (instanceLock) { + instance = null; + } + } + + protected ServiceContextFactoryImpl() { + serviceContexts = new ServiceContext[1]; + serviceContexts[0] = new TitleContextImpl(); } public ServiceContext createServiceContext() @@ -60,10 +65,19 @@ } public ServiceContext[] getServiceContexts() { - SecurityManager sec = System.getSecurityManager(); - if (sec != null) - sec.checkPermission(new ServiceContextPermission("access", "own")); - return serviceContexts; + try { + SecurityManager sec = System.getSecurityManager(); + if (sec != null) + sec.checkPermission(new ServiceContextPermission("access", "own")); + + ServiceContext[] r = new ServiceContext[1]; + r[0] = serviceContexts[0]; + return r; + + } catch (Exception e) { + } + + return new ServiceContext[0]; } private ServiceContext[] serviceContexts; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextPermission.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextPermission.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextPermission.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/selection/ServiceContextPermission.java 2017-06-23 13:34:52.000000000 +0000 @@ -23,53 +23,44 @@ import java.security.BasicPermission; public final class ServiceContextPermission extends BasicPermission { - public ServiceContextPermission(String name, String actions) - { + public ServiceContextPermission(String name, String actions) { super(name); + if (name == null || actions == null) + throw new NullPointerException(); + this.name = name; this.actions = actions; } - public boolean implies(Permission perm) - { + public boolean implies(Permission perm) { + if (perm == null) + throw new NullPointerException(); if (!(perm instanceof ServiceContextPermission)) return false; - if (!perm.getActions().equals(actions) && !actions.equals("*")) - return false; ServiceContextPermission scperm = (ServiceContextPermission) perm; + if (!scperm.actions.equals(actions) && !actions.equals("*")) + return false; if (!scperm.name.equals(name) && !name.equals("*")) return false; return true; } - public boolean equals(Object obj) - { - if (this == obj) - return true; - if (!super.equals(obj)) - return false; - if (getClass() != obj.getClass()) + public boolean equals(Object obj) { + if (!(obj instanceof ServiceContextPermission)) return false; ServiceContextPermission other = (ServiceContextPermission) obj; - if (actions == null) { - if (other.actions != null) - return false; - } else if (!actions.equals(other.actions)) - return false; - if (name == null) { - if (other.name != null) - return false; - } else if (!name.equals(other.name)) + if (!actions.equals(other.actions)) + return false; + if (!name.equals(other.name)) return false; return true; } - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((actions == null) ? 0 : actions.hashCode()); @@ -77,8 +68,7 @@ return result; } - public String getActions() - { + public String getActions() { return actions; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/ServiceInformationType.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/ServiceInformationType.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/ServiceInformationType.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/ServiceInformationType.java 2017-06-23 13:34:50.000000000 +0000 @@ -21,13 +21,13 @@ public class ServiceInformationType { - protected ServiceInformationType(String name) - { + protected ServiceInformationType(String name) { + if (name == null) + throw new NullPointerException(); this.name = name; } - public String toString() - { + public String toString() { return name; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/Service.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/Service.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/Service.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/Service.java 2017-06-23 13:34:50.000000000 +0000 @@ -21,9 +21,8 @@ import javax.tv.locator.Locator; +public interface Service { -public interface Service -{ public SIRequest retrieveDetails(SIRequestor requestor); public String getName(); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/ServiceMinorNumber.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/ServiceMinorNumber.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/ServiceMinorNumber.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/ServiceMinorNumber.java 2017-06-23 13:34:50.000000000 +0000 @@ -19,7 +19,6 @@ package javax.tv.service; -public interface ServiceMinorNumber extends ServiceNumber -{ +public interface ServiceMinorNumber extends ServiceNumber { public int getMinorNumber(); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/ServiceNumber.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/ServiceNumber.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/ServiceNumber.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/ServiceNumber.java 2017-06-23 13:34:50.000000000 +0000 @@ -19,7 +19,6 @@ package javax.tv.service; -public interface ServiceNumber -{ +public interface ServiceNumber { public int getServiceNumber(); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/ServiceType.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/ServiceType.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/ServiceType.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/ServiceType.java 2017-06-23 13:34:50.000000000 +0000 @@ -19,16 +19,17 @@ package javax.tv.service; -public class ServiceType -{ - protected ServiceType(String name) { +public class ServiceType { + protected ServiceType(String name) { + if (name == null) + throw new NullPointerException(); this.name = name; } public String toString() { return name; } - + public static final ServiceType DIGITAL_TV = new ServiceType("DIGITAL_TV"); public static final ServiceType DIGITAL_RADIO = new ServiceType("DIGITAL_RADIO"); public static final ServiceType NVOD_REFERENCE = new ServiceType("NVOD_REFERENCE"); @@ -38,6 +39,6 @@ public static final ServiceType DATA_BROADCAST = new ServiceType("DATA_BROADCAST"); public static final ServiceType DATA_APPLICATION = new ServiceType("DATA_APPLICATION"); public static final ServiceType UNKNOWN = new ServiceType("UNKNOWN"); - + private String name; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIChangeEvent.java 2017-06-23 13:34:52.000000000 +0000 @@ -22,25 +22,33 @@ import java.util.EventObject; public abstract class SIChangeEvent extends EventObject { - public SIChangeEvent(Object source, SIChangeType type, SIElement element) - { + public SIChangeEvent(Object source, SIChangeType type, SIElement element) { super(source); - + + this.source = source; this.type = type; this.element = element; } - public SIChangeType getChangeType() - { + public SIChangeType getChangeType() { return type; } - - public SIElement getSIElement() - { + + public SIElement getSIElement() { return element; - } - - private SIChangeType type; - private SIElement element; + } + + public Object getSource() { + return source; + } + + public String toString() { + return getClass().getName() + "[source=" + source + ",type=" + type + ",element=" + element + "]"; + } + + private final Object source; + private final SIChangeType type; + private final SIElement element; + private static final long serialVersionUID = -2585934355425778816L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIChangeListener.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIChangeListener.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIChangeListener.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIChangeListener.java 2017-06-23 13:34:50.000000000 +0000 @@ -21,7 +21,5 @@ import java.util.EventListener; -public interface SIChangeListener extends EventListener -{ - +public interface SIChangeListener extends EventListener { } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIChangeType.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIChangeType.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIChangeType.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIChangeType.java 2017-06-23 13:34:50.000000000 +0000 @@ -19,23 +19,21 @@ package javax.tv.service; -import java.io.Serializable; +public class SIChangeType { -public class SIChangeType implements Serializable -{ public static final SIChangeType ADD = new SIChangeType("ADD"); public static final SIChangeType REMOVE = new SIChangeType("REMOVE"); public static final SIChangeType MODIFY = new SIChangeType("MODIFY"); - protected SIChangeType(String name) { + protected SIChangeType(String name) { this.name = name; + if (name == null) + throw new NullPointerException(); } public String toString() { return name; } - - protected String name; - private static final long serialVersionUID = 1L; + protected String name; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIElement.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIElement.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIElement.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIElement.java 2017-06-23 13:34:53.000000000 +0000 @@ -21,12 +21,12 @@ import javax.tv.locator.Locator; -public interface SIElement extends SIRetrievable -{ +public interface SIElement extends SIRetrievable { + public Locator getLocator(); public boolean equals(Object obj); - + public int hashCode(); public ServiceInformationType getServiceInformationType(); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIException.java 2017-06-23 13:34:50.000000000 +0000 @@ -20,15 +20,13 @@ package javax.tv.service; public class SIException extends Exception { - public SIException() - { + public SIException() { super(); } - public SIException(String reason) - { + public SIException(String reason) { super(reason); } - + private static final long serialVersionUID = 37140385594509973L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIManagerImpl.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIManagerImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIManagerImpl.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIManagerImpl.java 2017-06-23 13:34:53.000000000 +0000 @@ -29,12 +29,16 @@ import javax.tv.service.transport.Transport; import javax.tv.service.transport.TransportImpl; +import org.bluray.net.BDLocator; import org.bluray.ti.TitleImpl; import org.videolan.Libbluray; public class SIManagerImpl extends SIManager { + + private static final Object instanceLock = new Object(); + public static SIManager createInstance() { - synchronized (SIManagerImpl.class) { + synchronized (instanceLock) { if (instance == null) instance = new SIManagerImpl(); return instance; @@ -42,7 +46,7 @@ } public static void shutdown() { - synchronized (SIManagerImpl.class) { + synchronized (instanceLock) { instance = null; } } @@ -82,6 +86,13 @@ } public Service getService(Locator locator) throws InvalidLocatorException, SecurityException { + try { + new BDLocator(locator.toExternalForm()); + } catch (org.davic.net.InvalidLocatorException e) { + System.err.println("invalid locator: " + locator.toExternalForm() + "\n" + org.videolan.Logger.dumpStack(e)); + throw new javax.tv.locator.InvalidLocatorException(locator); + } + return titles.findService(locator); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIRequestFailureType.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIRequestFailureType.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIRequestFailureType.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIRequestFailureType.java 2017-06-23 13:34:51.000000000 +0000 @@ -20,13 +20,13 @@ package javax.tv.service; public class SIRequestFailureType { - protected SIRequestFailureType(String name) - { + protected SIRequestFailureType(String name) { + if (name == null) + throw new NullPointerException(); this.name = name; } - public String toString() - { + public String toString() { return name; } @@ -38,5 +38,6 @@ "DATA_UNAVAILABLE"); public static final SIRequestFailureType UNKNOWN = new SIRequestFailureType( "UNKNOWN"); + private String name; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIRequestorImpl.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIRequestorImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIRequestorImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIRequestorImpl.java 2017-06-23 13:34:52.000000000 +0000 @@ -20,30 +20,25 @@ package javax.tv.service; public class SIRequestorImpl implements SIRequestor { - public void notifyFailure(SIRequestFailureType reason) - { + public void notifyFailure(SIRequestFailureType reason) { this.response = true; this.reason = reason; } - public void notifySuccess(SIRetrievable[] result) - { + public void notifySuccess(SIRetrievable[] result) { this.response = true; this.result = result; } - public boolean getResponse() - { + public boolean getResponse() { return response; } - public SIRetrievable[] getResult() - { + public SIRetrievable[] getResult() { return result; } - public SIRequestFailureType getReason() - { + public SIRequestFailureType getReason() { return reason; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIRequestor.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIRequestor.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/SIRequestor.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/SIRequestor.java 2017-06-23 13:34:50.000000000 +0000 @@ -19,8 +19,8 @@ package javax.tv.service; -public interface SIRequestor -{ +public interface SIRequestor { + public void notifySuccess(SIRetrievable[] result); public void notifyFailure(SIRequestFailureType reason); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/transport/BouquetChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/transport/BouquetChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/transport/BouquetChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/transport/BouquetChangeEvent.java 2017-06-23 13:34:51.000000000 +0000 @@ -23,20 +23,17 @@ public class BouquetChangeEvent extends TransportSIChangeEvent { public BouquetChangeEvent(BouquetCollection collection, SIChangeType type, - Bouquet bouquet) - { + Bouquet bouquet) { super(collection, type, bouquet); this.collection = collection; this.bouquet = bouquet; } - public BouquetCollection getBouquetCollection() - { + public BouquetCollection getBouquetCollection() { return collection; } - public Bouquet getBouquet() - { + public Bouquet getBouquet() { return bouquet; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/transport/NetworkChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/transport/NetworkChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/transport/NetworkChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/transport/NetworkChangeEvent.java 2017-06-23 13:34:51.000000000 +0000 @@ -23,20 +23,17 @@ public class NetworkChangeEvent extends TransportSIChangeEvent { public NetworkChangeEvent(NetworkCollection collection, SIChangeType type, - Network network) - { + Network network) { super(collection, type, network); this.collection = collection; this.network = network; } - public NetworkCollection getNetworkCollection() - { + public NetworkCollection getNetworkCollection() { return collection; } - public Network getNetwork() - { + public Network getNetwork() { return network; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/transport/ServiceDetailsChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/transport/ServiceDetailsChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/transport/ServiceDetailsChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/transport/ServiceDetailsChangeEvent.java 2017-06-23 13:34:52.000000000 +0000 @@ -24,14 +24,12 @@ public class ServiceDetailsChangeEvent extends TransportSIChangeEvent { public ServiceDetailsChangeEvent(Transport transport, SIChangeType type, - ServiceDetails details) - { + ServiceDetails details) { super(transport, type, details); this.details = details; } - public ServiceDetails getServiceDetails() - { + public ServiceDetails getServiceDetails() { return details; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/transport/TransportSIChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/transport/TransportSIChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/transport/TransportSIChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/transport/TransportSIChangeEvent.java 2017-06-23 13:34:52.000000000 +0000 @@ -23,14 +23,12 @@ public abstract class TransportSIChangeEvent extends SIChangeEvent { public TransportSIChangeEvent(Transport transport, SIChangeType type, - SIElement element) - { + SIElement element) { super(transport, type, element); this.transport = transport; } - public Transport getTransport() - { + public Transport getTransport() { return transport; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/transport/TransportStreamChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/transport/TransportStreamChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/service/transport/TransportStreamChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/service/transport/TransportStreamChangeEvent.java 2017-06-23 13:34:52.000000000 +0000 @@ -23,20 +23,17 @@ public class TransportStreamChangeEvent extends TransportSIChangeEvent { public TransportStreamChangeEvent(TransportStreamCollection collection, - SIChangeType type, TransportStream stream) - { + SIChangeType type, TransportStream stream) { super(collection, type, stream); this.collection = collection; this.stream = stream; } - public TransportStreamCollection getTransportStreamCollection() - { + public TransportStreamCollection getTransportStreamCollection() { return collection; } - public TransportStream getTransportStream() - { + public TransportStream getTransportStream() { return stream; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/util/TVTimer.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/util/TVTimer.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/util/TVTimer.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/util/TVTimer.java 2017-06-23 13:34:53.000000000 +0000 @@ -0,0 +1,39 @@ +/* + * This file is part of libbluray + * Copyright (C) 2016 VideoLAN + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package javax.tv.util; + +import org.videolan.Logger; + +public abstract class TVTimer +{ + public static TVTimer getTimer() { + Logger.unimplemented(TVTimer.class.getName(), "getTimer"); + return null; + } + + public abstract TVTimerSpec scheduleTimerSpec(TVTimerSpec paramTVTimerSpec) + throws TVTimerScheduleFailedException; + + public abstract long getGranularity(); + + public abstract long getMinRepeatInterval(); + + public abstract void deschedule(TVTimerSpec paramTVTimerSpec); +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/util/TVTimerScheduleFailedException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/util/TVTimerScheduleFailedException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/util/TVTimerScheduleFailedException.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/util/TVTimerScheduleFailedException.java 2017-06-23 13:34:53.000000000 +0000 @@ -0,0 +1,30 @@ +/* + * This file is part of libbluray + * Copyright (C) 2016 VideoLAN + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package javax.tv.util; + +public class TVTimerScheduleFailedException extends Exception +{ + public TVTimerScheduleFailedException() { + } + + public TVTimerScheduleFailedException(String param) { + super(param); + } +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/util/TVTimerSpec.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/util/TVTimerSpec.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/util/TVTimerSpec.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/util/TVTimerSpec.java 2017-06-23 13:34:53.000000000 +0000 @@ -0,0 +1,104 @@ +/* + * This file is part of libbluray + * Copyright (C) 2016 VideoLAN + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package javax.tv.util; + +import java.util.Enumeration; +import java.util.Vector; + +import org.videolan.Logger; + +public class TVTimerSpec +{ + private boolean absolute; + private boolean regular; + private boolean repeat; + private long time; + + public TVTimerSpec() { + absolute = true; + repeat = false; + regular = true; + time = 0L; + } + + public long getTime() { + return time; + } + + public boolean isAbsolute() { + return absolute; + } + + public boolean isRegular() { + return regular; + } + + public boolean isRepeat() { + return repeat; + } + + public void addTVTimerWentOffListener(TVTimerWentOffListener l) { + Logger.unimplemented(TVTimer.class.getName(), "addTVTimerWentOffListener"); + } + + public void removeTVTimerWentOffListener(TVTimerWentOffListener l) { + Logger.unimplemented(TVTimer.class.getName(), "removeTVTimerWentOffListener"); + } + + public void notifyListeners(TVTimer source) { + Logger.unimplemented(TVTimer.class.getName(), "notifyListeners"); + } + + public void setAbsolute(boolean absolute) { + this.absolute = absolute; + } + + public void setAbsoluteTime(long when) { + if (when < 0L) { + throw new IllegalArgumentException(); + } + setAbsolute(true); + setTime(when); + setRepeat(false); + } + + public void setDelayTime(long delay) { + if (delay < 0L) { + throw new IllegalArgumentException(); + } + setAbsolute(false); + setTime(delay); + setRepeat(false); + } + + public void setRegular(boolean regular) { + this.regular = regular; + } + + public void setRepeat(boolean repeat) { + this.repeat = repeat; + } + + public void setTime(long time) { + if (time < 0L) + throw new IllegalArgumentException(); + this.time = time; + } +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/util/TVTimerWentOffEvent.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/util/TVTimerWentOffEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/util/TVTimerWentOffEvent.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/util/TVTimerWentOffEvent.java 2017-06-23 13:34:53.000000000 +0000 @@ -0,0 +1,36 @@ +/* + * This file is part of libbluray + * Copyright (C) 2016 VideoLAN + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package javax.tv.util; + +import java.util.EventObject; + +public class TVTimerWentOffEvent extends EventObject +{ + public TVTimerWentOffEvent(TVTimer source, TVTimerSpec spec) { + super(source); + this.spec = spec; + } + + public TVTimerSpec getTimerSpec() { + return spec; + } + + private TVTimerSpec spec = null; +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/util/TVTimerWentOffListener.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/util/TVTimerWentOffListener.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/util/TVTimerWentOffListener.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/util/TVTimerWentOffListener.java 2017-06-23 13:34:53.000000000 +0000 @@ -0,0 +1,25 @@ +/* + * This file is part of libbluray + * Copyright (C) 2016 VideoLAN + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package javax.tv.util; + +public abstract interface TVTimerWentOffListener +{ + public abstract void timerWentOff(TVTimerWentOffEvent paramTVTimerWentOffEvent); +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/xlet/XletContext.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/xlet/XletContext.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/xlet/XletContext.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/xlet/XletContext.java 2017-06-23 13:34:54.000000000 +0000 @@ -28,6 +28,6 @@ public Object getXletProperty(String key); public void resumeRequest(); - + public static final String ARGS = "javax.tv.xlet.args"; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/xlet/Xlet.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/xlet/Xlet.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/xlet/Xlet.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/xlet/Xlet.java 2017-06-23 13:34:54.000000000 +0000 @@ -22,7 +22,7 @@ public interface Xlet { public void initXlet(XletContext context) throws XletStateChangeException; - + public void destroyXlet(boolean force) throws XletStateChangeException; public void startXlet() throws XletStateChangeException; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/xlet/XletStateChangeException.java libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/xlet/XletStateChangeException.java --- libbluray-0.8.1/src/libbluray/bdj/java/javax/tv/xlet/XletStateChangeException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/javax/tv/xlet/XletStateChangeException.java 2017-06-23 13:34:54.000000000 +0000 @@ -21,13 +21,12 @@ public class XletStateChangeException extends Exception { - private static final long serialVersionUID = 6559278303854606991L; - - public XletStateChangeException() - { + public XletStateChangeException() { } - public XletStateChangeException(String s) - { + public XletStateChangeException(String s) { + super(s); } + + private static final long serialVersionUID = 6559278303854606991L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/bdplus/Status.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/bdplus/Status.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/bdplus/Status.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/bdplus/Status.java 2017-06-23 13:35:10.000000000 +0000 @@ -24,17 +24,20 @@ import org.videolan.Logger; public class Status { + + private static final Object instanceLock = new Object(); + public static Status getInstance() { - synchronized (Status.class) { + synchronized (instanceLock) { if (instance == null) instance = new Status(); + return instance; } - return instance; } public static void shutdown() { Status s; - synchronized (Status.class) { + synchronized (instanceLock) { s = instance; instance = null; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/AngleChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/AngleChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/AngleChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/AngleChangeEvent.java 2017-06-23 13:35:11.000000000 +0000 @@ -22,17 +22,19 @@ import java.util.EventObject; public class AngleChangeEvent extends EventObject { - public AngleChangeEvent(AngleControl source, int angle) - { + public AngleChangeEvent(AngleControl source, int angle) { super(source); this.angle = angle; } - public int getAngle() - { + public int getAngle() { return this.angle; } - private int angle; + public String toString() { + return getClass().getName() + "[source=" + source + ",angle=" + angle + "]"; + } + + private final int angle; private static final long serialVersionUID = -2582705865081165327L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/InvalidAngleException.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/InvalidAngleException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/InvalidAngleException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/InvalidAngleException.java 2017-06-23 13:35:11.000000000 +0000 @@ -20,13 +20,11 @@ package org.bluray.media; public class InvalidAngleException extends Exception { - public InvalidAngleException() - { + public InvalidAngleException() { super(); } - public InvalidAngleException(String reason) - { + public InvalidAngleException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/InvalidPlayListException.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/InvalidPlayListException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/InvalidPlayListException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/InvalidPlayListException.java 2017-06-23 13:35:11.000000000 +0000 @@ -20,13 +20,11 @@ package org.bluray.media; public class InvalidPlayListException extends Exception { - public InvalidPlayListException() - { + public InvalidPlayListException() { super(); } - public InvalidPlayListException(String reason) - { + public InvalidPlayListException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/PanningChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/PanningChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/PanningChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/PanningChangeEvent.java 2017-06-23 13:35:11.000000000 +0000 @@ -22,25 +22,22 @@ import java.util.EventObject; public class PanningChangeEvent extends EventObject { - public PanningChangeEvent(PanningControl source, float balance, float fade) - { + public PanningChangeEvent(PanningControl source, float balance, float fade) { super(source); this.balance = balance; this.fade = fade; } - public float getFrontRear() - { + public float getFrontRear() { return fade; } - public float getLeftRight() - { + public float getLeftRight() { return balance; } - private float balance; - private float fade; + private final float balance; + private final float fade; private static final long serialVersionUID = 75180748900043421L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/PiPStatusEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/PiPStatusEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/PiPStatusEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/PiPStatusEvent.java 2017-06-23 13:35:11.000000000 +0000 @@ -23,18 +23,20 @@ import java.util.EventObject; public class PiPStatusEvent extends EventObject { - public PiPStatusEvent(boolean available, PiPControl source) - { + public PiPStatusEvent(boolean available, PiPControl source) { super(source); this.available = available; } - public boolean isPiPAvailable() - { + public boolean isPiPAvailable() { return this.available; } - private boolean available; + public String toString() { + return getClass().getName() + "[source=" + source + ",available=" + available + "]"; + } + + private final boolean available; private static final long serialVersionUID = -1233930796504204430L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/PlaybackMarkEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/PlaybackMarkEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/PlaybackMarkEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/PlaybackMarkEvent.java 2017-06-23 13:35:11.000000000 +0000 @@ -22,18 +22,20 @@ import java.util.EventObject; public class PlaybackMarkEvent extends EventObject { - public PlaybackMarkEvent(PlaybackControl source, int mark) - { + public PlaybackMarkEvent(PlaybackControl source, int mark) { super(source); this.mark = mark; } - public int getMark() - { + public int getMark() { return this.mark; } - private int mark; + public String toString() { + return getClass().getName() + "[source=" + source + ",mark=" + mark + "]"; + } + + private final int mark; private static final long serialVersionUID = -6679776995045036356L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/PlaybackPlayItemEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/PlaybackPlayItemEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/PlaybackPlayItemEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/PlaybackPlayItemEvent.java 2017-06-23 13:35:11.000000000 +0000 @@ -22,17 +22,18 @@ import java.util.EventObject; public class PlaybackPlayItemEvent extends EventObject { - public PlaybackPlayItemEvent(PlaybackControl source, int playItem) - { + public PlaybackPlayItemEvent(PlaybackControl source, int playItem) { super(source); this.playItem = playItem; } - public int getPlayItem() - { + public int getPlayItem() { return playItem; } + public String toString() { + return getClass().getName() + "[source=" + source + ",playItem=" + playItem + "]"; + } - private int playItem; + private final int playItem; private static final long serialVersionUID = -2550042660300066017L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/StreamNotAvailableException.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/StreamNotAvailableException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/StreamNotAvailableException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/StreamNotAvailableException.java 2017-06-23 13:35:11.000000000 +0000 @@ -20,13 +20,11 @@ package org.bluray.media; public class StreamNotAvailableException extends Exception { - public StreamNotAvailableException() - { + public StreamNotAvailableException() { super(); } - public StreamNotAvailableException(String reason) - { + public StreamNotAvailableException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/SubtitleStyleNotAvailableException.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/SubtitleStyleNotAvailableException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/SubtitleStyleNotAvailableException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/SubtitleStyleNotAvailableException.java 2017-06-23 13:35:11.000000000 +0000 @@ -20,13 +20,11 @@ package org.bluray.media; public class SubtitleStyleNotAvailableException extends Exception { - public SubtitleStyleNotAvailableException() - { + public SubtitleStyleNotAvailableException() { super(); } - public SubtitleStyleNotAvailableException(String reason) - { + public SubtitleStyleNotAvailableException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/TextSubtitleNotAvailableException.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/TextSubtitleNotAvailableException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/TextSubtitleNotAvailableException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/TextSubtitleNotAvailableException.java 2017-06-23 13:35:11.000000000 +0000 @@ -20,13 +20,11 @@ package org.bluray.media; public class TextSubtitleNotAvailableException extends Exception { - public TextSubtitleNotAvailableException() - { + public TextSubtitleNotAvailableException() { super(); } - public TextSubtitleNotAvailableException(String reason) - { + public TextSubtitleNotAvailableException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/UOMaskedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/UOMaskedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/UOMaskedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/UOMaskedEvent.java 2017-06-23 13:35:11.000000000 +0000 @@ -22,17 +22,19 @@ import java.util.EventObject; public class UOMaskedEvent extends EventObject { - public UOMaskedEvent(UOMaskTableControl source, int position) - { + public UOMaskedEvent(UOMaskTableControl source, int position) { super(source); this.position = position; } - public int getUOMaskPosition() - { + public int getUOMaskPosition() { return position; } - private int position; + public String toString() { + return getClass().getName() + "[source=" + source + ",position=" + position + "]"; + } + + private final int position; private static final long serialVersionUID = -1417936916531803863L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/UOMaskTableChangedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/UOMaskTableChangedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/media/UOMaskTableChangedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/media/UOMaskTableChangedEvent.java 2017-06-23 13:35:11.000000000 +0000 @@ -22,8 +22,7 @@ import java.util.EventObject; public class UOMaskTableChangedEvent extends EventObject { - public UOMaskTableChangedEvent(UOMaskTableControl source) - { + public UOMaskTableChangedEvent(UOMaskTableControl source) { super(source); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/net/BDLocator.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/net/BDLocator.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/net/BDLocator.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/net/BDLocator.java 2017-06-23 13:35:10.000000000 +0000 @@ -23,26 +23,108 @@ import org.davic.net.InvalidLocatorException; import org.videolan.BDJUtil; +import org.videolan.Logger; public class BDLocator extends Locator { + + /* + /* range checks + */ + + private void checkDiscId(String disc) throws InvalidLocatorException { + if (disc == null) { + return; + } + if (disc.length() == 32) { + try { + new java.math.BigInteger(disc, 16); + return; + } catch (NumberFormatException e) { + } + } + logger.error("Invalid Disc ID: " + disc); + throw new InvalidLocatorException(); + } + + private void checkTitle(int title) throws InvalidLocatorException { + if ((title >= -1) && (title <= 999)) { + return; + } + if ((title == 65534) || (title == 65535)) { + // "resume" and First Play + return; + } + logger.error("Invalid title number: " + title); + throw new InvalidLocatorException(); + } + + private void checkPlaylist(int pl) throws InvalidLocatorException { + if ((pl >= -1) && (pl <= 1999)) { + return; + } + logger.error("Invalid playlist id: " + pl); + throw new InvalidLocatorException(); + } + + private void checkPlayitem(int pi) throws InvalidLocatorException { + if ((pi >= -1) && (pi <= 998)) { + return; + } + logger.error("Invalid playitem id: " + pi); + throw new InvalidLocatorException(); + } + + private void checkMark(int mark) throws InvalidLocatorException { + if ((mark >= -1) && (mark <= 998)) { + return; + } + logger.error("Invalid playmark id: " + mark); + throw new InvalidLocatorException(); + } + + private void checkJar(int jar) throws InvalidLocatorException { + if ((jar >= -1) && (jar <= 99999)) { + return; + } + logger.error("Invalid JAR id: " + jar); + throw new InvalidLocatorException(); + } + + private void checkSound(int sound) throws InvalidLocatorException { + if ((sound >= -1) && (sound <= 127)) { + return; + } + logger.error("Invalid sound id: " + sound); + throw new InvalidLocatorException(); + } + + /* + * + */ + public BDLocator(String url) throws InvalidLocatorException { super(url); try { - if (!url.startsWith("bd://")) - throw new InvalidLocatorException(); - String str = url.substring(5); - if (!parseJar(str) && !parseSound(str) && !parsePlaylist(str)) - throw new InvalidLocatorException(); + if (!url.startsWith("bd://")) + throw new InvalidLocatorException(); + String str = url.substring(5); + if (!parseJar(str) && !parseSound(str) && !parsePlaylist(str)) + throw new InvalidLocatorException(); } catch (InvalidLocatorException e) { - System.err.println("Invalid locator: " + url); + logger.error("Invalid locator: " + url); throw e; } } public BDLocator(String disc, int titleNum, int playList) throws InvalidLocatorException { super(null); + + checkDiscId(disc); + checkTitle(titleNum); + checkPlaylist(playList); + this.disc = disc; this.titleNum = titleNum; this.playList = playList; @@ -51,8 +133,17 @@ public BDLocator(String disc, int titleNum, int jar, int sound) throws InvalidLocatorException { super(null); - if ((jar >= 0) && (sound >= 0)) + + checkDiscId(disc); + checkTitle(titleNum); + checkJar(jar); + checkSound(sound); + + if ((jar >= 0) && (sound >= 0)) { + logger.error("Invalid locator: jar ID and sound ID set"); throw new InvalidLocatorException(); + } + this.disc = disc; this.titleNum = titleNum; this.jar = jar; @@ -63,11 +154,19 @@ public BDLocator(String disc, int titleNum, int playList, int playItem, int mark, String[] componentTags) throws InvalidLocatorException { super(null); + + checkDiscId(disc); + checkTitle(titleNum); + checkPlaylist(playList); + checkPlayitem(playItem); + checkMark(mark); + this.disc = disc; this.titleNum = titleNum; this.playList = playList; this.playItem = playItem; this.mark = mark; + if (componentTags != null) { try { for (int i = 0; i < componentTags.length; i++) { @@ -82,16 +181,23 @@ secondaryVideoNum = Integer.parseInt(comp.substring(3)); else if (comp.startsWith("P:")) textStreamNum = Integer.parseInt(comp.substring(2)); - else + else { + logger.error("Invalid locator: unknown component tag in " + comp); throw new InvalidLocatorException(); + } } } catch (NumberFormatException e) { + logger.error("Invalid locator: invalid component tag found"); throw new InvalidLocatorException(); } } url = getUrl(); } + /* + * + */ + public boolean equals(Object obj) { if (obj == null) return false; @@ -201,6 +307,10 @@ return textStreamNum; } + /* + * + */ + public void setPlayListId(int id) { if ((id >= 0) && (id != playList)) { playList = id; @@ -320,6 +430,10 @@ return str; } + /* + * parsing (used in constructor) + */ + private boolean parseJar(String str) throws InvalidLocatorException { if (!str.startsWith("JAR:")) return false; @@ -358,18 +472,24 @@ String element = str.substring(begin, end); try { if (playList < 0) { - if ((end - begin) == 32) + if ((end - begin) == 32) { + checkDiscId(element); disc = element; - else if ((end - begin) <= 4) + } else if ((end - begin) <= 4) { titleNum = Integer.parseInt(element, 16); - else if (element.startsWith("PLAYLIST:")) + checkTitle(titleNum); + } else if (element.startsWith("PLAYLIST:")) { playList = Integer.parseInt(element.substring(9)); - else + checkPlaylist(playList); + } else { throw new InvalidLocatorException(); + } } else if (element.startsWith("MARK:")) { mark = Integer.parseInt(element.substring(5)); + checkMark(mark); } else if (element.startsWith("ITEM:")) { playItem = Integer.parseInt(element.substring(5)); + checkPlayitem(playItem); } else if (element.startsWith("A1:")) { primaryAudioNum = Integer.parseInt(element.substring(3)); if (primaryAudioNum < 0) @@ -396,9 +516,11 @@ throw new InvalidLocatorException(); isTag = true; } else { + logger.error("Unknown tag: " + element); throw new InvalidLocatorException(); } } catch (NumberFormatException e) { + logger.error("Parse error: " + e); throw new InvalidLocatorException(); } if (end >= length) @@ -437,4 +559,6 @@ protected int playList = -1; protected int sound = -1; protected int titleNum = -1; + + private static final Logger logger = Logger.getLogger(BDLocator.class.getName()); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/storage/StorageManager.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/storage/StorageManager.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/storage/StorageManager.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/storage/StorageManager.java 2017-06-23 13:35:09.000000000 +0000 @@ -20,11 +20,10 @@ package org.bluray.storage; public class StorageManager { + + private static final StorageManager instance = new StorageManager(); + public static StorageManager getInstance() { - synchronized (StorageManager.class) { - if (instance == null) - instance = new StorageManager(); - } return instance; } @@ -38,6 +37,4 @@ public DataAreaInfo getPersistentDataAreaInfo() { return new PersistentDataAreaInfo(); } - - private static StorageManager instance = null; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/system/RegisterAccess.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/system/RegisterAccess.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/system/RegisterAccess.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/system/RegisterAccess.java 2017-06-23 13:35:11.000000000 +0000 @@ -21,31 +21,25 @@ import org.videolan.Libbluray; public class RegisterAccess { - private RegisterAccess() - { - + private RegisterAccess() { } - - public static RegisterAccess getInstance() - { + + public static RegisterAccess getInstance() { return instance; } - - public int getGPR(int num) - { + + public int getGPR(int num) { return Libbluray.readGPR(num); } - - public int getPSR(int num) - { + + public int getPSR(int num) { return Libbluray.readPSR(num); } - - public void setGPR(int num, int value) - { + + public void setGPR(int num, int value) { Libbluray.writeGPR(num, value); } - + public static final int PSR_AUDIO_STN = 1; public static final int PSR_PG_TXTST_STN = 2; public static final int PSR_ANGLE_NR = 3; @@ -54,7 +48,7 @@ public static final int PSR_PLAYLIST_ID = 6; public static final int PSR_PLAYITEM_ID = 7; public static final int PSR_PRES_TIME = 8; - + public static final int PSR_USER_STYLE_NR = 12; public static final int PSR_PARENTAL_LVL = 13; public static final int PSR_SECONDARY_AUDIO_STN = 14; @@ -64,10 +58,10 @@ public static final int PSR_MENU_DESCR_LANG_CODE = 18; public static final int PSR_COUNTRY_CODE = 19; public static final int PSR_REGION_PLAYBACK_CODE = 20; - + public static final int PSR_VIDEO_CAPABILITY = 29; public static final int PSR_PLAYER_CAP_TXTST = 30; public static final int PSR_PLAYER_PROFILE = 31; - + private static final RegisterAccess instance = new RegisterAccess(); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/CodingType.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/CodingType.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/CodingType.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/CodingType.java 2017-06-23 13:35:10.000000000 +0000 @@ -20,13 +20,13 @@ package org.bluray.ti; public class CodingType { - protected CodingType(String name) - { + protected CodingType(String name) { this.name = name; + if (name == null) + throw new NullPointerException("name is null"); } - public String toString() - { + public String toString() { return name; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/DiscEjectedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/DiscEjectedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/DiscEjectedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/DiscEjectedEvent.java 2017-06-23 13:35:10.000000000 +0000 @@ -20,10 +20,7 @@ package org.bluray.ti; public class DiscEjectedEvent extends DiscStatusEvent { - public DiscEjectedEvent(Object source) - { + public DiscEjectedEvent(Object source) { super(source); } - - private static final long serialVersionUID = -5165934355777383590L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/DiscInsertedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/DiscInsertedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/DiscInsertedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/DiscInsertedEvent.java 2017-06-23 13:35:10.000000000 +0000 @@ -20,10 +20,7 @@ package org.bluray.ti; public class DiscInsertedEvent extends DiscStatusEvent { - public DiscInsertedEvent(Object source) - { + public DiscInsertedEvent(Object source) { super(source); } - - private static final long serialVersionUID = -474637357700362624L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/DiscManager.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/DiscManager.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/DiscManager.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/DiscManager.java 2017-06-23 13:35:10.000000000 +0000 @@ -21,11 +21,19 @@ import java.util.LinkedList; +import org.videolan.BDJListeners; + public class DiscManager { - public static synchronized DiscManager getDiscManager() { - if (instance == null) - instance = new DiscManager(); - return instance; + + private static DiscManager instance; + private static final Object instanceLock = new Object(); + + public static DiscManager getDiscManager() { + synchronized (instanceLock) { + if (instance == null) + instance = new DiscManager(); + return instance; + } } public void expectNextDisc(String[] discIds) { @@ -33,26 +41,26 @@ } public Disc getCurrentDisc() { - return disc; + return new DiscImpl(discId); } public void addDiscStatusEventListener(DiscStatusListener listener) { - synchronized(listeners) { - listeners.add(listener); - } + listeners.add(listener); } public void removeDiscStatusEventListener(DiscStatusListener listener) { - synchronized(listeners) { - listeners.remove(listener); - } + listeners.remove(listener); } + // XXX not allowed to add new public methods -- should be done in Impl class public void setCurrentDisc(String id) { - disc = new DiscImpl(id); + if (org.videolan.BDJXletContext.getCurrentContext() == null) { + discId = id; + } else { + System.err.println("Ignoring disc ID (from Xlet)"); + } } - private LinkedList listeners = new LinkedList(); - private static DiscManager instance; - private DiscImpl disc = null; + private BDJListeners listeners = new BDJListeners(); + private String discId = null; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/DiscStatusEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/DiscStatusEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/DiscStatusEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/DiscStatusEvent.java 2017-06-23 13:35:09.000000000 +0000 @@ -21,8 +21,7 @@ import java.util.EventObject; public class DiscStatusEvent extends EventObject { - public DiscStatusEvent(Object source) - { + public DiscStatusEvent(Object source) { super(source); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/PlayItemImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/PlayItemImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/PlayItemImpl.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/PlayItemImpl.java 2017-06-23 13:35:09.000000000 +0000 @@ -33,36 +33,39 @@ import org.videolan.TIClip; public class PlayItemImpl implements PlayItem { - protected PlayItemImpl(int playlistId, int playitemId, TIClip clip, Title service) - { + protected PlayItemImpl(int playlistId, int playitemId, TIClip clip, Title service) { this.playlistId = playlistId; this.playitemId = playitemId; this.clip = clip; this.service = service; } - public Locator getLocator() - { + public int getPlayItemId() { + return playitemId; + } + + public int getPlayListId() { + return playlistId; + } + + public Locator getLocator() { int title = Libbluray.getCurrentTitle(); try { - return new BDLocator("bd://" + title + ".PLAYLIST:" + playlistId + ".ITEM:" + playitemId); + return new BDLocator("bd://" + Integer.toHexString(title) + ".PLAYLIST:" + playlistId + ".ITEM:" + playitemId); } catch (InvalidLocatorException e) { return null; } } - public ServiceInformationType getServiceInformationType() - { + public ServiceInformationType getServiceInformationType() { return TitleInformationType.BD_ROM; } - public Date getUpdateTime() - { + public Date getUpdateTime() { return null; } - public ServiceComponent[] getComponents() - { + public ServiceComponent[] getComponents() { StreamInfo[] video = clip.getVideoStreams(); StreamInfo[] audio = clip.getVideoStreams(); StreamInfo[] pg = clip.getVideoStreams(); @@ -92,8 +95,8 @@ return components; } - int playlistId; - int playitemId; - TIClip clip; - Title service; + private int playlistId; + private int playitemId; + private TIClip clip; + private Title service; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/PlayListImpl.java 2017-06-23 13:35:10.000000000 +0000 @@ -31,26 +31,22 @@ import org.videolan.PlaylistInfo; public class PlayListImpl implements PlayList { - protected PlayListImpl(String filename, Title service) - { + protected PlayListImpl(String filename, Title service) { this.filename = filename; this.id = Integer.parseInt(filename); this.playlist = Libbluray.getPlaylistInfo(id); this.service = service; } - public String getFileName() - { + public String getFileName() { return filename; } - public int getId() - { + public int getId() { return id; } - public PlayItem[] getPlayItems() - { + public PlayItem[] getPlayItems() { TIClip[] clips = playlist.getClips(); PlayItem[] items = new PlayItem[clips.length]; @@ -61,8 +57,7 @@ return items; } - public Locator getLocator() - { + public Locator getLocator() { int title = Libbluray.getCurrentTitle(); try { @@ -72,18 +67,16 @@ } } - public ServiceInformationType getServiceInformationType() - { + public ServiceInformationType getServiceInformationType() { return TitleInformationType.BD_ROM; } - public Date getUpdateTime() - { + public Date getUpdateTime() { return null; } - String filename; - PlaylistInfo playlist; - int id; - Title service; + private String filename; + private PlaylistInfo playlist; + private int id; + private Title service; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/selection/TitleContextImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/selection/TitleContextImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/selection/TitleContextImpl.java 2015-04-07 19:56:47.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/selection/TitleContextImpl.java 2017-06-23 13:35:10.000000000 +0000 @@ -38,9 +38,11 @@ import org.bluray.ti.Title; import org.bluray.ti.TitleImpl; + import org.videolan.BDJLoader; import org.videolan.BDJLoaderCallback; import org.videolan.BDJListeners; +import org.videolan.Logger; import org.videolan.media.content.PlayerManager; public class TitleContextImpl implements TitleContext { @@ -71,31 +73,49 @@ } public void start(Title title, boolean restart) throws SecurityException { + logger.info("start(" + title.getName() + ", restart=" + restart + ")"); + SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(new SelectPermission(title.getLocator(), "own")); } - - if (state == STATE_DESTROYED) + if (state == STATE_DESTROYED) { + logger.error("start() failed: Title Context already destroyed"); throw new IllegalStateException(); + } + + if (!restart && (this.title == null || !title.equals(this.title))) { + /* force restarting of service bound Xlets when title changes */ + logger.info("start(): title changed, force restart"); + restart = true; + } + TitleStartAction action = new TitleStartAction(this, (TitleImpl)title); if (!BDJLoader.load((TitleImpl)title, restart, action)) action.loaderDone(false); } public void select(Service service) throws SecurityException { + logger.info("select(" + service.getName() + ")"); start((Title)service, true); } public void select(Locator[] locators) throws InvalidLocatorException, InvalidServiceComponentException, SecurityException { - org.videolan.Logger.unimplemented("TitleContextImpl", "select(Locator[])"); + if (locators.length != 1) { + Logger.unimplemented("TitleContextImpl", "select(Locator[])"); + + for (int i = 0; i < locators.length; i++) + logger.error(" [" + i + "]: " + locators[i]); + } select(SIManager.createInstance().getService(locators[0])); } public void stop() throws SecurityException { + logger.info("stop()"); + SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(new ServiceContextPermission("stop", "own")); @@ -187,4 +207,6 @@ private BDJListeners listeners = new BDJListeners(); private TitleImpl title = null; private int state = STATE_STOPPED; + + private static final Logger logger = Logger.getLogger(TitleContextImpl.class.getName()); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/TitleComponentImpl.java 2017-06-23 13:35:09.000000000 +0000 @@ -32,8 +32,7 @@ public class TitleComponentImpl implements TitleComponent { protected TitleComponentImpl(int stream_number, StreamInfo stream, StreamType type, boolean primary, - int playlistId, int playitemId, Title service) - { + int playlistId, int playitemId, Title service) { this.stream_number = stream_number; this.stream = stream; this.type = type; @@ -112,11 +111,11 @@ return stream.getSubPathId(); } - int stream_number; - StreamInfo stream; - StreamType type; - boolean primary; - int playlistId; - int playitemId; - Title service; + private int stream_number; + private StreamInfo stream; + private StreamType type; + private boolean primary; + private int playlistId; + private int playitemId; + private Title service; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/TitleImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/TitleImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/TitleImpl.java 2015-02-12 09:56:04.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/TitleImpl.java 2017-06-23 13:35:09.000000000 +0000 @@ -52,6 +52,12 @@ } public String getName() { + if (titleNum == 0) + return "Top Menu"; + if (titleNum == 65535) + return "First Playback"; + if (titleNum == 65534) + return "Suspended Title"; return "Title " + titleNum; } @@ -69,6 +75,15 @@ return TitleType.UNKNOWN; } + public boolean equals(Object obj) { + if (!(obj instanceof TitleImpl)) { + return false; + } + TitleImpl other = (TitleImpl)obj; + int otherNum = other.getTitleNum(); + return otherNum == titleNum; + } + public boolean hasMultipleInstances() { return false; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/TitleType.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/TitleType.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ti/TitleType.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ti/TitleType.java 2017-06-23 13:35:10.000000000 +0000 @@ -22,8 +22,7 @@ import javax.tv.service.ServiceType; public class TitleType extends ServiceType { - protected TitleType(String name) - { + protected TitleType(String name) { super(name); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ui/event/HRcEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ui/event/HRcEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ui/event/HRcEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ui/event/HRcEvent.java 2017-06-23 13:35:10.000000000 +0000 @@ -23,8 +23,7 @@ public abstract class HRcEvent extends org.havi.ui.event.HRcEvent { public HRcEvent(Component source, int id, long when, int modifiers, - int keyCode, char keyChar) - { + int keyCode, char keyChar) { super(source, id, when, modifiers, keyCode, keyChar); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ui/FrameAccurateAnimation.java 2017-06-23 13:35:10.000000000 +0000 @@ -28,13 +28,11 @@ public abstract class FrameAccurateAnimation extends Component { - public static final float getDefaultFrameRate() - { + public static final float getDefaultFrameRate() { return defaultRate; } - public static boolean setDefaultFrameRate(float framerate) - { + public static boolean setDefaultFrameRate(float framerate) { if (framerate != FRAME_RATE_23_976 && framerate != FRAME_RATE_24 && framerate != FRAME_RATE_25 && @@ -49,13 +47,11 @@ return true; } - public FrameAccurateAnimation() - { + public FrameAccurateAnimation() { logger.unimplemented("FrameAccurateAnimation"); } - public FrameAccurateAnimation(AnimationParameters params) - { + public FrameAccurateAnimation(AnimationParameters params) { context = BDJXletContext.getCurrentContext(); if (context != null) { context.addFAA(this); @@ -66,8 +62,7 @@ this.params = new AnimationParameters(params); } - public synchronized void destroy() - { + public synchronized void destroy() { if (context != null) { context.removeFAA(this); context = null; @@ -76,27 +71,23 @@ destroyImpl(); } - public long getCompletedFrameCount() - { + public long getCompletedFrameCount() { logger.unimplemented("getCompletedFrameCount"); return 0; } - public float getFrameRate() - { + public float getFrameRate() { logger.unimplemented("getFrameRate"); // TODO: rate of background video. if none, defaultRate. return getDefaultFrameRate(); } - public Graphics getGraphics() - { + public Graphics getGraphics() { logger.unimplemented("getGraphics"); return super.getGraphics(); } - public int[] getRepeatCounts() - { + public int[] getRepeatCounts() { int[] repeatCount = null; if (params != null && params.repeatCount != null) { repeatCount = (int[])params.repeatCount.clone(); @@ -104,41 +95,34 @@ return repeatCount; } - public int getThreadPriority() - { + public int getThreadPriority() { return params.threadPriority; } - public synchronized boolean isAnimated() - { + public synchronized boolean isAnimated() { return running; } - public void paint(Graphics g) - { + public void paint(Graphics g) { // should be implemented in derived classes logger.unimplemented("paint"); } public synchronized void resetStartStopTime( - FrameAccurateAnimationTimer newTimer) - { + FrameAccurateAnimationTimer newTimer) { params.faaTimer = new FrameAccurateAnimationTimer(newTimer); logger.unimplemented("resetStartStopTime"); } - public void setBounds(int x, int y, int width, int height) - { + public void setBounds(int x, int y, int width, int height) { super.setBounds(x, y, width, height); } - public void setLocation(int x, int y) - { + public void setLocation(int x, int y) { super.setLocation(x, y); } - public void setThreadPriority(int p) - { + public void setThreadPriority(int p) { params.threadPriority = p; } @@ -157,8 +141,7 @@ logger.unimplemented("destroyImpl"); } - public synchronized void start() - { + public synchronized void start() { if (!running) { running = true; // TODO: compare timer against video @@ -171,16 +154,14 @@ } } - public synchronized void stop() - { + public synchronized void stop() { if (running) { running = false; stopImpl(); } } - public String toString() - { + public String toString() { return "FrameAccurateAnimation"; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ui/ImageFrameAccurateAnimation.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ui/ImageFrameAccurateAnimation.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ui/ImageFrameAccurateAnimation.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ui/ImageFrameAccurateAnimation.java 2017-06-23 13:35:10.000000000 +0000 @@ -39,8 +39,8 @@ implements ImageObserver/*, java.awt.MenuContainer*/ { public static ImageFrameAccurateAnimation getInstance(Image[] images, Dimension size, AnimationParameters params, int playmode) - throws NullPointerException, IllegalArgumentException - { + throws NullPointerException, IllegalArgumentException { + if (images == null || size == null || params == null) throw new NullPointerException(); if (playmode < PLAY_REPEATING || playmode > PLAY_ONCE) @@ -75,36 +75,31 @@ } private ImageFrameAccurateAnimation(Image[] images, - Dimension size, AnimationParameters params, int playmode) - { + Dimension size, AnimationParameters params, int playmode) { + super(params); this.images = ((Image[])images.clone()); this.size = ((Dimension)size.clone()); this.playmode = playmode; } - public AnimationParameters getAnimationParameters() - { + public AnimationParameters getAnimationParameters() { return new AnimationParameters(params); } - public Image[] getImages() - { + public Image[] getImages() { return (Image[])images.clone(); } - public int getPlayMode() - { + public int getPlayMode() { return playmode; } - public int getPosition() - { + public int getPosition() { return position; } - public void prepareImages() - { + public void prepareImages() { if (prepared) { return; } @@ -130,31 +125,27 @@ prepared = true; } - public void setPlayMode(int mode) throws IllegalArgumentException - { + public void setPlayMode(int mode) throws IllegalArgumentException { if (mode < PLAY_REPEATING || mode > PLAY_ONCE) throw new IllegalArgumentException(); this.playmode = mode; } - public void setPosition(int position) - { + public void setPosition(int position) { if (position < 0 || position >= images.length) throw new IllegalArgumentException(); this.position = position; } - protected void destroyImpl() - { + protected void destroyImpl() { stopImpl(); images = null; scaledImages = null; } - protected void startImpl() - { + protected void startImpl() { if (!prepared) { prepareImages(); } @@ -164,16 +155,14 @@ } } - protected void stopImpl() - { + protected void stopImpl() { if (animation != null) { animation.stop(); animation = null; } } - public void paint(Graphics g) - { + public void paint(Graphics g) { if (images != null && images[position] != null) { if (!g.drawImage(images[position], super.getBounds().x, super.getBounds().y, this)) { logger.warning("paint(" + position + ") failed"); @@ -254,7 +243,6 @@ } } - public static final int PLAY_REPEATING = 1; public static final int PLAY_ALTERNATING = 2; public static final int PLAY_ONCE = 3; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ui/SyncFrameAccurateAnimation.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ui/SyncFrameAccurateAnimation.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/ui/SyncFrameAccurateAnimation.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/ui/SyncFrameAccurateAnimation.java 2017-06-23 13:35:11.000000000 +0000 @@ -31,8 +31,8 @@ public class SyncFrameAccurateAnimation extends FrameAccurateAnimation { public static SyncFrameAccurateAnimation getInstance(Dimension size, int numFrames, AnimationParameters params) - throws NullPointerException, IllegalArgumentException - { + throws NullPointerException, IllegalArgumentException { + if (size == null || params == null) throw new NullPointerException(); if (numFrames < 1) @@ -58,47 +58,40 @@ } private SyncFrameAccurateAnimation(Dimension size, - int numFrames, AnimationParameters params) - { + int numFrames, AnimationParameters params) { super(params); logger.unimplemented("SyncFrameAccurateAnimation"); } public boolean finishDrawing(long frameNumber) - throws IllegalArgumentException - { + throws IllegalArgumentException { logger.unimplemented("finishDrawing"); return true; } public boolean finishDrawing(long frameNumber, Rectangle[] updateArea) - throws IllegalArgumentException - { + throws IllegalArgumentException { logger.unimplemented("finishDrawing"); return true; } public Time getAnimationFrameTime(long animationFrame) - throws IllegalStateException - { + throws IllegalStateException { logger.unimplemented("getAnimationFrameTime"); return new Time(40000000); } - public void paint(Graphics graphics) - { + public void paint(Graphics graphics) { logger.unimplemented("paint"); } - public void setBounds(int x, int y, int width, int height) - { + public void setBounds(int x, int y, int width, int height) { logger.unimplemented("setBounds"); super.setBounds(x, y, width, height); } public Graphics2D startDrawing(long frameNumber) - throws IllegalArgumentException - { + throws IllegalArgumentException { logger.unimplemented("startDrawing"); return null; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/vfs/VFSManager.java libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/vfs/VFSManager.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/bluray/vfs/VFSManager.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/bluray/vfs/VFSManager.java 2017-06-23 13:35:09.000000000 +0000 @@ -27,58 +27,58 @@ public class VFSManager { private static VFSManager instance = null; + private static final Object instanceLock = new Object(); public static VFSManager getInstance() throws SecurityException, - UnsupportedOperationException - { - if (instance == null) { - instance = new VFSManager(); - } + UnsupportedOperationException { - return instance; + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkPermission(new VFSPermission("*")); + + synchronized (instanceLock) { + if (instance == null) { + instance = new VFSManager(); + } + return instance; + } } - protected VFSManager() - { + protected VFSManager() { state = STABLE; } - public boolean disableClip(String streamfile) - { + public boolean disableClip(String streamfile) { logger.unimplemented("disableClip"); return true; } - public boolean enableClip(String streamfile) - { + public boolean enableClip(String streamfile) { logger.unimplemented("enableClip"); return true; } - public String[] getDisabledClipIDs() - { + public String[] getDisabledClipIDs() { logger.unimplemented("getDisabledClipIDs"); return new String[]{}; } - public int getState() - { + public int getState() { return state; } - public boolean isEnabledClip(String clipID) - { + public boolean isEnabledClip(String clipID) { logger.unimplemented("isEnabledClip"); return true; } public void requestUpdating(String manifestfile, String signaturefile, - boolean initBackupRegs) throws PreparingFailedException - { + boolean initBackupRegs) throws PreparingFailedException { state = PREPARING; BUMFAsset[] assets = BUMFParser.parse(manifestfile); if (assets == null) { + logger.error("manifest parsing failed"); state = STABLE; throw new PreparingFailedException(); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleChangeEvent.java 2017-06-23 13:34:55.000000000 +0000 @@ -22,8 +22,8 @@ import java.io.Serializable; import java.util.EventObject; -public class AlignedSubtitleChangeEvent extends EventObject implements Serializable -{ +public class AlignedSubtitleChangeEvent extends EventObject implements Serializable { + private int subtitleAlignment; public AlignedSubtitleChangeEvent(AlignedSubtitleControl source, int subtitleAlignment) { @@ -34,4 +34,4 @@ public int getAlignedSubtitle() { return subtitleAlignment; } -} \ No newline at end of file +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleChangeListener.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleChangeListener.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleChangeListener.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleChangeListener.java 2017-06-23 13:34:55.000000000 +0000 @@ -21,7 +21,6 @@ import java.util.EventListener; -public abstract interface AlignedSubtitleChangeListener extends EventListener -{ +public abstract interface AlignedSubtitleChangeListener extends EventListener { public abstract void alignedSubtitleChange(AlignedSubtitleChangeEvent paramAlignedSubtitleChangeEvent); -} \ No newline at end of file +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleControl.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleControl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleControl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/media/AlignedSubtitleControl.java 2017-06-23 13:34:55.000000000 +0000 @@ -21,8 +21,8 @@ import javax.media.Control; -public abstract interface AlignedSubtitleControl extends Control -{ +public abstract interface AlignedSubtitleControl extends Control { + public abstract int getAlignedSubtitle(); public abstract void setAlignedSubtitle(int paramInt) @@ -35,4 +35,4 @@ public static final int NOT_ALIGNED = 0; public static final int TOP_ALIGNED = 2; public static final int BOTTOM_ALIGNED = 3; -} \ No newline at end of file +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceChangeEvent.java 2017-06-23 13:34:55.000000000 +0000 @@ -22,8 +22,8 @@ import java.io.Serializable; import java.util.EventObject; -public class GraphicsOffsetSequenceChangeEvent extends EventObject implements Serializable -{ +public class GraphicsOffsetSequenceChangeEvent extends EventObject implements Serializable { + private int sequenceId; public GraphicsOffsetSequenceChangeEvent(GraphicsOffsetSequenceControl source, int sequenceId) { @@ -34,4 +34,4 @@ public int getOffsetSequenceId() { return sequenceId; } -} \ No newline at end of file +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceChangeListener.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceChangeListener.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceChangeListener.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceChangeListener.java 2017-06-23 13:34:55.000000000 +0000 @@ -21,7 +21,6 @@ import java.util.EventListener; -public abstract interface GraphicsOffsetSequenceChangeListener extends EventListener -{ +public abstract interface GraphicsOffsetSequenceChangeListener extends EventListener { public abstract void offsetSequenceChange(GraphicsOffsetSequenceChangeEvent paramGraphicsOffsetSequenceChangeEvent); -} \ No newline at end of file +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceControl.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceControl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceControl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/media/GraphicsOffsetSequenceControl.java 2017-06-23 13:34:55.000000000 +0000 @@ -21,8 +21,8 @@ import javax.media.Control; -public abstract interface GraphicsOffsetSequenceControl extends Control -{ +public abstract interface GraphicsOffsetSequenceControl extends Control { + public abstract int getSequenceId(); public abstract void setSequenceId(int paramInt) @@ -31,4 +31,4 @@ public abstract void addOffsetSequenceChangeListener(GraphicsOffsetSequenceChangeListener paramGraphicsOffsetSequenceChangeListener); public abstract void removeOffsetSequenceChangeListener(GraphicsOffsetSequenceChangeListener paramGraphicsOffsetSequenceChangeListener); -} \ No newline at end of file +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/system/StereoscopicRegisters.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/system/StereoscopicRegisters.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/system/StereoscopicRegisters.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/system/StereoscopicRegisters.java 2017-06-23 13:34:55.000000000 +0000 @@ -19,10 +19,9 @@ package org.blurayx.s3d.system; -public abstract interface StereoscopicRegisters -{ +public abstract interface StereoscopicRegisters { public static final int PSR_OUTPUT_MODE_PREFERENCE = 21; public static final int PSR_STEREOSCOPIC_STATUS = 22; public static final int PSR_DISPLAY_CAPABILITY = 23; public static final int PSR_3D_CAPABILITY = 24; -} \ No newline at end of file +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ti/StereoscopicCodingType.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ti/StereoscopicCodingType.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ti/StereoscopicCodingType.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ti/StereoscopicCodingType.java 2017-06-23 13:34:55.000000000 +0000 @@ -24,8 +24,8 @@ import java.security.PrivilegedAction; import org.bluray.ti.CodingType; -public class StereoscopicCodingType -{ +public class StereoscopicCodingType { + public static final CodingType MPEG4_MVC_VIDEO = (CodingType)AccessController.doPrivileged(new PrivilegedAction() { public Object run() { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/DirectDrawS3D.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/DirectDrawS3D.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/DirectDrawS3D.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/DirectDrawS3D.java 2017-06-23 13:34:55.000000000 +0000 @@ -22,24 +22,21 @@ import java.awt.Image; import java.awt.Rectangle; -public class DirectDrawS3D -{ +public class DirectDrawS3D { + public void drawStereoscopic(Image leftImage, int leftX, int leftY, Rectangle[] leftUpdateAreas, Image rightImage, int rightX, int rightY, - Rectangle[] rightUpdateAreas) - { + Rectangle[] rightUpdateAreas) { } public void drawStereoscopicImages(Image[] leftImages, int[] leftXs, int[] leftYs, Rectangle[] leftUpdateAreas, Image[] rightImages, int[] rightXs, int[] rightYs, - Rectangle[] rightUpdateAreas) - { + Rectangle[] rightUpdateAreas) { } - public static DirectDrawS3D getInstance() - { + public static DirectDrawS3D getInstance() { org.videolan.Logger.unimplemented("DirectDrawS3D", "getInstance"); return null; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HBackgroundConfigTemplateS3D.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HBackgroundConfigTemplateS3D.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HBackgroundConfigTemplateS3D.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HBackgroundConfigTemplateS3D.java 2017-06-23 13:34:55.000000000 +0000 @@ -22,8 +22,8 @@ import org.havi.ui.HBackgroundConfigTemplate; import org.havi.ui.HBackgroundConfiguration; -public class HBackgroundConfigTemplateS3D extends HBackgroundConfigTemplate -{ +public class HBackgroundConfigTemplateS3D extends HBackgroundConfigTemplate { + public static final int S3D = 17; protected int getPreferenceCount() { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HBackgroundConfigurationS3D.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HBackgroundConfigurationS3D.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HBackgroundConfigurationS3D.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HBackgroundConfigurationS3D.java 2017-06-23 13:34:55.000000000 +0000 @@ -26,12 +26,12 @@ import org.havi.ui.HScreenRectangle; import org.havi.ui.HStillImageBackgroundConfiguration; -public class HBackgroundConfigurationS3D extends HStillImageBackgroundConfiguration -{ +public class HBackgroundConfigurationS3D extends HStillImageBackgroundConfiguration { + public void displayImage(HBackgroundImage leftImage, HBackgroundImage rightImage) - throws IOException, HPermissionDeniedException, HConfigurationException - { + throws IOException, HPermissionDeniedException, HConfigurationException { + displayImage(leftImage, rightImage, new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f), new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f)); @@ -40,9 +40,9 @@ public void displayImage(HBackgroundImage leftImage, HBackgroundImage rightImage, HScreenRectangle leftUpdateArea, - HScreenRectangle rightUpdateAreaparamHScreenRectangle2) - throws IOException, HPermissionDeniedException, HConfigurationException - { + HScreenRectangle rightUpdateArea) + throws IOException, HPermissionDeniedException, HConfigurationException { + displayImage(leftImage, leftUpdateArea); org.videolan.Logger.unimplemented("HBackgroundConfigurationS3D", "displayImage"); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HGraphicsConfigTemplateS3D.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HGraphicsConfigTemplateS3D.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HGraphicsConfigTemplateS3D.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HGraphicsConfigTemplateS3D.java 2017-06-23 13:34:55.000000000 +0000 @@ -21,8 +21,8 @@ import org.havi.ui.HGraphicsConfigTemplate; -public class HGraphicsConfigTemplateS3D extends HGraphicsConfigTemplate -{ +public class HGraphicsConfigTemplateS3D extends HGraphicsConfigTemplate { + public static final int S3D = 17; protected int getPreferenceCount() { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HGraphicsConfigurationS3D.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HGraphicsConfigurationS3D.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HGraphicsConfigurationS3D.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HGraphicsConfigurationS3D.java 2017-06-23 13:34:55.000000000 +0000 @@ -23,16 +23,15 @@ import org.havi.ui.HGraphicsConfiguration; import org.havi.ui.HPermissionDeniedException; -public class HGraphicsConfigurationS3D extends HGraphicsConfiguration -{ - public int getOffsetValue() - { +public class HGraphicsConfigurationS3D extends HGraphicsConfiguration { + + public int getOffsetValue() { return 0; } public void setOffsetValue(int offset) - throws HPermissionDeniedException, HConfigurationException - { + throws HPermissionDeniedException, HConfigurationException { + org.videolan.Logger.unimplemented("HGraphicsConfigurationS3D", "setOffsetValue"); } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HVideoConfigTemplateS3D.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HVideoConfigTemplateS3D.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HVideoConfigTemplateS3D.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/HVideoConfigTemplateS3D.java 2017-06-23 13:34:55.000000000 +0000 @@ -21,8 +21,8 @@ import org.bluray.ui.BDVideoConfigTemplate; -public class HVideoConfigTemplateS3D extends BDVideoConfigTemplate -{ +public class HVideoConfigTemplateS3D extends BDVideoConfigTemplate { + public static final int S3D = 17; protected int getPreferenceCount() { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/S3DProperty.java libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/S3DProperty.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/S3DProperty.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/blurayx/s3d/ui/S3DProperty.java 2017-06-23 13:34:55.000000000 +0000 @@ -19,15 +19,19 @@ package org.blurayx.s3d.ui; -public class S3DProperty -{ +public class S3DProperty { + public static final S3DProperty ONE_PLANE = new S3DProperty("ONE_PLANE"); public static final S3DProperty TWO_PLANES = new S3DProperty("TWO_PLANES"); public static final S3DProperty TWOD_OUTPUT = new S3DProperty("TWOD_OUTPUT"); - private String value; - protected S3DProperty(String value) - { - this.value = value; + private String name; + + protected S3DProperty(String name) { + this.name = name; + } + + public String toString() { + return getClass().getName() + "[" + name + "]"; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/AudioLanguageControl.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/AudioLanguageControl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/AudioLanguageControl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/AudioLanguageControl.java 2017-06-23 13:35:09.000000000 +0000 @@ -20,5 +20,4 @@ package org.davic.media; public interface AudioLanguageControl extends LanguageControl { - } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/LanguageNotAvailableException.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/LanguageNotAvailableException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/LanguageNotAvailableException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/LanguageNotAvailableException.java 2017-06-23 13:35:09.000000000 +0000 @@ -20,13 +20,11 @@ package org.davic.media; public class LanguageNotAvailableException extends javax.media.MediaException { - public LanguageNotAvailableException() - { + public LanguageNotAvailableException() { super(); } - public LanguageNotAvailableException(String reason) - { + public LanguageNotAvailableException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/MediaFreezeException.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/MediaFreezeException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/MediaFreezeException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/MediaFreezeException.java 2017-06-23 13:35:09.000000000 +0000 @@ -20,13 +20,11 @@ package org.davic.media; public class MediaFreezeException extends javax.media.MediaException { - public MediaFreezeException() - { + public MediaFreezeException() { super(); } - public MediaFreezeException(String reason) - { + public MediaFreezeException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/MediaPresentedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/MediaPresentedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/MediaPresentedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/MediaPresentedEvent.java 2017-06-23 13:35:09.000000000 +0000 @@ -23,8 +23,7 @@ import javax.media.Controller; public class MediaPresentedEvent extends ControllerEvent { - public MediaPresentedEvent(Controller source) - { + public MediaPresentedEvent(Controller source) { super(source); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/MediaTimeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/MediaTimeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/MediaTimeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/MediaTimeEvent.java 2017-06-23 13:35:09.000000000 +0000 @@ -19,9 +19,9 @@ package org.davic.media; -public class MediaTimeEvent { - public MediaTimeEvent(Object source, long eventTime, int ID) - { +public class MediaTimeEvent extends java.util.EventObject { + public MediaTimeEvent(Object source, long eventTime, int ID) { + super(source); this.source = source; this.eventTime = eventTime; this.eventId = ID; @@ -38,8 +38,8 @@ public Object getSource() { return source; } - - private Object source; - private long eventTime; - private int eventId; + + private final Object source; + private final long eventTime; + private final int eventId; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/MediaTimePositionChangedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/MediaTimePositionChangedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/MediaTimePositionChangedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/MediaTimePositionChangedEvent.java 2017-06-23 13:35:09.000000000 +0000 @@ -19,16 +19,12 @@ package org.davic.media; public class MediaTimePositionChangedEvent extends javax.media.RestartingEvent { - public MediaTimePositionChangedEvent(javax.media.Controller source) - { - + public MediaTimePositionChangedEvent(javax.media.Controller source) { super(source, 0, 0, 0, null); - } public MediaTimePositionChangedEvent(javax.media.Controller from, - int previous, int current, int target, javax.media.Time mediaTime) - { + int previous, int current, int target, javax.media.Time mediaTime) { super(from, previous, current, target, mediaTime); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/NotAuthorizedException.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/NotAuthorizedException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/NotAuthorizedException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/NotAuthorizedException.java 2017-06-23 13:35:09.000000000 +0000 @@ -22,13 +22,11 @@ import java.io.IOException; public class NotAuthorizedException extends IOException { - public NotAuthorizedException() - { + public NotAuthorizedException() { super(); } - public NotAuthorizedException(String reason) - { + public NotAuthorizedException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/ResourceReturnedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/ResourceReturnedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/ResourceReturnedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/ResourceReturnedEvent.java 2017-06-23 13:35:09.000000000 +0000 @@ -20,11 +20,10 @@ package org.davic.media; public class ResourceReturnedEvent extends javax.media.ControllerEvent { - public ResourceReturnedEvent(javax.media.Controller controller) - { - super(controller); - } - + public ResourceReturnedEvent(javax.media.Controller controller) { + super(controller); + } + private static final long serialVersionUID = 833405652804231956L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/ResourceWithdrawnEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/ResourceWithdrawnEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/media/ResourceWithdrawnEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/media/ResourceWithdrawnEvent.java 2017-06-23 13:35:09.000000000 +0000 @@ -20,10 +20,9 @@ package org.davic.media; public class ResourceWithdrawnEvent extends javax.media.ControllerEvent { - public ResourceWithdrawnEvent(javax.media.Controller controller) - { + public ResourceWithdrawnEvent(javax.media.Controller controller) { super(controller); } - + private static final long serialVersionUID = -7166847584806713058L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/mpeg/NotAuthorizedException.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/mpeg/NotAuthorizedException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/mpeg/NotAuthorizedException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/mpeg/NotAuthorizedException.java 2017-06-23 13:35:08.000000000 +0000 @@ -20,25 +20,21 @@ package org.davic.mpeg; public class NotAuthorizedException extends Exception implements NotAuthorizedInterface { - public NotAuthorizedException() - { + public NotAuthorizedException() { super(); } - public NotAuthorizedException(String reason) - { + public NotAuthorizedException(String reason) { super(reason); } - public int[] getReason(int index) throws IndexOutOfBoundsException - { + public int[] getReason(int index) throws IndexOutOfBoundsException { return null; } - - public int getType() - { + + public int getType() { return 0; } - + private static final long serialVersionUID = 1567106534419982722L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/mpeg/NotAuthorizedInterface.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/mpeg/NotAuthorizedInterface.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/mpeg/NotAuthorizedInterface.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/mpeg/NotAuthorizedInterface.java 2017-06-23 13:35:08.000000000 +0000 @@ -21,9 +21,9 @@ public interface NotAuthorizedInterface { public int getType(); - + //public Service getService(); - + //public ElementaryStream[] getElementaryStreams(); public int[] getReason(int index) diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/net/InvalidLocatorException.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/net/InvalidLocatorException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/net/InvalidLocatorException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/net/InvalidLocatorException.java 2017-06-23 13:35:08.000000000 +0000 @@ -19,13 +19,11 @@ package org.davic.net; public class InvalidLocatorException extends Exception { - public InvalidLocatorException() - { + public InvalidLocatorException() { super(); } - public InvalidLocatorException(String reason) - { + public InvalidLocatorException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/net/Locator.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/net/Locator.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/net/Locator.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/net/Locator.java 2017-06-23 13:35:08.000000000 +0000 @@ -35,5 +35,13 @@ return url; } + public boolean equals(Object obj) { + if (obj == null || !(obj instanceof Locator) || url == null) + return false; + + Locator locator = (Locator)obj; + return toExternalForm().equals(locator.toExternalForm()); + } + protected String url; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/net/TransportDependentLocator.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/net/TransportDependentLocator.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/net/TransportDependentLocator.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/net/TransportDependentLocator.java 2017-06-23 13:35:08.000000000 +0000 @@ -20,5 +20,4 @@ package org.davic.net; public interface TransportDependentLocator { - } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/davic/resources/ResourceStatusEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/davic/resources/ResourceStatusEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/davic/resources/ResourceStatusEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/davic/resources/ResourceStatusEvent.java 2017-06-23 13:35:08.000000000 +0000 @@ -20,18 +20,9 @@ package org.davic.resources; public class ResourceStatusEvent extends java.util.EventObject { - public ResourceStatusEvent(Object source) - { + public ResourceStatusEvent(Object source) { super(source); - - this.source = source; - } - - public Object getSource() - { - return source; } - private Object source; private static final long serialVersionUID = 2431644213385584745L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppAttributes.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppAttributes.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppAttributes.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppAttributes.java 2017-06-23 13:35:02.000000000 +0000 @@ -23,7 +23,6 @@ public abstract interface AppAttributes { - public abstract AppIcon getAppIcon(); public abstract AppID getIdentifier(); @@ -33,7 +32,7 @@ public abstract String getName(); public abstract String getName(String language) - throws LanguageNotAvailableException; + throws LanguageNotAvailableException; public abstract String[][] getNames(); @@ -48,12 +47,12 @@ public abstract int getType(); public abstract int[] getVersions(String profile) - throws IllegalProfileParameterException; + throws IllegalProfileParameterException; public abstract boolean isStartable(); public abstract boolean isVisible(); - + public static final int DVB_HTML_application = 2; public static final int DVB_J_application = 1; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppID.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppID.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppID.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppID.java 2017-06-23 13:35:02.000000000 +0000 @@ -22,29 +22,24 @@ import java.io.Serializable; public class AppID implements Serializable { - public AppID(int oid, int aid) - { + public AppID(int oid, int aid) { this.oid = oid; this.aid = aid; } - - public int getOID() - { + + public int getOID() { return oid; } - - public int getAID() - { + + public int getAID() { return aid; } - - public String toString() - { + + public String toString() { return Long.toString(((long)oid << 16) + aid, 16); } - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = 1; result = prime * result + aid; @@ -52,13 +47,8 @@ return result; } - public boolean equals(Object obj) - { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) + public boolean equals(Object obj) { + if (!(obj instanceof AppID)) return false; AppID other = (AppID) obj; if (aid != other.aid) @@ -68,8 +58,6 @@ return true; } - int oid; - int aid; - - private static final long serialVersionUID = 1; + private int oid; + private int aid; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppProxy.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppProxy.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppProxy.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppProxy.java 2017-06-23 13:35:03.000000000 +0000 @@ -43,5 +43,4 @@ public void removeAppStateChangeEventListener( AppStateChangeEventListener listener); - } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppsControlPermission.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppsControlPermission.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppsControlPermission.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppsControlPermission.java 2017-06-23 13:35:03.000000000 +0000 @@ -23,35 +23,29 @@ import java.security.Permission; public final class AppsControlPermission extends BasicPermission { - public AppsControlPermission() - { - super("toto"); + public AppsControlPermission() { + super("*"); } - public AppsControlPermission(String name, String actions) - { - super(name); + public AppsControlPermission(String name, String actions) { + super("*"); } - public String getActions() - { + public String getActions() { // actions should be always null return null; } - public boolean implies(Permission perm) - { + public boolean implies(Permission perm) { return perm instanceof AppsControlPermission; } - public boolean equals(Object obj) - { + public boolean equals(Object obj) { return obj instanceof AppsControlPermission; } - public int hashCode() - { - return getClass().hashCode(); + public int hashCode() { + return 0; } private static final long serialVersionUID = 4003360685455291075L; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppsDatabaseEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppsDatabaseEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppsDatabaseEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppsDatabaseEvent.java 2017-06-23 13:35:02.000000000 +0000 @@ -22,24 +22,25 @@ import java.util.EventObject; public class AppsDatabaseEvent extends EventObject { - public AppsDatabaseEvent(int id, AppID appid, Object source) - { + public AppsDatabaseEvent(int id, AppID appid, Object source) { super(source); this.appid = appid; this.id = id; } - public AppID getAppID() - { + public AppID getAppID() { return appid; } - public int getEventId() - { + public int getEventId() { return id; } + public String toString() { + return getClass().getName() + "[source=" + source + ",id=" + id + ",appid" + appid + "]"; + } + static public final int NEW_DATABASE = 0; static public final int APP_CHANGED = 1; static public final int APP_ADDED = 2; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppsDatabase.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppsDatabase.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppsDatabase.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppsDatabase.java 2017-06-23 13:35:02.000000000 +0000 @@ -21,6 +21,7 @@ import java.util.LinkedList; import java.util.Enumeration; +import java.util.Collections; import org.videolan.BDJAppsDatabase; import org.videolan.BDJListeners; import org.videolan.Logger; @@ -37,12 +38,12 @@ public Enumeration getAppIDs(AppsDatabaseFilter filter) { logger.unimplemented("getAppIDs"); - return null; + return Collections.emptyEnumeration(); } public Enumeration getAppAttributes(AppsDatabaseFilter filter) { logger.unimplemented("getAppAttributes"); - return null; + return Collections.emptyEnumeration(); } public AppAttributes getAppAttributes(AppID key) { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppStateChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppStateChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/AppStateChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/AppStateChangeEvent.java 2017-06-23 13:35:02.000000000 +0000 @@ -23,8 +23,7 @@ public class AppStateChangeEvent extends EventObject { public AppStateChangeEvent(AppID appid, int fromstate, int tostate, - Object source, boolean hasFailed) - { + Object source, boolean hasFailed) { super(source); this.appid = appid; @@ -33,29 +32,29 @@ this.hasFailed = hasFailed; } - public AppID getAppID() - { + public AppID getAppID() { return appid; } - public int getFromState() - { + public int getFromState() { return fromstate; } - public int getToState() - { + public int getToState() { return tostate; } - public boolean hasFailed() - { + public boolean hasFailed() { return hasFailed; } - private AppID appid; - private int fromstate; - private int tostate; - private boolean hasFailed; + public String toString() { + return getClass().getName() + "[source=" + source + ",appid=" + appid + ",fromstate=" + fromstate + ",tostate=" + tostate + ",hasFailed=" + hasFailed + "]"; + } + + private final AppID appid; + private final int fromstate; + private final int tostate; + private final boolean hasFailed; private static final long serialVersionUID = -5634352176873439145L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/CurrentServiceFilter.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/CurrentServiceFilter.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/CurrentServiceFilter.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/CurrentServiceFilter.java 2017-06-23 13:35:02.000000000 +0000 @@ -20,11 +20,14 @@ package org.dvb.application; public class CurrentServiceFilter extends AppsDatabaseFilter { + + private final AppsDatabase db = AppsDatabase.getAppsDatabase(); + public CurrentServiceFilter() { super(); } public boolean accept(AppID appid) { - return true; + return db.getAppProxy(appid) != null; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/IllegalProfileParameterException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/IllegalProfileParameterException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/IllegalProfileParameterException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/IllegalProfileParameterException.java 2017-06-23 13:35:02.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.application; public class IllegalProfileParameterException extends Exception { - public IllegalProfileParameterException() - { + public IllegalProfileParameterException() { super(); } - public IllegalProfileParameterException(String reason) - { + public IllegalProfileParameterException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/LanguageNotAvailableException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/LanguageNotAvailableException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/LanguageNotAvailableException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/LanguageNotAvailableException.java 2017-06-23 13:35:03.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.application; public class LanguageNotAvailableException extends Exception { - public LanguageNotAvailableException() - { + public LanguageNotAvailableException() { super(); } - public LanguageNotAvailableException(String reason) - { + public LanguageNotAvailableException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/RunningApplicationsFilter.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/RunningApplicationsFilter.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/application/RunningApplicationsFilter.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/application/RunningApplicationsFilter.java 2017-06-23 13:35:02.000000000 +0000 @@ -26,9 +26,9 @@ } public boolean accept(AppID appid) { - AppProxy proxy = AppsDatabase.getAppsDatabase().getAppProxy(appid); - if (proxy == null) - return false; + AppProxy proxy = AppsDatabase.getAppsDatabase().getAppProxy(appid); + if (proxy == null) + return false; return proxy.getState() == AppProxy.STARTED; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/AsynchronousLoadingEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/AsynchronousLoadingEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/AsynchronousLoadingEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/AsynchronousLoadingEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -22,13 +22,11 @@ import java.util.EventObject; public abstract class AsynchronousLoadingEvent extends EventObject { - public AsynchronousLoadingEvent(DSMCCObject source) - { + public AsynchronousLoadingEvent(DSMCCObject source) { super(source); } - public Object getSource() - { + public Object getSource() { return super.getSource(); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCException.java 2017-06-23 13:35:01.000000000 +0000 @@ -22,13 +22,11 @@ import java.io.IOException; public class DSMCCException extends IOException { - public DSMCCException() - { + public DSMCCException() { super(); } - public DSMCCException(String reason) - { + public DSMCCException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCObject.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCObject.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCObject.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCObject.java 2017-06-23 13:35:01.000000000 +0000 @@ -28,41 +28,34 @@ import org.videolan.Logger; public class DSMCCObject extends File { - public DSMCCObject(String path) - { + public DSMCCObject(String path) { super(path); org.videolan.Logger.unimplemented(DSMCCObject.class.getName(), ""); } - public DSMCCObject(String path, String name) - { + public DSMCCObject(String path, String name) { super(path, name); org.videolan.Logger.unimplemented(DSMCCObject.class.getName(), ""); } - public DSMCCObject(DSMCCObject dir, String name) - { + public DSMCCObject(DSMCCObject dir, String name) { super(dir.getPath(), name); org.videolan.Logger.unimplemented(DSMCCObject.class.getName(), ""); } - public boolean isLoaded() - { + public boolean isLoaded() { return loaded; } - public boolean isStream() - { + public boolean isStream() { return stream; } - public boolean isStreamEvent() - { + public boolean isStreamEvent() { return streamEvent; } - public boolean isObjectKindKnown() - { + public boolean isObjectKindKnown() { return true; } @@ -70,20 +63,19 @@ InterruptedIOException, MPEGDeliveryException, ServerDeliveryException, InvalidPathNameException, NotEntitledException, ServiceXFRException, - InsufficientResourcesException - { + InsufficientResourcesException { + if (!super.exists()) throw new InvalidPathNameException(); - + this.loaded = true; } public void asynchronousLoad(AsynchronousLoadingEventListener listener) - throws InvalidPathNameException - { + throws InvalidPathNameException { try { synchronousLoad(); - + listener.receiveEvent(new SuccessEvent(this)); } catch (DSMCCException e) { // never really thrown so don't care @@ -92,33 +84,28 @@ } } - public void abort() throws NothingToAbortException - { + public void abort() throws NothingToAbortException { throw new NothingToAbortException(); } - public static boolean prefetch(String path, byte priority) - { + public static boolean prefetch(String path, byte priority) { org.videolan.Logger.unimplemented(DSMCCObject.class.getName(), "prefetch"); return false; } - public static boolean prefetch(DSMCCObject dir, String path, byte priority) - { + public static boolean prefetch(DSMCCObject dir, String path, byte priority) { org.videolan.Logger.unimplemented(DSMCCObject.class.getName(), "prefetch"); return false; } - public void unload() throws NotLoadedException - { + public void unload() throws NotLoadedException { if (loaded) throw new NotLoadedException(); loaded = false; } - public URL getURL() - { + public URL getURL() { String url = "file://" + super.getAbsolutePath(); try { return new URL(url); @@ -130,36 +117,31 @@ } public void addObjectChangeEventListener(ObjectChangeEventListener listener) - throws InsufficientResourcesException - { + throws InsufficientResourcesException { org.videolan.Logger.unimplemented(DSMCCObject.class.getName(), "addObjectChangeEventListener"); throw new Error("Not implemented"); // NOTE: probably unnecessary } public void removeObjectChangeEventListener( - ObjectChangeEventListener listener) - { + ObjectChangeEventListener listener) { org.videolan.Logger.unimplemented(DSMCCObject.class.getName(), "removeObjectChangeEventListener"); throw new Error("Not implemented"); // NOTE: probably unnecessary } public void loadDirectoryEntry(AsynchronousLoadingEventListener listener) - throws InvalidPathNameException - { + throws InvalidPathNameException { if (!super.exists()) throw new InvalidPathNameException(); listener.receiveEvent(new SuccessEvent(this)); } - public void setRetrievalMode(int retrieval_mode) - { + public void setRetrievalMode(int retrieval_mode) { org.videolan.Logger.unimplemented(DSMCCObject.class.getName(), "setRetrievalMode"); throw new Error("Not implemented"); } - public X509Certificate[][] getSigners() - { + public X509Certificate[][] getSigners() { org.videolan.Logger.unimplemented(DSMCCObject.class.getName(), "getSigners"); throw new Error("Not implemented"); } @@ -168,8 +150,8 @@ throws InvalidFormatException, InterruptedIOException, MPEGDeliveryException, ServerDeliveryException, InvalidPathNameException, NotEntitledException, - ServiceXFRException, InsufficientResourcesException - { + ServiceXFRException, InsufficientResourcesException { + org.videolan.Logger.unimplemented(DSMCCObject.class.getName(), "getSigners"); throw new Error("Not implemented"); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCStreamEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCStreamEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCStreamEvent.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCStreamEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -23,49 +23,45 @@ public class DSMCCStreamEvent extends DSMCCStream { public DSMCCStreamEvent(DSMCCObject aDSMCCObject) - throws NotLoadedException, IllegalObjectTypeException - { + throws NotLoadedException, IllegalObjectTypeException { + super(aDSMCCObject); org.videolan.Logger.unimplemented(DSMCCStreamEvent.class.getName(), ""); throw new Error("Not implemented"); } public DSMCCStreamEvent(String path) throws IOException, - IllegalObjectTypeException - { + IllegalObjectTypeException { + super(path); org.videolan.Logger.unimplemented(DSMCCStreamEvent.class.getName(), ""); throw new Error("Not implemented"); } public DSMCCStreamEvent(String path, String name) throws IOException, - IllegalObjectTypeException - { + IllegalObjectTypeException { + super(path, name); org.videolan.Logger.unimplemented(DSMCCStreamEvent.class.getName(), ""); throw new Error("Not implemented"); } public synchronized int subscribe(String eventName, StreamEventListener l) - throws UnknownEventException, InsufficientResourcesException - { + throws UnknownEventException, InsufficientResourcesException { throw new Error("Not implemented"); } public synchronized void unsubscribe(int eventId, StreamEventListener l) - throws UnknownEventException - { + throws UnknownEventException { throw new Error("Not implemented"); } public synchronized void unsubscribe(String eventName, StreamEventListener l) - throws UnknownEventException - { + throws UnknownEventException { throw new Error("Not implemented"); } - public String[] getEventList() - { + public String[] getEventList() { throw new Error("Not implemented"); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCStream.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCStream.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCStream.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/DSMCCStream.java 2017-06-23 13:35:00.000000000 +0000 @@ -24,73 +24,60 @@ public class DSMCCStream implements Serializable { public DSMCCStream(DSMCCObject aDSMCCObject) throws NotLoadedException, - IllegalObjectTypeException - { + IllegalObjectTypeException { org.videolan.Logger.unimplemented(DSMCCStream.class.getName(), ""); throw new Error("Not implemented"); } public DSMCCStream(String path) throws IOException, - IllegalObjectTypeException - { + IllegalObjectTypeException { org.videolan.Logger.unimplemented(DSMCCStream.class.getName(), ""); throw new Error("Not implemented"); } public DSMCCStream(String path, String name) throws IOException, - IllegalObjectTypeException - { + IllegalObjectTypeException { org.videolan.Logger.unimplemented(DSMCCStream.class.getName(), ""); throw new Error("Not implemented"); } - public long getDuration() - { + public long getDuration() { throw new Error("Not implemented"); } - public long getNPT() throws MPEGDeliveryException - { + public long getNPT() throws MPEGDeliveryException { throw new Error("Not implemented"); } - public Locator getStreamLocator() - { + public Locator getStreamLocator() { throw new Error("Not implemented"); } - public boolean isMPEGProgram() - { + public boolean isMPEGProgram() { throw new Error("Not implemented"); } - public boolean isAudio() - { + public boolean isAudio() { throw new Error("Not implemented"); } - public boolean isVideo() - { + public boolean isVideo() { throw new Error("Not implemented"); } - public boolean isData() - { + public boolean isData() { throw new Error("Not implemented"); } - public NPTRate getNPTRate() throws MPEGDeliveryException - { + public NPTRate getNPTRate() throws MPEGDeliveryException { throw new Error("Not implemented"); } - public void addNPTListener(NPTListener listener) - { + public void addNPTListener(NPTListener listener) { throw new Error("Not implemented"); } - public void removeNPTListener(NPTListener listener) - { + public void removeNPTListener(NPTListener listener) { throw new Error("Not implemented"); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/IllegalObjectTypeException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/IllegalObjectTypeException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/IllegalObjectTypeException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/IllegalObjectTypeException.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.dsmcc; public class IllegalObjectTypeException extends DSMCCException { - public IllegalObjectTypeException() - { + public IllegalObjectTypeException() { super(); } - public IllegalObjectTypeException(String reason) - { + public IllegalObjectTypeException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,15 +20,13 @@ package org.dvb.dsmcc; public class InsufficientResourcesEvent extends AsynchronousLoadingEvent { - public InsufficientResourcesEvent(DSMCCObject source) - { + public InsufficientResourcesEvent(DSMCCObject source) { super(source); - + this.source = source; } - public java.lang.Object getSource() - { + public java.lang.Object getSource() { return source; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InsufficientResourcesException.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.dsmcc; public class InsufficientResourcesException extends DSMCCException { - public InsufficientResourcesException() - { + public InsufficientResourcesException() { super(); } - public InsufficientResourcesException(String reason) - { + public InsufficientResourcesException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidAddressException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidAddressException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidAddressException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidAddressException.java 2017-06-23 13:35:02.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.dsmcc; public class InvalidAddressException extends DSMCCException { - public InvalidAddressException() - { + public InvalidAddressException() { super(); } - public InvalidAddressException(String reason) - { + public InvalidAddressException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidFormatEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidFormatEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidFormatEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidFormatEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,15 +20,13 @@ package org.dvb.dsmcc; public class InvalidFormatEvent extends AsynchronousLoadingEvent { - public InvalidFormatEvent(DSMCCObject source) - { + public InvalidFormatEvent(DSMCCObject source) { super(source); - + this.source = source; } - public Object getSource() - { + public Object getSource() { return source; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidFormatException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidFormatException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidFormatException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidFormatException.java 2017-06-23 13:35:00.000000000 +0000 @@ -21,13 +21,11 @@ public class InvalidFormatException extends DSMCCException { - public InvalidFormatException() - { + public InvalidFormatException() { super(); } - public InvalidFormatException(String reason) - { + public InvalidFormatException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidPathnameEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidPathnameEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidPathnameEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidPathnameEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,15 +20,13 @@ package org.dvb.dsmcc; public class InvalidPathnameEvent extends AsynchronousLoadingEvent { - public InvalidPathnameEvent(DSMCCObject source) - { + public InvalidPathnameEvent(DSMCCObject source) { super(source); this.source = source; } - public Object getSource() - { + public Object getSource() { return source; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidPathNameException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidPathNameException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidPathNameException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/InvalidPathNameException.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.dsmcc; public class InvalidPathNameException extends DSMCCException { - public InvalidPathNameException() - { + public InvalidPathNameException() { super(); } - public InvalidPathNameException(String reason) - { + public InvalidPathNameException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/LoadingAbortedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/LoadingAbortedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/LoadingAbortedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/LoadingAbortedEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,14 +20,12 @@ package org.dvb.dsmcc; public class LoadingAbortedEvent extends AsynchronousLoadingEvent { - public LoadingAbortedEvent(DSMCCObject source) - { + public LoadingAbortedEvent(DSMCCObject source) { super(source); this.source = source; } - public Object getSource() - { + public Object getSource() { return source; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryErrorEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryErrorEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryErrorEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryErrorEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,14 +20,12 @@ package org.dvb.dsmcc; public class MPEGDeliveryErrorEvent extends AsynchronousLoadingEvent { - public MPEGDeliveryErrorEvent(DSMCCObject source) - { + public MPEGDeliveryErrorEvent(DSMCCObject source) { super(source); this.source = source; } - public Object getSource() - { + public Object getSource() { return source; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/MPEGDeliveryException.java 2017-06-23 13:35:00.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.dsmcc; public class MPEGDeliveryException extends DSMCCException { - public MPEGDeliveryException() - { + public MPEGDeliveryException() { super(); } - public MPEGDeliveryException(String reason) - { + public MPEGDeliveryException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NotEntitledEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NotEntitledEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NotEntitledEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NotEntitledEvent.java 2017-06-23 13:35:02.000000000 +0000 @@ -20,15 +20,13 @@ package org.dvb.dsmcc; public class NotEntitledEvent extends AsynchronousLoadingEvent { - public NotEntitledEvent(DSMCCObject source) - { + public NotEntitledEvent(DSMCCObject source) { super(source); this.source = source; } - public Object getSource() - { + public Object getSource() { return source; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NotEntitledException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NotEntitledException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NotEntitledException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NotEntitledException.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.dsmcc; public class NotEntitledException extends DSMCCException { - public NotEntitledException() - { + public NotEntitledException() { super(); } - public NotEntitledException(String reason) - { + public NotEntitledException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NothingToAbortException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NothingToAbortException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NothingToAbortException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NothingToAbortException.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.dsmcc; public class NothingToAbortException extends DSMCCException { - public NothingToAbortException() - { + public NothingToAbortException() { super(); } - public NothingToAbortException(String reason) - { + public NothingToAbortException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NotLoadedException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NotLoadedException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NotLoadedException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NotLoadedException.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.dsmcc; public class NotLoadedException extends DSMCCException { - public NotLoadedException() - { + public NotLoadedException() { super(); } - public NotLoadedException(String reason) - { + public NotLoadedException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTDiscontinuityEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTDiscontinuityEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTDiscontinuityEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTDiscontinuityEvent.java 2017-06-23 13:35:00.000000000 +0000 @@ -20,21 +20,18 @@ package org.dvb.dsmcc; public class NPTDiscontinuityEvent extends NPTStatusEvent { - public NPTDiscontinuityEvent(DSMCCStream source, long before, long after) - { + public NPTDiscontinuityEvent(DSMCCStream source, long before, long after) { super(source); this.before = before; this.after = after; } - public long getLastNPT() - { + public long getLastNPT() { return before; } - public long getFirstNPT() - { + public long getFirstNPT() { return after; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTPresentEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTPresentEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTPresentEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTPresentEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,8 +20,7 @@ package org.dvb.dsmcc; public class NPTPresentEvent extends NPTStatusEvent { - public NPTPresentEvent(DSMCCStream source) - { + public NPTPresentEvent(DSMCCStream source) { super(source); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTRateChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTRateChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTRateChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTRateChangeEvent.java 2017-06-23 13:35:02.000000000 +0000 @@ -21,21 +21,18 @@ package org.dvb.dsmcc; public class NPTRateChangeEvent extends java.util.EventObject { - public NPTRateChangeEvent(DSMCCStream source, NPTRate rate) - { + public NPTRateChangeEvent(DSMCCStream source, NPTRate rate) { super(source); this.source = source; this.rate = rate; } - public Object getSource() - { + public Object getSource() { return source; } - public NPTRate getRate() - { + public NPTRate getRate() { return rate; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTRate.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTRate.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTRate.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTRate.java 2017-06-23 13:35:01.000000000 +0000 @@ -24,19 +24,16 @@ public class NPTRate implements Serializable { // should only be called internally - public NPTRate(int numerator, int denominator) - { + public NPTRate(int numerator, int denominator) { this.numerator = numerator; this.denominator = denominator; } - public int getNumerator() - { + public int getNumerator() { return numerator; } - public int getDenominator() - { + public int getDenominator() { return denominator; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTRemovedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTRemovedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTRemovedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTRemovedEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,10 +20,9 @@ package org.dvb.dsmcc; public class NPTRemovedEvent extends NPTStatusEvent { - public NPTRemovedEvent(DSMCCStream source) - { + public NPTRemovedEvent(DSMCCStream source) { super(source); } - + private static final long serialVersionUID = -317867772336548880L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTStatusEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTStatusEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTStatusEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/NPTStatusEvent.java 2017-06-23 13:35:00.000000000 +0000 @@ -20,15 +20,13 @@ package org.dvb.dsmcc; public abstract class NPTStatusEvent extends java.util.EventObject { - public NPTStatusEvent(DSMCCStream source) - { + public NPTStatusEvent(DSMCCStream source) { super(source); this.source = source; } - public Object getSource() - { + public Object getSource() { return source; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ObjectChangeEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ObjectChangeEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ObjectChangeEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ObjectChangeEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -22,24 +22,18 @@ import java.util.EventObject; public class ObjectChangeEvent extends EventObject { - public ObjectChangeEvent(DSMCCObject source, int aVersionNumber) - - { + public ObjectChangeEvent(DSMCCObject source, int aVersionNumber) { super(source); this.source = source; this.aVersionNumber = aVersionNumber; } - public int getNewVersionNumber() - - { + public int getNewVersionNumber() { return aVersionNumber; - } - public Object getSource() - { + public Object getSource() { return source; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryErrorEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryErrorEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryErrorEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryErrorEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,15 +20,13 @@ package org.dvb.dsmcc; public class ServerDeliveryErrorEvent extends AsynchronousLoadingEvent { - public ServerDeliveryErrorEvent(DSMCCObject source) - { + public ServerDeliveryErrorEvent(DSMCCObject source) { super(source); this.source = source; } - public java.lang.Object getSource() - { + public java.lang.Object getSource() { return source; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServerDeliveryException.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.dsmcc; public class ServerDeliveryException extends DSMCCException { - public ServerDeliveryException() - { + public ServerDeliveryException() { super(); } - public ServerDeliveryException(String reason) - { + public ServerDeliveryException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceDomain.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceDomain.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceDomain.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceDomain.java 2017-06-23 13:35:01.000000000 +0000 @@ -28,22 +28,18 @@ import org.videolan.MountManager; public class ServiceDomain { - public ServiceDomain() - { - + public ServiceDomain() { } public void attach(Locator dvbService, int carouselId) throws ServiceXFRException, InterruptedIOException, - MPEGDeliveryException - { + MPEGDeliveryException { org.videolan.Logger.unimplemented("ServiceDomain", "attach"); throw new Error("Not implemented"); } public void attach(Locator locator) throws DSMCCException, - InterruptedIOException, MPEGDeliveryException - { + InterruptedIOException, MPEGDeliveryException { BDLocator bdl = checkLocator(locator); if (bdl == null) throw new DSMCCException("invalid BDLocator"); @@ -62,28 +58,25 @@ public void attach(byte[] NSAPAddress) throws DSMCCException, InterruptedIOException, InvalidAddressException, - MPEGDeliveryException - { + MPEGDeliveryException { org.videolan.Logger.unimplemented("ServiceDomain", "attach"); throw new Error("Not implemented"); } - public void detach() throws NotLoadedException - { + public void detach() throws NotLoadedException { if (mountPoint == null) throw new NotLoadedException(); } - public byte[] getNSAPAddress() throws NotLoadedException - { + public byte[] getNSAPAddress() throws NotLoadedException { org.videolan.Logger.unimplemented("ServiceDomain", "getNSAPAddress"); throw new Error("Not implemented"); } public static URL getURL(Locator locator) throws NotLoadedException, InvalidLocatorException, - FileNotFoundException - { + FileNotFoundException { + BDLocator bdl = checkLocator(locator); if (bdl == null) throw new InvalidLocatorException("invalid BDLocator"); @@ -105,29 +98,24 @@ throw new InvalidLocatorException(); } - public DSMCCObject getMountPoint() - { + public DSMCCObject getMountPoint() { return mountPoint; } - public boolean isNetworkConnectionAvailable() - { + public boolean isNetworkConnectionAvailable() { org.videolan.Logger.unimplemented("ServiceDomain", "isNetworkConnectionAvailable"); return false; } - public boolean isAttached() - { + public boolean isAttached() { return mountPoint != null; } - public Locator getLocator() - { + public Locator getLocator() { return locator; } - private static BDLocator checkLocator(Locator locator) - { + private static BDLocator checkLocator(Locator locator) { if (!(locator instanceof BDLocator)) return null; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceXFRErrorEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceXFRErrorEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceXFRErrorEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceXFRErrorEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,21 +20,18 @@ package org.dvb.dsmcc; public class ServiceXFRErrorEvent extends AsynchronousLoadingEvent { - public ServiceXFRErrorEvent(DSMCCObject source, ServiceXFRReference ref) - { + public ServiceXFRErrorEvent(DSMCCObject source, ServiceXFRReference ref) { super(source); this.source = source; this.ref = ref; } - public java.lang.Object getSource() - { + public java.lang.Object getSource() { return source; } - public ServiceXFRReference getServiceXFR() - { + public ServiceXFRReference getServiceXFR() { return ref; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceXFRException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceXFRException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceXFRException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceXFRException.java 2017-06-23 13:35:01.000000000 +0000 @@ -21,18 +21,15 @@ public class ServiceXFRException extends DSMCCException { public ServiceXFRException(org.davic.net.Locator aService, int carouselId, - String pathName) - { + String pathName) { this.ref = new ServiceXFRReference(aService, carouselId, pathName); } - public ServiceXFRException(byte[] NSAPAddress, String pathName) - { + public ServiceXFRException(byte[] NSAPAddress, String pathName) { this.ref = new ServiceXFRReference(NSAPAddress, pathName); } - public ServiceXFRReference getServiceXFR() - { + public ServiceXFRReference getServiceXFR() { return ref; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceXFRReference.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceXFRReference.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceXFRReference.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/ServiceXFRReference.java 2017-06-23 13:35:00.000000000 +0000 @@ -25,35 +25,29 @@ public class ServiceXFRReference implements Serializable { public ServiceXFRReference(Locator serviceLocator, int carouselId, - String pathName) - { + String pathName) { org.videolan.Logger.unimplemented(ServiceXFRReference.class.getName(), ""); throw new Error("Not implemented"); } - public ServiceXFRReference(byte[] nsapAddress, String pathName) - { + public ServiceXFRReference(byte[] nsapAddress, String pathName) { org.videolan.Logger.unimplemented(ServiceXFRReference.class.getName(), ""); throw new Error("Not implemented"); } - public Locator getLocator() - { + public Locator getLocator() { throw new Error("Not implemented"); } - public int getCarouselId() - { + public int getCarouselId() { throw new Error("Not implemented"); } - public String getPathName() - { + public String getPathName() { throw new Error("Not implemented"); } - public byte[] getNSAPAddress() - { + public byte[] getNSAPAddress() { throw new Error("Not implemented"); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/StreamEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/StreamEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/StreamEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/StreamEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -21,10 +21,9 @@ public class StreamEvent extends java.util.EventObject { public StreamEvent(DSMCCStreamEvent source, long npt, String name, - int eventId, byte[] eventData) - { + int eventId, byte[] eventData) { super(source); - + this.source = source; this.npt = npt; this.name = name; @@ -32,35 +31,30 @@ this.eventData = eventData; } - public Object getSource() - { + public Object getSource() { return source; } - public String getEventName() - { + public String getEventName() { return name; } - public int getEventId() - { + public int getEventId() { return eventId; } - public long getEventNPT() - { + public long getEventNPT() { return npt; } - public byte[] getEventData() - { + public byte[] getEventData() { return eventData; } private DSMCCStreamEvent source; private long npt; private String name; - private int eventId; + private int eventId; private byte[] eventData; private static final long serialVersionUID = -8054274744134638856L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/SuccessEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/SuccessEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/SuccessEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/SuccessEvent.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,14 +20,12 @@ package org.dvb.dsmcc; public class SuccessEvent extends AsynchronousLoadingEvent { - public SuccessEvent(DSMCCObject source) - { + public SuccessEvent(DSMCCObject source) { super(source); this.source = source; } - public Object getSource() - { + public Object getSource() { return source; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/UnknownEventException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/UnknownEventException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/dsmcc/UnknownEventException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/dsmcc/UnknownEventException.java 2017-06-23 13:35:01.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.dsmcc; public class UnknownEventException extends DSMCCException { - public UnknownEventException() - { + public UnknownEventException() { super(); } - public UnknownEventException(String reason) - { + public UnknownEventException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/EventManager.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/EventManager.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/EventManager.java 2015-02-28 16:45:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/EventManager.java 2017-06-23 13:35:02.000000000 +0000 @@ -36,17 +36,20 @@ import org.videolan.Logger; public class EventManager implements ResourceServer { + + private static final Object instanceLock = new Object(); + public static EventManager getInstance() { - synchronized (EventManager.class) { + synchronized (instanceLock) { if (instance == null) instance = new EventManager(); + return instance; } - return instance; } public static void shutdown() { EventManager e; - synchronized (EventManager.class) { + synchronized (instanceLock) { e = instance; instance = null; } @@ -164,10 +167,13 @@ if (item.context == context) { if (item.userEvents.contains(ue)) { result = BDJHelper.postKeyEvent(type, modifiers, keyCode); + logger.info("Key posted to exclusive AWT event listener, r=" + result); return true; } } } + } else { + logger.info("No focused HScene found !"); } for (Iterator it = exclusiveUserEventListener.iterator(); it.hasNext(); ) { @@ -179,6 +185,7 @@ } if (item.userEvents.contains(ue)) { item.context.putUserEvent(new UserEventAction(item, ue)); + logger.info("Key posted to exclusive UE listener"); return true; } } @@ -194,6 +201,7 @@ } if (item.userEvents.contains(ue)) { item.context.putUserEvent(new UserEventAction(item, ue)); + logger.info("Key posted to shared UE listener"); result = true; } } @@ -254,7 +262,7 @@ return false; } - private class UserEventItem { + private static class UserEventItem { public UserEventItem(BDJXletContext context, UserEventListener listener, ResourceClient client, UserEventRepository userEvents) { this.context = context; @@ -266,13 +274,13 @@ } } - public BDJXletContext context; - public UserEventListener listener; - public ResourceClient client; - public UserEventRepository userEvents; + public final BDJXletContext context; + public final UserEventListener listener; + public final ResourceClient client; + public final UserEventRepository userEvents; } - private class UserEventAction extends BDJAction { + private static class UserEventAction extends BDJAction { public UserEventAction(UserEventItem item, UserEvent event) { this.listener = item.listener; this.event = event; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/OverallRepository.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/OverallRepository.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/OverallRepository.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/OverallRepository.java 2017-06-23 13:35:02.000000000 +0000 @@ -20,15 +20,13 @@ package org.dvb.event; public class OverallRepository extends UserEventRepository { - public OverallRepository() - { + public OverallRepository() { this("OverallRepository"); } - public OverallRepository(String name) - { + public OverallRepository(String name) { super(name); - + super.addAllArrowKeys(); super.addAllColourKeys(); super.addAllNumericKeys(); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/RepositoryDescriptor.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/RepositoryDescriptor.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/RepositoryDescriptor.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/RepositoryDescriptor.java 2017-06-23 13:35:02.000000000 +0000 @@ -24,22 +24,19 @@ public class RepositoryDescriptor implements ResourceProxy { - protected RepositoryDescriptor(ResourceClient client, String name) - { + protected RepositoryDescriptor(ResourceClient client, String name) { this.name = name; this.client = client; } - public String getName() - { + public String getName() { return name; } - public ResourceClient getClient() - { + public ResourceClient getClient() { return client; } - + private String name; private ResourceClient client; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/UserEventAvailableEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/UserEventAvailableEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/UserEventAvailableEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/UserEventAvailableEvent.java 2017-06-23 13:35:02.000000000 +0000 @@ -22,13 +22,11 @@ import org.davic.resources.ResourceStatusEvent; public class UserEventAvailableEvent extends ResourceStatusEvent { - public UserEventAvailableEvent(Object source) - { + public UserEventAvailableEvent(Object source) { super(source); } - public Object getSource() - { + public Object getSource() { return super.getSource(); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/UserEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/UserEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/UserEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/UserEvent.java 2017-06-23 13:35:02.000000000 +0000 @@ -23,10 +23,9 @@ public class UserEvent extends java.util.EventObject { public UserEvent(Object source, int family, int type, int code, - int modifiers, long when) - { + int modifiers, long when) { super(source); - + this.family = family; this.type = type; this.code = code; @@ -34,10 +33,9 @@ this.when = when; } - public UserEvent(Object source, int family, char keyChar, long when) - { + public UserEvent(Object source, int family, char keyChar, long when) { super(source); - + this.family = family; this.type = KeyEvent.KEY_TYPED; this.code = keyChar; @@ -45,56 +43,46 @@ this.when = when; } - public int getFamily() - { + public int getFamily() { return family; } - public int getType() - { + public int getType() { return type; } - public int getCode() - { + public int getCode() { return code; } - public char getKeyChar() - { + public char getKeyChar() { return (char) code; } - public int getModifiers() - { + public int getModifiers() { return modifiers; } - public boolean isShiftDown() - { + public boolean isShiftDown() { return (KeyEvent.SHIFT_MASK & modifiers) != 0; } - public boolean isControlDown() - { + public boolean isControlDown() { return (KeyEvent.CTRL_MASK & modifiers) != 0; } - public boolean isMetaDown() - { + public boolean isMetaDown() { return (KeyEvent.META_MASK & modifiers) != 0; } - public boolean isAltDown() - { + public boolean isAltDown() { return (KeyEvent.ALT_MASK & modifiers) != 0; } - public long getWhen() - { + public long getWhen() { return when; } - + public static final int UEF_KEY_EVENT = 1; private int family; @@ -102,5 +90,5 @@ private int code; private int modifiers; private long when; - private static final long serialVersionUID = -4734616177850745290L; + private static final long serialVersionUID = -4734616177850745290L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/UserEventListener.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/UserEventListener.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/UserEventListener.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/UserEventListener.java 2017-06-23 13:35:02.000000000 +0000 @@ -23,5 +23,4 @@ public interface UserEventListener extends EventListener { public void userEventReceived(UserEvent event); - } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/UserEventRepository.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/UserEventRepository.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/UserEventRepository.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/UserEventRepository.java 2017-06-23 13:35:02.000000000 +0000 @@ -27,13 +27,11 @@ public class UserEventRepository extends RepositoryDescriptor { - public UserEventRepository(String name) - { + public UserEventRepository(String name) { super(null, name); } - public void addUserEvent(UserEvent event) - { + public void addUserEvent(UserEvent event) { if (contains(event)) { return; } @@ -41,8 +39,7 @@ events.add(event); } - public UserEvent[] getUserEvent() - { + public UserEvent[] getUserEvent() { int size = events.size(); UserEvent[] userEvents = new UserEvent[size]; for (int i = 0; i < size; i++) @@ -50,21 +47,18 @@ return userEvents; } - public void removeUserEvent(UserEvent event) - { + public void removeUserEvent(UserEvent event) { events.remove(event); } - public void addKey(int keycode) - { + public void addKey(int keycode) { addUserEvent(new UserEvent(this, UserEvent.UEF_KEY_EVENT, KeyEvent.KEY_PRESSED, keycode, 0, 0)); addUserEvent(new UserEvent(this, UserEvent.UEF_KEY_EVENT, KeyEvent.KEY_RELEASED, keycode, 0, 0)); } - public void removeKey(int keycode) - { + public void removeKey(int keycode) { for(Iterator it = events.iterator(); it.hasNext() == true; ) { UserEvent event = (UserEvent)it.next(); @@ -73,8 +67,7 @@ } } - public void addAllNumericKeys() - { + public void addAllNumericKeys() { addKey(HRcEvent.VK_0); addKey(HRcEvent.VK_1); addKey(HRcEvent.VK_2); @@ -87,24 +80,21 @@ addKey(HRcEvent.VK_9); } - public void addAllColourKeys() - { + public void addAllColourKeys() { addKey(HRcEvent.VK_COLORED_KEY_0); addKey(HRcEvent.VK_COLORED_KEY_1); addKey(HRcEvent.VK_COLORED_KEY_2); addKey(HRcEvent.VK_COLORED_KEY_3); } - public void addAllArrowKeys() - { + public void addAllArrowKeys() { addKey(HRcEvent.VK_LEFT); addKey(HRcEvent.VK_RIGHT); addKey(HRcEvent.VK_UP); addKey(HRcEvent.VK_DOWN); } - public void removeAllNumericKeys() - { + public void removeAllNumericKeys() { removeKey(HRcEvent.VK_0); removeKey(HRcEvent.VK_1); removeKey(HRcEvent.VK_2); @@ -117,25 +107,22 @@ removeKey(HRcEvent.VK_9); } - public void removeAllColourKeys() - { + public void removeAllColourKeys() { removeKey(HRcEvent.VK_COLORED_KEY_0); removeKey(HRcEvent.VK_COLORED_KEY_1); removeKey(HRcEvent.VK_COLORED_KEY_2); removeKey(HRcEvent.VK_COLORED_KEY_3); } - public void removeAllArrowKeys() - { + public void removeAllArrowKeys() { removeKey(HRcEvent.VK_LEFT); removeKey(HRcEvent.VK_RIGHT); removeKey(HRcEvent.VK_UP); removeKey(HRcEvent.VK_DOWN); } - boolean contains(UserEvent event) - { - for(Iterator it = events.iterator(); it.hasNext() == true; ) { + boolean contains(UserEvent event) { + for (Iterator it = events.iterator(); it.hasNext() == true; ) { UserEvent e = (UserEvent)it.next(); if (e.getFamily() == event.getFamily() && e.getType() == event.getType() && e.getCode() == event.getCode()) { return true; @@ -146,14 +133,12 @@ /* deep copy */ - private UserEventRepository(UserEventRepository r) - { + private UserEventRepository(UserEventRepository r) { super(r.getClient(), r.getName()); events = ((LinkedList)r.events.clone()); } - protected UserEventRepository getNewInstance() - { + protected UserEventRepository getNewInstance() { return new UserEventRepository(this); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/UserEventUnavailableEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/UserEventUnavailableEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/event/UserEventUnavailableEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/event/UserEventUnavailableEvent.java 2017-06-23 13:35:02.000000000 +0000 @@ -19,17 +19,16 @@ package org.dvb.event; -public class UserEventUnavailableEvent extends - org.davic.resources.ResourceStatusEvent { - public UserEventUnavailableEvent(Object source) - { +import org.davic.resources.ResourceStatusEvent; + +public class UserEventUnavailableEvent extends ResourceStatusEvent { + public UserEventUnavailableEvent(Object source) { super(source); this.source = source; } - public Object getSource() - { + public Object getSource() { return source; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/io/ixc/IxcRegistry.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/io/ixc/IxcRegistry.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/io/ixc/IxcRegistry.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/io/ixc/IxcRegistry.java 2017-06-23 13:35:03.000000000 +0000 @@ -30,10 +30,12 @@ public class IxcRegistry { + private static final Object instanceLock = new Object(); + private static IxcRegistryImpl registry = null; private static IxcRegistryImpl getIxcRegistry() { - synchronized (IxcRegistry.class) { + synchronized (instanceLock) { if (registry == null) { registry = new IxcRegistryImpl(); } @@ -43,7 +45,7 @@ public static void shutdown() { IxcRegistryImpl r; - synchronized (IxcRegistry.class) { + synchronized (instanceLock) { r = registry; registry = null; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/io/persistent/FileAccessPermissions.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/io/persistent/FileAccessPermissions.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/io/persistent/FileAccessPermissions.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/io/persistent/FileAccessPermissions.java 2017-06-23 13:35:03.000000000 +0000 @@ -21,63 +21,65 @@ public class FileAccessPermissions { public FileAccessPermissions(boolean readWorld, boolean writeWorld, - boolean readOrganisation, boolean writeOrganisation, - boolean readApplication, boolean writeApplication) - { + boolean readOrganization, boolean writeOrganization, + boolean readApplication, boolean writeApplication) { this.readWorld = readWorld; this.writeWorld = writeWorld; - this.readOrganisation = readOrganisation; - this.writeOrganisation = writeOrganisation; + this.readOrganization = readOrganization; + this.writeOrganization = writeOrganization; this.readApplication = readApplication; this.writeApplication = writeApplication; } - public boolean hasReadWorldAccessRight() - { + public boolean hasReadWorldAccessRight() { return readWorld; } - public boolean hasWriteWorldAccessRight() - { + public boolean hasWriteWorldAccessRight() { return writeWorld; } - public boolean hasReadOrganisationAccessRight() - { - return readOrganisation; + public boolean hasReadOrganizationAccessRight() { + return readOrganization; } - public boolean hasWriteOrganisationAccessRight() - { - return writeOrganisation; + public boolean hasWriteOrganizationAccessRight() { + return writeOrganization; } - public boolean hasReadApplicationAccessRight() - { + public boolean hasReadApplicationAccessRight() { return readApplication; } - public boolean hasWriteApplicationAccessRight() - { + public boolean hasWriteApplicationAccessRight() { return writeApplication; } public void setPermissions(boolean ReadWorld, boolean WriteWorld, - boolean ReadOrganisation, boolean WriteOrganisation, - boolean ReadApplication, boolean WriteApplication) - { + boolean ReadOrganization, boolean WriteOrganization, + boolean ReadApplication, boolean WriteApplication) { this.readWorld = ReadWorld; this.writeWorld = WriteWorld; - this.readOrganisation = ReadOrganisation; - this.writeOrganisation = WriteOrganisation; + this.readOrganization = ReadOrganization; + this.writeOrganization = WriteOrganization; this.readApplication = ReadApplication; this.writeApplication = WriteApplication; } + public String toString() { + return this.getClass().getName() + + "[rApp=" + readApplication + + ",wApp=" + writeApplication + + ",rOrg=" + readOrganization + + ",wOrg=" + writeOrganization + + ",rWorld=" + readWorld + + ",wWorld=" + writeWorld + "]"; + } + private boolean readWorld; private boolean writeWorld; - private boolean readOrganisation; - private boolean writeOrganisation; + private boolean readOrganization; + private boolean writeOrganization; private boolean readApplication; private boolean writeApplication; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/io/persistent/FileAttributes.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/io/persistent/FileAttributes.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/io/persistent/FileAttributes.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/io/persistent/FileAttributes.java 2017-06-23 13:35:03.000000000 +0000 @@ -29,61 +29,58 @@ public static final int PRIORITY_MEDIUM = 2; public static final int PRIORITY_HIGH = 3; - protected FileAttributes(Date expiration_date, - FileAccessPermissions permissions, int priority) - { + protected FileAttributes(Date expirationDate, + FileAccessPermissions permissions, int priority) { + this.expirationDate = expirationDate; this.permissions = permissions; this.priority = priority; } - public Date getExpirationDate() - { - org.videolan.Logger.unimplemented(FileAttributes.class.getName(), "getExpirationDate"); - return null; + public Date getExpirationDate() { + return expirationDate; } - public void setExpirationDate(Date d) - { - // expiration dates are for losers + public void setExpirationDate(Date d) { + this.expirationDate = d; } - public FileAccessPermissions getPermissions() - { + public FileAccessPermissions getPermissions() { return permissions; } - public void setPermissions(FileAccessPermissions permissions) - { + public void setPermissions(FileAccessPermissions permissions) { this.permissions = permissions; } - public int getPriority() - { + public int getPriority() { return priority; } - public void setPriority(int priority) - { + public void setPriority(int priority) { this.priority = priority; } public static void setFileAttributes(FileAttributes p, File f) - throws IOException - { + throws IOException { org.videolan.Logger.unimplemented(FileAttributes.class.getName(), "setFileAttributes"); // not implemented } - public static FileAttributes getFileAttributes(File f) throws IOException - { + public static FileAttributes getFileAttributes(File f) throws IOException { boolean r = f.canRead(); boolean w = f.canWrite(); - + FileAccessPermissions permissions = new FileAccessPermissions(r, w, r, w, r, w); - + return new FileAttributes(null, permissions, PRIORITY_LOW); } + public String toString() { + return this.getClass().getName() + "[priority=" + priority + ",permissions=" + + permissions + ",expirationDate=" + expirationDate + "]"; + } + private FileAccessPermissions permissions; private int priority; + private Date expirationDate; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/lang/DVBClassLoader.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/lang/DVBClassLoader.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/lang/DVBClassLoader.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/lang/DVBClassLoader.java 2017-06-23 13:35:02.000000000 +0000 @@ -75,7 +75,7 @@ return loader.loadClass(name, resolve); } - protected class DVBURLClassLoader extends URLClassLoader { + protected static class DVBURLClassLoader extends URLClassLoader { public DVBURLClassLoader(URL[] urls) { super(urls); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/ActiveFormatDescriptionChangedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/ActiveFormatDescriptionChangedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/ActiveFormatDescriptionChangedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/ActiveFormatDescriptionChangedEvent.java 2017-06-23 13:35:04.000000000 +0000 @@ -20,18 +20,20 @@ package org.dvb.media; public class ActiveFormatDescriptionChangedEvent extends VideoFormatEvent { - public ActiveFormatDescriptionChangedEvent(Object source, int newFormat) - { + public ActiveFormatDescriptionChangedEvent(Object source, int newFormat) { super(source); this.newFormat = newFormat; } - public int getNewFormat() - { + public int getNewFormat() { return newFormat; } - private int newFormat; + public String toString() { + return getClass().getName() + "[source=" + source + ",newFormat=" + newFormat + "]"; + } + + private final int newFormat; private static final long serialVersionUID = -1102487117285915146L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/AspectRatioChangedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/AspectRatioChangedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/AspectRatioChangedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/AspectRatioChangedEvent.java 2017-06-23 13:35:04.000000000 +0000 @@ -20,18 +20,20 @@ package org.dvb.media; public class AspectRatioChangedEvent extends VideoFormatEvent { - public AspectRatioChangedEvent(Object source, int newRatio) - { + public AspectRatioChangedEvent(Object source, int newRatio) { super(source); - + this.newRatio = newRatio; } - public int getNewRatio() - { + public int getNewRatio() { return newRatio; } - private int newRatio; + public String toString() { + return getClass().getName() + "[source=" + source + ",newRatio=" + newRatio + "]"; + } + + private final int newRatio; private static final long serialVersionUID = -897298629574550910L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/CAException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/CAException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/CAException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/CAException.java 2017-06-23 13:35:03.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.media; public class CAException extends java.io.IOException { - public CAException() - { + public CAException() { super(); } - public CAException(String reason) - { + public CAException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/CAStopEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/CAStopEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/CAStopEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/CAStopEvent.java 2017-06-23 13:35:04.000000000 +0000 @@ -24,23 +24,25 @@ import javax.media.MediaLocator; public class CAStopEvent extends StopEvent { - public CAStopEvent(Controller source) - { + public CAStopEvent(Controller source) { super(source, 0, 0, 0, null); + this.stream = null; } public CAStopEvent(Controller source, int previous, int current, - int target, MediaLocator stream) - { + int target, MediaLocator stream) { super(source, previous, current, target, null); this.stream = stream; } - public MediaLocator getStream() - { + public MediaLocator getStream() { return stream; } - private MediaLocator stream; + public String toString() { + return getClass().getName() + "[source=" + source + ",stream=" + stream + "]"; + } + + private final MediaLocator stream; private static final long serialVersionUID = 4964383050657791426L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/DFCChangedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/DFCChangedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/DFCChangedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/DFCChangedEvent.java 2017-06-23 13:35:04.000000000 +0000 @@ -20,18 +20,20 @@ package org.dvb.media; public class DFCChangedEvent extends VideoFormatEvent { - public DFCChangedEvent(Object source, int newDFC) - { + public DFCChangedEvent(Object source, int newDFC) { super(source); this.newDFC = newDFC; } - public int getNewDFC() - { + public int getNewDFC() { return newDFC; } - private int newDFC; + public String toString() { + return getClass().getName() + "[source=" + source + ",newDFC=" + newDFC + "]"; + } + + private final int newDFC; private static final long serialVersionUID = -4351969268893058245L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/NoComponentSelectedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/NoComponentSelectedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/NoComponentSelectedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/NoComponentSelectedEvent.java 2017-06-23 13:35:04.000000000 +0000 @@ -25,18 +25,20 @@ public class NoComponentSelectedEvent extends StopEvent { public NoComponentSelectedEvent(Controller source, int previous, - int current, int target, MediaLocator stream) - { + int current, int target, MediaLocator stream) { super(source, 0, 0, 0, null); this.stream = stream; } - public MediaLocator getStream() - { + public MediaLocator getStream() { return stream; } - private MediaLocator stream; + public String toString() { + return getClass().getName() + "[source=" + source + ",stream=" + stream + "]"; + } + + private final MediaLocator stream; private static final long serialVersionUID = -5650793101305031432L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/PresentationChangedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/PresentationChangedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/PresentationChangedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/PresentationChangedEvent.java 2017-06-23 13:35:04.000000000 +0000 @@ -25,29 +25,30 @@ public class PresentationChangedEvent extends ControllerEvent { public PresentationChangedEvent(Controller source, MediaLocator stream, - int reason) - { + int reason) { super(source); this.stream = stream; this.reason = reason; } - public MediaLocator getStream() - { + public MediaLocator getStream() { return stream; } - public int getReason() - { + public int getReason() { return reason; } + public String toString() { + return getClass().getName() + "[source=" + source + ",stream=" + stream + ",reason=" + reason + "]"; + } + public static final int STREAM_UNAVAILABLE = 0x00; public static final int CA_FAILURE = 0x01; public static final int CA_RETURNED = 0x02; - private MediaLocator stream; - private int reason; + private final MediaLocator stream; + private final int reason; private static final long serialVersionUID = 7465215844040053752L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/ServiceRemovedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/ServiceRemovedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/ServiceRemovedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/ServiceRemovedEvent.java 2017-06-23 13:35:04.000000000 +0000 @@ -24,26 +24,27 @@ import javax.media.Controller; public class ServiceRemovedEvent extends StopEvent { - public ServiceRemovedEvent(Controller source) - { + public ServiceRemovedEvent(Controller source) { super(source, 0, 0, 0, null); this.stream = null; } public ServiceRemovedEvent(Controller source, int previous, int current, - int target, MediaLocator stream) - { + int target, MediaLocator stream) { super(source, 0, 0, 0, null); this.stream = stream; } - public MediaLocator getStream() - { + public MediaLocator getStream() { return stream; } - private MediaLocator stream; + public String toString() { + return getClass().getName() + "[source=" + source + ",stream=" + stream + "]"; + } + + private final MediaLocator stream; private static final long serialVersionUID = -7235988242857485021L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/StopByResourceLossEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/StopByResourceLossEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/StopByResourceLossEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/StopByResourceLossEvent.java 2017-06-23 13:35:03.000000000 +0000 @@ -25,18 +25,20 @@ public class StopByResourceLossEvent extends StopEvent { public StopByResourceLossEvent(Controller source, int previous, - int current, int target, MediaLocator stream) - { + int current, int target, MediaLocator stream) { super(source, 0, 0, 0, null); this.stream = stream; } - public MediaLocator getStream() - { + public MediaLocator getStream() { return stream; } - private MediaLocator stream; + public String toString() { + return getClass().getName() + "[source=" + source + ",stream=" + stream + "]"; + } + + private final MediaLocator stream; private static final long serialVersionUID = -2924890229807383503L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/SubtitleAvailableEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/SubtitleAvailableEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/SubtitleAvailableEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/SubtitleAvailableEvent.java 2017-06-23 13:35:04.000000000 +0000 @@ -22,18 +22,16 @@ import java.util.EventObject; public class SubtitleAvailableEvent extends EventObject { - public SubtitleAvailableEvent(Object source) - { + public SubtitleAvailableEvent(Object source) { super(source); this.source = source; } - public Object getSource() - { + public Object getSource() { return source; } - private Object source; + protected final Object source; private static final long serialVersionUID = -7714072037836958718L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/SubtitleNotAvailableEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/SubtitleNotAvailableEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/SubtitleNotAvailableEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/SubtitleNotAvailableEvent.java 2017-06-23 13:35:04.000000000 +0000 @@ -22,17 +22,15 @@ import java.util.EventObject; public class SubtitleNotAvailableEvent extends EventObject { - public SubtitleNotAvailableEvent(Object source) - { + public SubtitleNotAvailableEvent(Object source) { super(source); this.source = source; } - public Object getSource() - { + public Object getSource() { return source; } - private Object source; + protected final Object source; private static final long serialVersionUID = -5092068346063671440L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/SubtitleNotSelectedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/SubtitleNotSelectedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/SubtitleNotSelectedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/SubtitleNotSelectedEvent.java 2017-06-23 13:35:04.000000000 +0000 @@ -22,17 +22,15 @@ import java.util.EventObject; public class SubtitleNotSelectedEvent extends EventObject { - public SubtitleNotSelectedEvent(Object source) - { + public SubtitleNotSelectedEvent(Object source) { super(source); this.source = source; } - public Object getSource() - { + public Object getSource() { return source; } - private Object source; + protected final Object source; private static final long serialVersionUID = 158958833178309906L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/SubtitleSelectedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/SubtitleSelectedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/SubtitleSelectedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/SubtitleSelectedEvent.java 2017-06-23 13:35:03.000000000 +0000 @@ -22,17 +22,15 @@ import java.util.EventObject; public class SubtitleSelectedEvent extends EventObject { - public SubtitleSelectedEvent(Object source) - { + public SubtitleSelectedEvent(Object source) { super(source); this.source = source; } - public Object getSource() - { + public Object getSource() { return source; } - private Object source; + protected final Object source; private static final long serialVersionUID = -4464632374027942754L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/VideoFormatEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/VideoFormatEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/VideoFormatEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/VideoFormatEvent.java 2017-06-23 13:35:04.000000000 +0000 @@ -22,10 +22,16 @@ import java.util.EventObject; public abstract class VideoFormatEvent extends EventObject { - public VideoFormatEvent(Object source) - { + public VideoFormatEvent(Object source) { super(source); + + this.source = source; + } + + public Object getSource() { + return source; } + protected final Object source; private static final long serialVersionUID = 8432740055225331694L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/VideoFormatListener.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/VideoFormatListener.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/media/VideoFormatListener.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/media/VideoFormatListener.java 2017-06-23 13:35:04.000000000 +0000 @@ -21,9 +21,8 @@ import java.util.EventListener; -public interface VideoFormatListener extends EventListener -{ - public void receiveVideoFormatEvent(VideoFormatEvent event); +public interface VideoFormatListener extends EventListener { + public void receiveVideoFormatEvent(VideoFormatEvent event); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/DVBAlphaComposite.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/DVBAlphaComposite.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/DVBAlphaComposite.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/DVBAlphaComposite.java 2017-06-23 13:35:03.000000000 +0000 @@ -1,6 +1,7 @@ /* * This file is part of libbluray * Copyright (C) 2010 William Hahne + * Copyright (C) 2016 Petri Hintukainen <phintuka@users.sourceforge.net> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,30 +22,24 @@ public final class DVBAlphaComposite { - private DVBAlphaComposite(int rule) - { - this.rule = rule; - this.alpha = 1.0f; + private DVBAlphaComposite(int rule) { + this(rule, 1.0f); } - private DVBAlphaComposite(int rule, float alpha) - { + private DVBAlphaComposite(int rule, float alpha) { this.rule = rule; this.alpha = alpha; } - public int getRule() - { + public int getRule() { return rule; } - public float getAlpha() - { + public float getAlpha() { return alpha; } - public static DVBAlphaComposite getInstance(int rule) - { + public static DVBAlphaComposite getInstance(int rule) { switch (rule) { case CLEAR: return Clear; @@ -63,17 +58,29 @@ case DST_OUT: return DstOut; default: + System.err.println("Unknown composite rule"); throw new IllegalArgumentException("Unknown rule"); } } - public static DVBAlphaComposite getInstance(int rule, float alpha) - { + public static DVBAlphaComposite getInstance(int rule, float alpha) { + if (rule < 1 || rule > 8) { + System.err.println("Unknown composite rule"); + throw new IllegalArgumentException("Unknown rule"); + } + + if (alpha < 0.0f || alpha > 1.0f) { + System.err.println("Alpha value out of range"); + throw new IllegalArgumentException("invalid alpha"); + } + + if (alpha >= 1.0f) + return getInstance(rule); + return new DVBAlphaComposite(rule, alpha); } - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = 1; result = prime * result + Float.floatToIntBits(alpha); @@ -81,16 +88,13 @@ return result; } - public boolean equals(Object obj) - { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) + public boolean equals(Object obj) { + if (!(obj instanceof DVBAlphaComposite)) return false; + DVBAlphaComposite other = (DVBAlphaComposite) obj; - if (Float.floatToIntBits(alpha) != Float.floatToIntBits(other.alpha)) + //if (Float.floatToIntBits(alpha) != Float.floatToIntBits(other.alpha)) + if (Float.compare(alpha, other.alpha) != 0) return false; if (rule != other.rule) return false; @@ -108,17 +112,13 @@ public static final DVBAlphaComposite Clear = new DVBAlphaComposite(CLEAR); public static final DVBAlphaComposite Src = new DVBAlphaComposite(SRC); - public static final DVBAlphaComposite SrcOver = new DVBAlphaComposite( - SRC_OVER); - public static final DVBAlphaComposite DstOver = new DVBAlphaComposite( - DST_OVER); + public static final DVBAlphaComposite SrcOver = new DVBAlphaComposite(SRC_OVER); + public static final DVBAlphaComposite DstOver = new DVBAlphaComposite(DST_OVER); public static final DVBAlphaComposite SrcIn = new DVBAlphaComposite(SRC_IN); public static final DVBAlphaComposite DstIn = new DVBAlphaComposite(DST_IN); - public static final DVBAlphaComposite SrcOut = new DVBAlphaComposite( - SRC_OUT); - public static final DVBAlphaComposite DstOut = new DVBAlphaComposite( - DST_OUT); + public static final DVBAlphaComposite SrcOut = new DVBAlphaComposite(SRC_OUT); + public static final DVBAlphaComposite DstOut = new DVBAlphaComposite(DST_OUT); - float alpha; - int rule; + private float alpha; + private int rule; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/DVBBufferedImage.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/DVBBufferedImage.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/DVBBufferedImage.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/DVBBufferedImage.java 2017-06-23 13:35:03.000000000 +0000 @@ -1,6 +1,7 @@ /* * This file is part of libbluray * Copyright (C) 2010 William Hahne + * Copyright (C) 2016 Petri Hintukainen <phintuka@users.sourceforge.net> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,28 +28,45 @@ import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; import java.awt.image.ImageProducer; +import java.awt.image.RasterFormatException; public class DVBBufferedImage extends Image { - public DVBBufferedImage(int width, int height) - { + public DVBBufferedImage(int width, int height) { this(width, height, TYPE_BASE); } - public DVBBufferedImage(int width, int height, int type) - { + public DVBBufferedImage(int width, int height, int type) { + if (type != TYPE_BASE && type != TYPE_ADVANCED) { + throw new IllegalArgumentException(err("Unknown image type " + type)); + } + if (width <= 0 || height <= 0) { + throw new IllegalArgumentException(err("Invalid size:" + width + "x" + height)); + } this.type = type; + GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); GraphicsDevice gd = ge.getDefaultScreenDevice(); GraphicsConfiguration gc = gd.getDefaultConfiguration(); bufferedImage = gc.createCompatibleImage(width, height); + + if (bufferedImage == null) { + err("Error creating buffered image"); + } } private DVBBufferedImage(BufferedImage image, int type) { + if (image == null) { + throw new IllegalArgumentException(err("null image")); + } this.type = type; this.bufferedImage = image; } public DVBGraphics createGraphics() { + if (bufferedImage == null) { + err("disposed"); + return null; + } DVBGraphics gfx = new DVBGraphicsImpl(bufferedImage.createGraphics()); gfx.type = type; return gfx; @@ -59,18 +77,29 @@ } public void flush() { - bufferedImage.flush(); + if (bufferedImage != null) { + bufferedImage.flush(); + } } public Graphics getGraphics() { + if (bufferedImage == null) { + return null; + } return bufferedImage.getGraphics(); } public int getHeight() { + if (bufferedImage == null) { + return -1; + } return bufferedImage.getHeight(); } public int getHeight(ImageObserver observer) { + if (bufferedImage == null) { + return -1; + } return bufferedImage.getHeight(observer); } @@ -79,49 +108,102 @@ } public Object getProperty(String name, ImageObserver observer) { + if (bufferedImage == null) { + return null; + } return bufferedImage.getProperty(name, observer); } public int getRGB(int x, int y) { + if (bufferedImage == null) { + throw new ArrayIndexOutOfBoundsException(err("disposed")); + } + + int width = bufferedImage.getWidth(); + int height = bufferedImage.getHeight(); + if (x < 0 || y < 0 || x >= width || y >= height) { + throw new ArrayIndexOutOfBoundsException(err("getRGB out of bounds")); + } + return bufferedImage.getRGB(x, y); } public int[] getRGB(int startX, int startY, int w, int h, int[] rgbArray, int offset, int scansize) { + if (bufferedImage == null) { + throw new ArrayIndexOutOfBoundsException(err("disposed")); + } + + int width = bufferedImage.getWidth(); + int height = bufferedImage.getHeight(); + if (startX < 0 || startY < 0 || startX + w > width || startY + h > height) { + throw new ArrayIndexOutOfBoundsException(err("getRGB(array) out of bounds")); + } + return bufferedImage.getRGB(startX, startY, w, h, rgbArray, offset, scansize); } public Image getScaledInstance(int width, int height, int hints) { + if (bufferedImage == null) { + return null; + } return bufferedImage.getScaledInstance(width, height, hints); } public ImageProducer getSource() { + if (bufferedImage == null) { + return null; + } return bufferedImage.getSource(); } public DVBBufferedImage getSubimage(int x, int y, int w, int h) throws DVBRasterFormatException { - BufferedImage subImage = bufferedImage.getSubimage(x, y, w, h); - return new DVBBufferedImage(subImage, this.type); + if (bufferedImage == null) { + return null; + } + try { + BufferedImage subImage = bufferedImage.getSubimage(x, y, w, h); + return new DVBBufferedImage(subImage, this.type); + } catch (RasterFormatException e) { + throw new DVBRasterFormatException(err(e.getMessage())); + } } public int getWidth() { + if (bufferedImage == null) { + return -1; + } return bufferedImage.getWidth(); } public int getWidth(ImageObserver observer) { + if (bufferedImage == null) { + return -1; + } return bufferedImage.getWidth(observer); } public void setRGB(int x, int y, int rgb) { - this.bufferedImage.setRGB(x, y, rgb); + if (bufferedImage == null) { + throw new ArrayIndexOutOfBoundsException(err("disposed")); + } + bufferedImage.setRGB(x, y, rgb); } public void setRGB(int startX, int startY, int w, int h, int[] rgbArray, int offset, int scansize) { + if (bufferedImage == null) { + throw new ArrayIndexOutOfBoundsException(err("disposed")); + } bufferedImage.setRGB(startX, startY, w, h, rgbArray, offset, scansize); } public String toString() { - return new String("DVBBufferedImage"); + return getClass().getName() + "[img=" + bufferedImage + "]"; + } + + private String err(String msg) { + System.err.println("DVBBufferedImage: " + msg); + return msg; } public static final int TYPE_ADVANCED = 20; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/DVBColor.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/DVBColor.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/DVBColor.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/DVBColor.java 2017-06-23 13:35:03.000000000 +0000 @@ -23,55 +23,45 @@ import javax.tv.graphics.AlphaColor; public class DVBColor extends AlphaColor { - public DVBColor(float r, float g, float b, float a) - { + public DVBColor(float r, float g, float b, float a) { super(r, g, b, a); } - public DVBColor(int r, int g, int b, int a) - { + public DVBColor(int r, int g, int b, int a) { super(r, g, b, a); } - public DVBColor(int rgba, boolean hasAlpha) - { + public DVBColor(int rgba, boolean hasAlpha) { super(rgba, hasAlpha); } - public DVBColor(Color color) - { + public DVBColor(Color color) { super(color); } - public Color brighter() - { - return super.brighter(); + public Color brighter() { + return new DVBColor(super.brighter()); } - public Color darker() - { - return super.darker(); + public Color darker() { + return new DVBColor(super.darker()); } - public boolean equals(Object obj) - { + public boolean equals(Object obj) { return super.equals(obj); } - public int getAlpha() - { + public int getAlpha() { return super.getAlpha(); } - public int getRGB() - { + public int getRGB() { return super.getRGB(); } - public String toString() - { + public String toString() { return super.toString(); } - + private static final long serialVersionUID = -5411538049776187650L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/DVBGraphics.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/DVBGraphics.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/DVBGraphics.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/DVBGraphics.java 2017-06-23 13:35:03.000000000 +0000 @@ -23,15 +23,10 @@ import java.awt.Graphics2D; public abstract class DVBGraphics extends Graphics2D { - protected DVBGraphics(Graphics2D gfx) - { - this.gfx = gfx; - } public abstract int[] getAvailableCompositeRules(); - public DVBColor getBestColorMatch(Color c) - { + public DVBColor getBestColorMatch(Color c) { return new DVBColor(c); } @@ -39,8 +34,7 @@ public abstract DVBAlphaComposite getDVBComposite(); - public int getType() - { + public int getType() { return type; } @@ -49,12 +43,9 @@ public abstract void setDVBComposite(DVBAlphaComposite comp) throws UnsupportedDrawingOperationException; - public String toString() - { - return getClass().getName() + "[font=" + getFont() + ",color=" - + getColor() + "]"; + public String toString() { + return getClass().getName() + "[font=" + getFont() + ",color=" + getColor() + "]"; } - + protected int type = DVBBufferedImage.TYPE_BASE; - protected Graphics2D gfx; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/DVBRasterFormatException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/DVBRasterFormatException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/DVBRasterFormatException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/DVBRasterFormatException.java 2017-06-23 13:35:03.000000000 +0000 @@ -19,11 +19,8 @@ package org.dvb.ui; -import java.awt.image.RasterFormatException; - -public class DVBRasterFormatException extends RasterFormatException { - public DVBRasterFormatException(String reason) - { +public class DVBRasterFormatException extends Exception { + public DVBRasterFormatException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/DVBTextLayoutManager.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/DVBTextLayoutManager.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/DVBTextLayoutManager.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/DVBTextLayoutManager.java 2017-06-23 13:35:03.000000000 +0000 @@ -25,14 +25,12 @@ public class DVBTextLayoutManager implements org.havi.ui.HTextLayoutManager { - public void render(String markedUpString, java.awt.Graphics g, HVisible v, Insets insets) - { + public void render(String markedUpString, java.awt.Graphics g, HVisible v, Insets insets) { /* this class is defined in GEM specifications */ logger.unimplemented("render(" + markedUpString + ")"); } - public DVBTextLayoutManager() - { + public DVBTextLayoutManager() { this(HORIZONTAL_START_ALIGN, VERTICAL_START_ALIGN, LINE_ORIENTATION_HORIZONTAL, START_CORNER_UPPER_LEFT, true, /* linespace = (point size of the default font for HVisible) + 7 */ 12 + 7, 0, 56); @@ -40,8 +38,7 @@ public DVBTextLayoutManager(int horizontalAlign, int verticalAlign, int lineOrientation, int startCorner, boolean wrap, int linespace, - int letterspace, int horizontalTabSpace) - { + int letterspace, int horizontalTabSpace) { this.horizontalAlign = horizontalAlign; this.verticalAlign = verticalAlign; this.lineOrientation = lineOrientation; @@ -52,103 +49,83 @@ this.horizontalTabSpace = horizontalTabSpace; } - public void setHorizontalAlign(int horizontalAlign) - { + public void setHorizontalAlign(int horizontalAlign) { this.horizontalAlign = horizontalAlign; } - public void setVerticalAlign(int verticalAlign) - { + public void setVerticalAlign(int verticalAlign) { this.verticalAlign = verticalAlign; } - public void setLineOrientation(int lineOrientation) - { + public void setLineOrientation(int lineOrientation) { this.lineOrientation = lineOrientation; } - public void setStartCorner(int startCorner) - { + public void setStartCorner(int startCorner) { this.startCorner = startCorner; } - public void setTextWrapping(boolean wrap) - { + public void setTextWrapping(boolean wrap) { this.wrap = wrap; } - public void setLineSpace(int lineSpace) - { + public void setLineSpace(int lineSpace) { this.linespace = lineSpace; } - public void setLetterSpace(int letterSpace) - { + public void setLetterSpace(int letterSpace) { this.letterspace = letterSpace; } - public void setHorizontalTabSpacing(int horizontalTabSpace) - { + public void setHorizontalTabSpacing(int horizontalTabSpace) { this.horizontalTabSpace = horizontalTabSpace; } - public int getHorizontalAlign() - { + public int getHorizontalAlign() { return horizontalAlign; } - public int getVerticalAlign() - { + public int getVerticalAlign() { return verticalAlign; } - public int getLineOrientation() - { + public int getLineOrientation() { return lineOrientation; } - public int getStartCorner() - { + public int getStartCorner() { return startCorner; } - public boolean getTextWrapping() - { + public boolean getTextWrapping() { return wrap; } - public int getLineSpace() - { + public int getLineSpace() { return linespace; } - public int getLetterSpace() - { + public int getLetterSpace() { return letterspace; } - public int getHorizontalTabSpacing() - { + public int getHorizontalTabSpacing() { return horizontalTabSpace; } - public void setInsets(Insets insets) - { + public void setInsets(Insets insets) { this.insets = insets; } - public Insets getInsets() - { + public Insets getInsets() { return this.insets; } - public void addTextOverflowListener(TextOverflowListener listener) - { + public void addTextOverflowListener(TextOverflowListener listener) { logger.unimplemented("addTextOverflowListener"); } - public void removeTextOverflowListener(TextOverflowListener listener) - { + public void removeTextOverflowListener(TextOverflowListener listener) { logger.unimplemented("removeTextOverflowListener"); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/FontFactory.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/FontFactory.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/FontFactory.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/FontFactory.java 2017-06-23 13:35:03.000000000 +0000 @@ -34,16 +34,22 @@ import org.videolan.Logger; public class FontFactory { - public static synchronized void loadDiscFonts() { + public static void loadDiscFonts() { unloadDiscFonts(); + + // fonts are loaded on demand } - public static synchronized void unloadDiscFonts() { - fonts = null; - fontIds = null; + public static void unloadDiscFonts() { + synchronized (fontsLock) { + fonts = null; + fontIds = null; + } } - private static synchronized void readDiscFonts() throws FontFormatException, IOException { + private static void readDiscFonts() throws FontFormatException, IOException { + synchronized (fontsLock) { + if (fonts != null) return; @@ -57,6 +63,7 @@ try { File fontFile = org.videolan.BDJLoader.addFont(data.getFileName()); if (fontFile == null) { + logger.error("error caching font"); throw new IOException("error caching font"); } @@ -84,7 +91,7 @@ } } } - + } } public FontFactory() throws FontFormatException, IOException { @@ -99,6 +106,7 @@ File fontFile = org.videolan.BDJLoader.addFont(inStream); if (fontFile == null) { + logger.error("error caching font"); throw new IOException("error caching font"); } @@ -118,10 +126,15 @@ } } + // used by root window / .bdjo default font public Font createFont(String fontId) { Font font = null; - synchronized (FontFactory.class) { - font = (Font)fontIds.get(fontId); + synchronized (fontsLock) { + if (fontIds == null) { + logger.error("no disc fonts loaded"); + } else { + font = (Font)fontIds.get(fontId); + } } if (font != null) { return font.deriveFont(0, 12); @@ -134,6 +147,7 @@ logger.info("Creating font: " + name + " " + style + " " + size); if (style < 0 || size <= 0 || (style & ~3) != 0) { + logger.error("invalid font size / style"); throw new IllegalArgumentException(); } @@ -148,8 +162,9 @@ /* Factory created for fonts in dvb.fontindex */ Font font = null; - synchronized (FontFactory.class) { - font = (Font)fonts.get(name + "." + style); + synchronized (fontsLock) { + if (fonts != null) + font = (Font)fonts.get(name + "." + style); } if (font == null) { @@ -162,6 +177,8 @@ private Font urlFont = null; + private static final Object fontsLock = new Object(); + private static Map fonts = null; private static Map fontIds = null; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/FontFormatException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/FontFormatException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/FontFormatException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/FontFormatException.java 2017-06-23 13:35:03.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.ui; public class FontFormatException extends Exception { - public FontFormatException() - { + public FontFormatException() { super(); } - public FontFormatException(String reason) - { + public FontFormatException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/FontNotAvailableException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/FontNotAvailableException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/FontNotAvailableException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/FontNotAvailableException.java 2017-06-23 13:35:03.000000000 +0000 @@ -20,13 +20,11 @@ package org.dvb.ui; public class FontNotAvailableException extends Exception { - public FontNotAvailableException() - { + public FontNotAvailableException() { super(); } - public FontNotAvailableException(String reason) - { + public FontNotAvailableException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/TestOpacity.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/TestOpacity.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/TestOpacity.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/TestOpacity.java 2017-06-23 13:35:03.000000000 +0000 @@ -20,7 +20,7 @@ package org.dvb.ui; public interface TestOpacity { - public boolean isOpaque(); + public boolean isOpaque(); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/UnsupportedDrawingOperationException.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/UnsupportedDrawingOperationException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/ui/UnsupportedDrawingOperationException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/ui/UnsupportedDrawingOperationException.java 2017-06-23 13:35:03.000000000 +0000 @@ -20,8 +20,7 @@ package org.dvb.ui; public class UnsupportedDrawingOperationException extends Exception { - public UnsupportedDrawingOperationException(String reason) - { + public UnsupportedDrawingOperationException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/user/Preference.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/user/Preference.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/user/Preference.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/user/Preference.java 2017-06-23 13:35:00.000000000 +0000 @@ -24,7 +24,6 @@ public class Preference { protected Preference() { - } public Preference(String name, String value) { @@ -113,15 +112,21 @@ } public String toString() { - String result = "Preference:" + name + "["; + StringBuffer result = new StringBuffer(); String comma = ""; + + result.append("Preference:"); + result.append(name); + result.append("["); + Iterator it = values.iterator(); while (it.hasNext()) { - result += comma + (String)it.next(); + result.append(comma); + result.append((String)it.next()); comma = ","; } - result += ']'; - return result; + result.append("]"); + return result.toString(); } private String name; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/user/UserPreferenceManager.java libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/user/UserPreferenceManager.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/dvb/user/UserPreferenceManager.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/dvb/user/UserPreferenceManager.java 2017-06-23 13:35:00.000000000 +0000 @@ -25,14 +25,17 @@ public class UserPreferenceManager { private UserPreferenceManager() { + org.videolan.Logger.getLogger("UserPreferenceManager").unimplemented("UserPreferenceManager"); } + private static final Object instanceLock = new Object(); + public static UserPreferenceManager getInstance() { - synchronized (UserPreferenceManager.class) { + synchronized (instanceLock) { if (instance == null) instance = new UserPreferenceManager(); + return instance; } - return instance; } public void read(Preference p) { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HActionEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HActionEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HActionEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HActionEvent.java 2017-06-23 13:35:05.000000000 +0000 @@ -23,23 +23,17 @@ import org.havi.ui.HActionInputPreferred; public class HActionEvent extends ActionEvent { - public HActionEvent(HActionInputPreferred source, int id, String command) - { + public HActionEvent(HActionInputPreferred source, int id, String command) { super(source, id, command); - - this.command = command; } - public String getActionCommand() - { - return command; + public String getActionCommand() { + return super.getActionCommand(); } - public int getModifiers() - { - return 0; + public int getModifiers() { + return super.getModifiers(); } - private String command; private static final long serialVersionUID = -906983727975217421L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HActionListener.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HActionListener.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HActionListener.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HActionListener.java 2017-06-23 13:35:05.000000000 +0000 @@ -22,5 +22,4 @@ import java.awt.event.ActionListener; public interface HActionListener extends ActionListener { - } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HAdjustmentEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HAdjustmentEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HAdjustmentEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HAdjustmentEvent.java 2017-06-23 13:35:05.000000000 +0000 @@ -23,8 +23,7 @@ import org.havi.ui.HAdjustmentInputPreferred; public class HAdjustmentEvent extends AWTEvent { - public HAdjustmentEvent(HAdjustmentInputPreferred source, int id) - { + public HAdjustmentEvent(HAdjustmentInputPreferred source, int id) { super(source, id); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HBackgroundImageEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HBackgroundImageEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HBackgroundImageEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HBackgroundImageEvent.java 2017-06-23 13:35:05.000000000 +0000 @@ -22,22 +22,18 @@ import java.util.EventObject; public class HBackgroundImageEvent extends EventObject { - public HBackgroundImageEvent(Object source, int id) - { + public HBackgroundImageEvent(Object source, int id) { super(source); - this.source = source; this.id = id; } - public Object getSource() - { - return source; + public int getID() { + return id; } - public int getID() - { - return id; + public String toString() { + return getClass().getName() + "[source=" + source + ",id=" + id + "]"; } public static final int BACKGROUNDIMAGE_FIRST = 1; @@ -47,7 +43,6 @@ public static final int BACKGROUNDIMAGE_INVALID = 4; public static final int BACKGROUNDIMAGE_LAST = 4; - private Object source; - private int id; + private final int id; private static final long serialVersionUID = 4941828555539092236L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HEventRepresentation.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HEventRepresentation.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HEventRepresentation.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HEventRepresentation.java 2017-06-23 13:35:06.000000000 +0000 @@ -22,9 +22,8 @@ import java.awt.Color; import java.awt.Image; -public class HEventRepresentation extends Object { - protected HEventRepresentation(boolean supported, String text, Color color, Image symbol) { - this.supported = supported; +public class HEventRepresentation { + protected HEventRepresentation(String text, Color color, Image symbol) { this.text = text; this.color = color; this.symbol = symbol; @@ -39,7 +38,7 @@ } public boolean isSupported() { - return supported; + return type != ER_TYPE_NOT_SUPPORTED; } protected void setType(int aType) { @@ -91,7 +90,6 @@ public static final int ER_TYPE_COLOR = 2; public static final int ER_TYPE_SYMBOL = 4; - private boolean supported; private String text; private Color color; private Image symbol; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HFocusEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HFocusEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HFocusEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HFocusEvent.java 2017-06-23 13:35:05.000000000 +0000 @@ -25,28 +25,26 @@ public static final int HFOCUS_LAST = FOCUS_TRANSFER; public static final int NO_TRANSFER_ID = -1; - public HFocusEvent(java.awt.Component source, int id) - { + public HFocusEvent(java.awt.Component source, int id) { super(source, id, false); this.transfer = NO_TRANSFER_ID; } - public HFocusEvent(java.awt.Component source, int id, int transfer) - { + public HFocusEvent(java.awt.Component source, int id, int transfer) { super(source, id, false); this.transfer = transfer; } - public boolean isTemporary() - { + public boolean isTemporary() { return false; } - public int getTransferId() - { - return transfer; + public int getTransferId() { + if (getID() == FOCUS_TRANSFER) + return transfer; + return NO_TRANSFER_ID; } private int transfer; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HFocusListener.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HFocusListener.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HFocusListener.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HFocusListener.java 2017-06-23 13:35:05.000000000 +0000 @@ -22,5 +22,4 @@ import java.awt.event.FocusListener; public interface HFocusListener extends FocusListener { - } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HItemEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HItemEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HItemEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HItemEvent.java 2017-06-23 13:35:05.000000000 +0000 @@ -24,18 +24,20 @@ import org.havi.ui.HSelectionInputPreferred; public class HItemEvent extends AWTEvent { - public HItemEvent(HSelectionInputPreferred source, int id, Object item) - { + public HItemEvent(HSelectionInputPreferred source, int id, Object item) { super(source, id); this.item = item; } - public Object getItem() - { + public Object getItem() { return item; } + public String toString() { + return getClass().getName() + "[source=" + source + ",id=" + id + ",item=" + item + "]"; + } + public static final int ITEM_FIRST = HAdjustmentEvent.ADJUST_LAST + 1; public static final int ITEM_START_CHANGE = ITEM_FIRST; public static final int ITEM_TOGGLE_SELECTED = ITEM_FIRST + 1; @@ -52,6 +54,6 @@ public static final int ITEM_END_CHANGE = ITEM_FIRST + 12; public static final int ITEM_LAST = ITEM_FIRST + 12; - private Object item; + private final Object item; private static final long serialVersionUID = -487680187698958380L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HKeyEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HKeyEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HKeyEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HKeyEvent.java 2017-06-23 13:35:05.000000000 +0000 @@ -23,16 +23,14 @@ public class HKeyEvent extends HRcEvent { public HKeyEvent(Component source, int id, long when, int modifiers, - int keyCode, char keyChar) - { + int keyCode, char keyChar) { super(source, id, when, modifiers, keyCode, keyChar); } public HKeyEvent(Component source, int id, long when, int modifiers, - int keyCode) - { + int keyCode) { super(source, id, when, modifiers, keyCode); } - + private static final long serialVersionUID = 1896658905645675252L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HKeyListener.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HKeyListener.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HKeyListener.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HKeyListener.java 2017-06-23 13:35:05.000000000 +0000 @@ -22,5 +22,4 @@ import java.awt.event.KeyListener; public interface HKeyListener extends KeyListener { - } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HMouseCapabilities.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HMouseCapabilities.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HMouseCapabilities.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HMouseCapabilities.java 2017-06-23 13:35:06.000000000 +0000 @@ -20,13 +20,10 @@ package org.havi.ui.event; public class HMouseCapabilities { - protected HMouseCapabilities() - { - + protected HMouseCapabilities() { } - public static boolean getInputDeviceSupported() - { - return true; + public static boolean getInputDeviceSupported() { + return false; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HRcCapabilities.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HRcCapabilities.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HRcCapabilities.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HRcCapabilities.java 2017-06-23 13:35:05.000000000 +0000 @@ -34,7 +34,7 @@ public static HEventRepresentation getRepresentation(int keyCode) { if (!isSupported(keyCode)) return null; - return new HEventRepresentation(true, getKeyText(keyCode), getKeyColor(keyCode), null); + return new HEventRepresentation(getKeyText(keyCode), getKeyColor(keyCode), null); } public static boolean getInputDeviceSupported() { @@ -71,7 +71,7 @@ case HRcEvent.VK_BASS_BOOST_UP: return "Bass Boost Up"; case HRcEvent.VK_CHANNEL_DOWN: - return "Channel DOwn"; + return "Channel Down"; case HRcEvent.VK_CHANNEL_UP: return "Channel Up"; case HRcEvent.VK_CLEAR_FAVORITE_0: diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HRcEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HRcEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HRcEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HRcEvent.java 2017-06-23 13:35:05.000000000 +0000 @@ -24,17 +24,21 @@ public class HRcEvent extends KeyEvent { public HRcEvent(Component source, int id, long when, int modifiers, - int keyCode) - { + int keyCode) { super(source, id, when, modifiers, keyCode, (char)keyCode); } public HRcEvent(Component source, int id, long when, int modifiers, - int keyCode, char keyChar) - { + int keyCode, char keyChar) { super(source, id, when, modifiers, keyCode, keyChar); } + public String toString() { + return getClass().getName() + "[source=" + this.source + ",id=" + getID() + + ",when=" + getWhen() + ",modifiers=" + getModifiers() + + ",keyCode=" + getKeyCode() + ",keyChar=" + getKeyChar() + "]"; + } + public static final int RC_FIRST = 400; public static final int VK_COLORED_KEY_0 = 403; public static final int VK_COLORED_KEY_1 = VK_COLORED_KEY_0 + 1; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenConfigurationEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenConfigurationEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenConfigurationEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenConfigurationEvent.java 2017-06-23 13:35:06.000000000 +0000 @@ -20,10 +20,9 @@ package org.havi.ui.event; public class HScreenConfigurationEvent extends java.util.EventObject { - public HScreenConfigurationEvent(Object source) - { + public HScreenConfigurationEvent(Object source) { super(source); } - + private static final long serialVersionUID = 8631615705134051342L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenDeviceReleasedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenDeviceReleasedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenDeviceReleasedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenDeviceReleasedEvent.java 2017-06-23 13:35:05.000000000 +0000 @@ -22,18 +22,9 @@ import org.davic.resources.ResourceStatusEvent; public class HScreenDeviceReleasedEvent extends ResourceStatusEvent { - public HScreenDeviceReleasedEvent(Object source) - { + public HScreenDeviceReleasedEvent(Object source) { super(source); - - this.source = source; - } - - public Object getSource() - { - return source; } - private Object source; private static final long serialVersionUID = -5310071769898889888L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenDeviceReservedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenDeviceReservedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenDeviceReservedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenDeviceReservedEvent.java 2017-06-23 13:35:05.000000000 +0000 @@ -22,18 +22,9 @@ import org.davic.resources.ResourceStatusEvent; public class HScreenDeviceReservedEvent extends ResourceStatusEvent { - public HScreenDeviceReservedEvent(Object source) - { + public HScreenDeviceReservedEvent(Object source) { super(source); - - this.source = source; - } - - public Object getSource() - { - return source; } - private Object source; private static final long serialVersionUID = 944596304967870290L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenLocationModifiedEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenLocationModifiedEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenLocationModifiedEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HScreenLocationModifiedEvent.java 2017-06-23 13:35:05.000000000 +0000 @@ -22,18 +22,9 @@ import java.util.EventObject; public class HScreenLocationModifiedEvent extends EventObject { - public HScreenLocationModifiedEvent(Object source) - { + public HScreenLocationModifiedEvent(Object source) { super(source); - - this.source = source; - } - - public Object getSource() - { - return source; } - private Object source; private static final long serialVersionUID = -2915447586541903280L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HTextEvent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HTextEvent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/event/HTextEvent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/event/HTextEvent.java 2017-06-23 13:35:05.000000000 +0000 @@ -23,8 +23,7 @@ import java.awt.AWTEvent; public class HTextEvent extends AWTEvent { - public HTextEvent(HKeyboardInputPreferred source, int id) - { + public HTextEvent(HKeyboardInputPreferred source, int id) { super(source, id); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HActionInputPreferred.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HActionInputPreferred.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HActionInputPreferred.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HActionInputPreferred.java 2017-06-23 13:35:06.000000000 +0000 @@ -21,8 +21,7 @@ import org.havi.ui.event.HActionEvent; -public interface HActionInputPreferred -{ +public interface HActionInputPreferred { public void processHActionEvent(HActionEvent event); public String getActionCommand(); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HAnimateLook.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HAnimateLook.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HAnimateLook.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HAnimateLook.java 2017-06-23 13:35:07.000000000 +0000 @@ -21,60 +21,59 @@ import java.awt.Graphics; import java.awt.Dimension; +import java.awt.Insets; + +import org.videolan.Logger; public class HAnimateLook implements HExtendedLook { - public HAnimateLook() - { - org.videolan.Logger.unimplemented(HAnimateLook.class.getName(), ""); + public HAnimateLook() { + logger.unimplemented(""); } - public void fillBackground(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void fillBackground(Graphics g, HVisible visible, int state) { + logger.unimplemented(""); } - public void renderBorders(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void renderBorders(Graphics g, HVisible visible, int state) { + logger.unimplemented(""); } - public void renderVisible(java.awt.Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void renderVisible(Graphics g, HVisible visible, int state) { + logger.unimplemented("renderVisible"); } - public void showLook(java.awt.Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void showLook(Graphics g, HVisible visible, int state) { + logger.unimplemented("renderVisible"); } - public void widgetChanged(HVisible visible, HChangeData[] changes) - { - throw new Error("Not implemented"); + public void widgetChanged(HVisible visible, HChangeData[] changes) { + logger.unimplemented("renderVisible"); } - public Dimension getMinimumSize(HVisible hvisible) - { - throw new Error("Not implemented"); + public Dimension getMinimumSize(HVisible hvisible) { + logger.unimplemented("getMinimumSize"); + return hvisible.getSize(); } - public Dimension getPreferredSize(HVisible hvisible) - { - throw new Error("Not implemented"); + public Dimension getPreferredSize(HVisible hvisible) { + logger.unimplemented("getPreferredSize"); + return hvisible.getSize(); } - public Dimension getMaximumSize(HVisible hvisible) - { - throw new Error("Not implemented"); + public Dimension getMaximumSize(HVisible hvisible) { + logger.unimplemented("getMaximumSize"); + return hvisible.getSize(); } - public boolean isOpaque(HVisible visible) - { - throw new Error("Not implemented"); + public boolean isOpaque(HVisible visible) { + logger.unimplemented("getMaximumSize"); + return false; } - public java.awt.Insets getInsets(HVisible hvisible) - { - throw new Error("Not implemented"); + public Insets getInsets(HVisible hvisible) { + logger.unimplemented("getMaximumSize"); + return new Insets(0, 0, 0, 0); } + + private static final Logger logger = Logger.getLogger(HAnimateLook.class.getName()); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HAnimation.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HAnimation.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HAnimation.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HAnimation.java 2017-06-23 13:35:07.000000000 +0000 @@ -23,109 +23,102 @@ import org.havi.ui.event.HFocusEvent; import org.havi.ui.event.HFocusListener; +import org.videolan.Logger; + public class HAnimation extends HStaticAnimation implements HNavigable { - public HAnimation() - { - org.videolan.Logger.unimplemented(HAnimation.class.getName(), ""); + public HAnimation() { + this(null, 1, 1, -1); } - public HAnimation(Image[] images, int delay, int playMode, int repeatCount, - int x, int y, int width, int height) - { - org.videolan.Logger.unimplemented(HAnimation.class.getName(), ""); + public HAnimation(Image[] images, int delay, int playMode, int repeatCount) { + this(images, null, delay, playMode, repeatCount, 0, 0, 0, 0); } - public HAnimation(Image[] imagesNormal, Image[] imagesFocused, int delay, - int playMode, int repeatCount, int x, int y, int width, int height) - { - org.videolan.Logger.unimplemented(HAnimation.class.getName(), ""); + public HAnimation(Image[] images, int delay, int playMode, int repeatCount, + int x, int y, int width, int height) { + this(images, null, delay, playMode, repeatCount, x, y, width, height); } - public HAnimation(Image[] images, int delay, int playMode, int repeatCount) - { - org.videolan.Logger.unimplemented(HAnimation.class.getName(), ""); + public HAnimation(Image[] imagesNormal, Image[] imagesFocused, int delay, + int playMode, int repeatCount) { + this(imagesNormal, imagesFocused, delay, playMode, repeatCount, 0, 0, 0, 0); } public HAnimation(Image[] imagesNormal, Image[] imagesFocused, int delay, - int playMode, int repeatCount) - { - org.videolan.Logger.unimplemented(HAnimation.class.getName(), ""); + int playMode, int repeatCount, int x, int y, int width, int height) { + + super(imagesNormal, delay, playMode, repeatCount, x, y, width, height); + + logger.unimplemented(""); } - public static void setDefaultLook(HAnimateLook hlook) - { + public static void setDefaultLook(HAnimateLook hlook) { DefaultLook = hlook; } - public static HAnimateLook getDefaultLook() - { + public static HAnimateLook getDefaultLook() { if (DefaultLook == null) - org.videolan.Logger.unimplemented("", "getDefaultLook"); + logger.unimplemented("getDefaultLook"); return DefaultLook; } - public void setMove(int keyCode, HNavigable target) - { - throw new Error("Not implemented"); + public void setMove(int keyCode, HNavigable target) { + logger.unimplemented("setMove"); } - public HNavigable getMove(int keyCode) - { - throw new Error("Not implemented"); + public HNavigable getMove(int keyCode) { + logger.unimplemented("getMove"); + return null; } public void setFocusTraversal(HNavigable up, HNavigable down, - HNavigable left, HNavigable right) - { - throw new Error("Not implemented"); + HNavigable left, HNavigable right) { + logger.unimplemented("setFocusTravelsal"); } - public boolean isSelected() - { - throw new Error("Not implemented"); + public boolean isSelected() { + logger.unimplemented(""); + return false; } - public void setGainFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setGainFocusSound(HSound sound) { + logger.unimplemented(""); } - public void setLoseFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setLoseFocusSound(HSound sound) { + logger.unimplemented(""); } - public HSound getGainFocusSound() - { - throw new Error("Not implemented"); + public HSound getGainFocusSound() { + logger.unimplemented(""); + return null; } - public HSound getLoseFocusSound() - { - throw new Error("Not implemented"); + public HSound getLoseFocusSound() { + logger.unimplemented(""); + return null; } - public void addHFocusListener(HFocusListener listener) - { - throw new Error("Not implemented"); + public void addHFocusListener(HFocusListener listener) { + logger.unimplemented(""); } - public void removeHFocusListener(HFocusListener listener) - { - throw new Error("Not implemented"); + public void removeHFocusListener(HFocusListener listener) { + logger.unimplemented(""); } - public int[] getNavigationKeys() - { - throw new Error("Not implemented"); + public int[] getNavigationKeys() { + logger.unimplemented(""); + return null; } - public void processHFocusEvent(HFocusEvent event) - { - throw new Error("Not implemented"); + public void processHFocusEvent(HFocusEvent event) { + logger.unimplemented(""); } private static HAnimateLook DefaultLook = null; + private static final Logger logger = Logger.getLogger(HAnimation.class.getName()); + private static final long serialVersionUID = 4460392782940525395L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HBackgroundConfiguration.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HBackgroundConfiguration.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HBackgroundConfiguration.java 2015-04-07 19:56:47.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HBackgroundConfiguration.java 2017-06-23 13:35:05.000000000 +0000 @@ -23,7 +23,6 @@ public class HBackgroundConfiguration extends HScreenConfiguration { protected HBackgroundConfiguration() { - } protected HBackgroundConfiguration(HBackgroundConfigTemplate hbct, Color color) { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HBackgroundDevice.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HBackgroundDevice.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HBackgroundDevice.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HBackgroundDevice.java 2017-06-23 13:35:08.000000000 +0000 @@ -53,7 +53,7 @@ public HBackgroundConfiguration getBestConfiguration(HBackgroundConfigTemplate hbcta[]) { int score = -1; HBackgroundConfiguration hbc = null; - for (int i = 0; i < hbcArray.length; i++) + for (int i = 0; i < hbcArray.length; i++) for (int j = 0; j < hbcta.length; j++) if (hbcta[j].match(hbcArray[i]) > score) hbc = hbcArray[i]; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HBackgroundImage.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HBackgroundImage.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HBackgroundImage.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HBackgroundImage.java 2017-06-23 13:35:07.000000000 +0000 @@ -40,6 +40,10 @@ } public HBackgroundImage(byte pixels[]) { + if (pixels == null) { + System.err.println("null pixels from " + org.videolan.Logger.dumpStack()); + return; + } producer = new ByteArrayImageSource(pixels); img = Toolkit.getDefaultToolkit().createImage(producer); } @@ -100,7 +104,7 @@ } for (int i = 0; i < list.size(); i++) { HBackgroundImageListener listener = (HBackgroundImageListener)list.get(i); - if (event.getID()== HBackgroundImageEvent.BACKGROUNDIMAGE_LOADED) + if (event.getID() == HBackgroundImageEvent.BACKGROUNDIMAGE_LOADED) listener.imageLoaded(event); else listener.imageLoadFailed(event); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HChangeData.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HChangeData.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HChangeData.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HChangeData.java 2017-06-23 13:35:07.000000000 +0000 @@ -19,14 +19,13 @@ package org.havi.ui; -public class HChangeData -{ - public HChangeData(int hint, Object data) - { +public class HChangeData { + + public HChangeData(int hint, Object data) { this.hint = hint; this.data = data; } - + public int hint; public Object data; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HComponent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HComponent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HComponent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HComponent.java 2017-06-23 13:35:07.000000000 +0000 @@ -26,41 +26,34 @@ import java.awt.BDToolkit; -public abstract class HComponent extends Component implements HMatteLayer, - TestOpacity { - public HComponent() - { +public abstract class HComponent extends Component implements HMatteLayer, TestOpacity { + + public HComponent() { this(0, 0, 0, 0); BDToolkit.addComponent(this); } - public HComponent(int x, int y, int width, int height) - { + public HComponent(int x, int y, int width, int height) { setBounds(x, y, width, height); } - public void setMatte(HMatte m) throws HMatteException - { + public void setMatte(HMatte m) throws HMatteException { matte = m; } - public HMatte getMatte() - { + public HMatte getMatte() { return matte; } - public boolean isDoubleBuffered() - { + public boolean isDoubleBuffered() { return false; } - public boolean isOpaque() - { + public boolean isOpaque() { return false; } - public void setEnabled(boolean b) - { + public void setEnabled(boolean b) { if (b != super.isEnabled()) { super.setEnabled(b); super.setFocusable(b); @@ -68,13 +61,11 @@ } } - public boolean isEnabled() - { + public boolean isEnabled() { return super.isEnabled(); } - protected void processEvent(AWTEvent event) - { + protected void processEvent(AWTEvent event) { org.videolan.Logger.unimplemented(HComponent.class.getName(), "processEvent"); super.processEvent(event); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HConfigurationException.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HConfigurationException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HConfigurationException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HConfigurationException.java 2017-06-23 13:35:07.000000000 +0000 @@ -20,13 +20,11 @@ package org.havi.ui; public class HConfigurationException extends java.lang.Exception { - public HConfigurationException() - { + public HConfigurationException() { super(); } - public HConfigurationException(String reason) - { + public HConfigurationException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HContainer.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HContainer.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HContainer.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HContainer.java 2017-06-23 13:35:04.000000000 +0000 @@ -27,39 +27,32 @@ public class HContainer extends Container implements HMatteLayer, HComponentOrdering, TestOpacity { - public HContainer() - { + public HContainer() { this(0,0,0,0); } - public HContainer(int x, int y, int width, int height) - { + public HContainer(int x, int y, int width, int height) { setBounds(x,y,width,height); } - public void setMatte(HMatte m) throws HMatteException - { + public void setMatte(HMatte m) throws HMatteException { org.videolan.Logger.unimplemented("HContainer", "setMatte"); throw new HMatteException("Matte is not supported"); } - public HMatte getMatte() - { - return hMatte; + public HMatte getMatte() { + return null; } - public boolean isDoubleBuffered() - { + public boolean isDoubleBuffered() { return false; // can this be true ? } - public boolean isOpaque() - { + public boolean isOpaque() { return false; // can this be true ? } - private int getOffset(java.awt.Component c) throws ArrayIndexOutOfBoundsException - { + private int getOffset(java.awt.Component c) throws ArrayIndexOutOfBoundsException { Component cs[] = getComponents(); for (int i = 0; i < cs.length; ++i) if (cs[i] == c) return i; @@ -67,28 +60,21 @@ throw new ArrayIndexOutOfBoundsException("Component not contained within"); } - private void checkLineage(java.awt.Component c) - { + private void checkLineage(java.awt.Component c) { if (c.getParent() != this) throw new ArrayIndexOutOfBoundsException("Component not contained within"); } - public Component addBefore(Component component, Component behind) - { + public Component addBefore(Component component, Component behind) { // check to see if behind is an element of this container - try - { + try { getOffset(behind); - } - catch (Exception e) - { + } catch (Exception e) { return null; } if (component == behind) return component; - synchronized (getTreeLock()) - { - try - { + synchronized (getTreeLock()) { + try { // Explicitly remove component if in this container. // Should have no effect if not in this container. // This must be done so that problems don't occur @@ -98,31 +84,23 @@ int offset = getOffset(behind); return add(component, offset); - } - catch (Exception e) - { + } catch (Exception e) { return null; } } } - public Component addAfter(Component component, Component front) - { + public Component addAfter(Component component, Component front) { // check to see if front is an element of this container - try - { + try { getOffset(front); - } - catch (Exception e) - { + } catch (Exception e) { return null; } if (component == front) return component; - synchronized (getTreeLock()) - { - try - { + synchronized (getTreeLock()) { + try { // Explicitly remove component if in this container. // Should have no effect if not in this container. // This must be done so that problems don't occur @@ -132,20 +110,15 @@ int offset = getOffset(front); return add(component, offset + 1); - } - catch (Exception e) - { + } catch (Exception e) { return null; } } } - public boolean popToFront(Component component) - { - synchronized (getTreeLock()) - { - try - { + public boolean popToFront(Component component) { + synchronized (getTreeLock()) { + try { // Ensure it is there checkLineage(component); @@ -154,20 +127,15 @@ remove(component); add(component, 0); return true; - } - catch (Exception e) - { + } catch (Exception e) { return false; } } } - public boolean pushToBack(Component component) - { - synchronized (getTreeLock()) - { - try - { + public boolean pushToBack(Component component) { + synchronized (getTreeLock()) { + try { // Ensure it is there checkLineage(component); @@ -176,77 +144,58 @@ remove(component); add(component, -1); return true; - } - catch (Exception e) - { + } catch (Exception e) { return false; } } } - public boolean pop(Component component) - { - synchronized (getTreeLock()) - { - try - { + public boolean pop(Component component) { + synchronized (getTreeLock()) { + try { int offset = getOffset(component); - if (offset > 0) - { + if (offset > 0) { // explicitly remove component // (even if reparenting is implicit) remove(component); add(component, offset - 1); return true; } - } - catch (Exception e) - { + } catch (Exception e) { } return false; } } - public boolean push(Component component) - { - synchronized (getTreeLock()) - { - try - { + public boolean push(Component component) { + synchronized (getTreeLock()) { + try { int offset = getOffset(component); int count = getComponentCount(); - if (offset == (count - 1)) - { + if (offset == (count - 1)) { return true; } - if (offset < (count - 1)) - { + if (offset < (count - 1)) { // explicitly remove component // (even if reparenting is implicit) remove(component); add(component, offset + 1); return true; } - } - catch (Exception e) - { + } catch (Exception e) { } return false; } } - public boolean popInFrontOf(Component move, Component behind) - { - synchronized (getTreeLock()) - { - try - { - if (move != behind) - { + public boolean popInFrontOf(Component move, Component behind) { + synchronized (getTreeLock()) { + try { + if (move != behind) { // Ensure they are present checkLineage(move); checkLineage(behind); @@ -258,22 +207,16 @@ addBefore(move, behind); } return true; - } - catch (Exception e) - { + } catch (Exception e) { return false; } } } - public boolean pushBehind(Component move, Component front) - { - synchronized (getTreeLock()) - { - try - { - if (move != front) - { + public boolean pushBehind(Component move, Component front) { + synchronized (getTreeLock()) { + try { + if (move != front) { // Ensure they are present checkLineage(move); checkLineage(front); @@ -285,30 +228,24 @@ addAfter(move, front); } return true; - } - catch (Exception e) - { + } catch (Exception e) { return false; } } } - public void group() - { + public void group() { grouped = true; } - public void ungroup() - { + public void ungroup() { grouped = false; } - public boolean isGrouped() - { + public boolean isGrouped() { return grouped; } - private HMatte hMatte = null; private boolean grouped = false; private static final long serialVersionUID = 263606166411114032L; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HDefaultTextLayoutManager.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HDefaultTextLayoutManager.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HDefaultTextLayoutManager.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HDefaultTextLayoutManager.java 2017-06-23 13:35:06.000000000 +0000 @@ -31,8 +31,7 @@ public class HDefaultTextLayoutManager implements HTextLayoutManager { static final Insets ZERO_INSETS = new Insets(0, 0, 0, 0); - public HDefaultTextLayoutManager() - { + public HDefaultTextLayoutManager() { } public Dimension getMinimumSize(HVisible hvisible) @@ -67,18 +66,15 @@ return size; } - public Dimension getMaximumSize(HVisible hvisible) - { + public Dimension getMaximumSize(HVisible hvisible) { return new Dimension(Short.MAX_VALUE, Short.MAX_VALUE); } - public Dimension getPreferredSize(HVisible hvisible) - { + public Dimension getPreferredSize(HVisible hvisible) { return getMinimumSize(hvisible); } - public void render(String markedUpString, Graphics g, HVisible v, Insets insets) - { + public void render(String markedUpString, Graphics g, HVisible v, Insets insets) { if (markedUpString == null) return; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HEmulatedGraphicsConfiguration.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HEmulatedGraphicsConfiguration.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HEmulatedGraphicsConfiguration.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HEmulatedGraphicsConfiguration.java 2017-06-23 13:35:08.000000000 +0000 @@ -20,25 +20,21 @@ package org.havi.ui; public class HEmulatedGraphicsConfiguration extends HGraphicsConfiguration { - protected HEmulatedGraphicsConfiguration() - { + protected HEmulatedGraphicsConfiguration() { org.videolan.Logger.unimplemented(null, "HEmulatedGraphicsConfiguration"); } - public HGraphicsConfigTemplate getConfigTemplate() - { + public HGraphicsConfigTemplate getConfigTemplate() { org.videolan.Logger.unimplemented("HEmulatedGraphicsConfiguration", "getConfigTemplate"); return null; } - public HGraphicsConfigTemplate getEmulation() - { + public HGraphicsConfigTemplate getEmulation() { org.videolan.Logger.unimplemented("HEmulatedGraphicsConfiguration", "getEmulation"); return null; } - public HGraphicsConfigTemplate getImplementation() - { + public HGraphicsConfigTemplate getImplementation() { org.videolan.Logger.unimplemented("HEmulatedGraphicsConfiguration", "getImplementation"); return null; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HEmulatedGraphicsDevice.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HEmulatedGraphicsDevice.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HEmulatedGraphicsDevice.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HEmulatedGraphicsDevice.java 2017-06-23 13:35:08.000000000 +0000 @@ -20,15 +20,13 @@ package org.havi.ui; public abstract class HEmulatedGraphicsDevice extends HGraphicsDevice { - protected HEmulatedGraphicsDevice() - { + protected HEmulatedGraphicsDevice() { org.videolan.Logger.unimplemented(null, "HEmulatedGraphicsDevice"); } public boolean setGraphicsConfiguration(HEmulatedGraphicsConfiguration hegc) throws SecurityException, HPermissionDeniedException, - HConfigurationException - { + HConfigurationException { org.videolan.Logger.unimplemented("HEmulatedGraphicsDevice", "setGraphicsConfiguration"); return false; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HEventMulticaster.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HEventMulticaster.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HEventMulticaster.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HEventMulticaster.java 2017-06-23 13:35:07.000000000 +0000 @@ -49,17 +49,15 @@ HItemListener, HTextListener, HKeyListener, ResourceStatusListener { - protected HEventMulticaster(EventListener a, EventListener b) - { + protected HEventMulticaster(EventListener a, EventListener b) { this.a = a; this.b = b; } - protected EventListener remove(EventListener oldListener) - { - if (oldListener == a) + protected EventListener remove(EventListener oldListener) { + if (oldListener == a) return b; - else if (oldListener == b) + else if (oldListener == b) return a; EventListener a2 = removeInternal(a, oldListener); EventListener b2 = removeInternal(b, oldListener); @@ -69,8 +67,7 @@ return addInternal(a2, b2); } - protected static EventListener addInternal(EventListener a, EventListener b) - { + protected static EventListener addInternal(EventListener a, EventListener b) { if (a == null) return b; else if (b == null) @@ -80,8 +77,7 @@ } protected static EventListener removeInternal(EventListener listener, - EventListener oldListener) - { + EventListener oldListener) { if (listener == null || listener.equals(oldListener)) return null; else if (listener instanceof HEventMulticaster) @@ -91,26 +87,22 @@ } public static HBackgroundImageListener add(HBackgroundImageListener a, - HBackgroundImageListener b) - { + HBackgroundImageListener b) { return (HBackgroundImageListener) addInternal(a, b); } public static HBackgroundImageListener remove( HBackgroundImageListener listener, - HBackgroundImageListener oldListener) - { + HBackgroundImageListener oldListener) { return (HBackgroundImageListener) removeInternal(listener, oldListener); } - public static WindowListener add(WindowListener a, WindowListener b) - { + public static WindowListener add(WindowListener a, WindowListener b) { return (WindowListener) addInternal(a, b); } public static WindowListener remove(WindowListener listener, - WindowListener oldListener) - { + WindowListener oldListener) { return (WindowListener) removeInternal(listener, oldListener); } @@ -122,247 +114,205 @@ public static HScreenConfigurationListener add( HScreenConfigurationListener a, HScreenConfigurationListener b, - HScreenConfigTemplate template) - { - + HScreenConfigTemplate template) { return (HScreenConfigurationListener) addInternal(a, b); } public static HScreenConfigurationListener remove( HScreenConfigurationListener listener, - HScreenConfigurationListener oldListener) - { + HScreenConfigurationListener oldListener) { return (HScreenConfigurationListener) removeInternal(listener, oldListener); } public static HScreenLocationModifiedListener add( - HScreenLocationModifiedListener a, HScreenLocationModifiedListener b) - { + HScreenLocationModifiedListener a, HScreenLocationModifiedListener b) { return (HScreenLocationModifiedListener) addInternal(a, b); } public static HScreenLocationModifiedListener remove( HScreenLocationModifiedListener listener, - HScreenLocationModifiedListener oldListener) - { + HScreenLocationModifiedListener oldListener) { return (HScreenLocationModifiedListener) removeInternal(listener, oldListener); } - public static HTextListener add(HTextListener a, HTextListener b) - { + public static HTextListener add(HTextListener a, HTextListener b) { return (HTextListener) addInternal(a, b); } public static HTextListener remove(HTextListener listener, - HTextListener oldListener) - { + HTextListener oldListener) { return (HTextListener) removeInternal(listener, oldListener); } - public static HItemListener add(HItemListener a, HItemListener b) - { + public static HItemListener add(HItemListener a, HItemListener b) { return (HItemListener) addInternal(a, b); } public static HItemListener remove(HItemListener listener, - HItemListener oldListener) - { + HItemListener oldListener) { return (HItemListener) removeInternal(listener, oldListener); } - public static HFocusListener add(HFocusListener a, HFocusListener b) - { + public static HFocusListener add(HFocusListener a, HFocusListener b) { return (HFocusListener) addInternal(a, b); } public static HFocusListener remove(HFocusListener listener, - HFocusListener oldListener) - { + HFocusListener oldListener) { return (HFocusListener) removeInternal(listener, oldListener); } public static HAdjustmentListener add(HAdjustmentListener a, - HAdjustmentListener b) - { + HAdjustmentListener b) { return (HAdjustmentListener) addInternal(a, b); } public static HAdjustmentListener remove(HAdjustmentListener listener, - HAdjustmentListener oldListener) - { + HAdjustmentListener oldListener) { return (HAdjustmentListener) removeInternal(listener, oldListener); } - public static HActionListener add(HActionListener a, HActionListener b) - { + public static HActionListener add(HActionListener a, HActionListener b) { return (HActionListener) addInternal(a, b); } public static HActionListener remove(HActionListener listener, - HActionListener oldListener) - { + HActionListener oldListener) { return (HActionListener) removeInternal(listener, oldListener); } - public static HKeyListener add(HKeyListener a, HKeyListener b) - { + public static HKeyListener add(HKeyListener a, HKeyListener b) { return (HKeyListener) addInternal(a, b); } public static HKeyListener remove(HKeyListener listener, - HKeyListener oldListener) - { + HKeyListener oldListener) { return (HKeyListener) removeInternal(listener, oldListener); } public static ResourceStatusListener add(ResourceStatusListener a, - ResourceStatusListener b) - { + ResourceStatusListener b) { return (ResourceStatusListener) addInternal(a, b); } public static ResourceStatusListener remove( - ResourceStatusListener listener, ResourceStatusListener oldListener) - { + ResourceStatusListener listener, ResourceStatusListener oldListener) { return (ResourceStatusListener) removeInternal(listener, oldListener); } - public void imageLoaded(HBackgroundImageEvent event) - { + public void imageLoaded(HBackgroundImageEvent event) { if (a != null) ((HBackgroundImageListener)a).imageLoaded(event); if (b != null) ((HBackgroundImageListener)b).imageLoaded(event); } - public void imageLoadFailed(HBackgroundImageEvent event) - { + public void imageLoadFailed(HBackgroundImageEvent event) { if (a != null) ((HBackgroundImageListener)a).imageLoadFailed(event); if (b != null) ((HBackgroundImageListener)b).imageLoadFailed(event); } - public void report(HScreenConfigurationEvent event) - { + public void report(HScreenConfigurationEvent event) { if (a != null) ((HScreenConfigurationListener)a).report(event); if (b != null) ((HScreenConfigurationListener)b).report(event); } - public void report(HScreenLocationModifiedEvent event) - { + public void report(HScreenLocationModifiedEvent event) { if (a != null) ((HScreenLocationModifiedListener)a).report(event); if (b != null) ((HScreenLocationModifiedListener)b).report(event); } - public void windowOpened(WindowEvent event) - { + public void windowOpened(WindowEvent event) { if (a != null) ((WindowListener)a).windowOpened(event); if (b != null) ((WindowListener)b).windowOpened(event); } - public void windowClosing(WindowEvent event) - { + public void windowClosing(WindowEvent event) { if (a != null) ((WindowListener)a).windowClosing(event); if (b != null) ((WindowListener)b).windowClosing(event); } - public void windowClosed(WindowEvent event) - { + public void windowClosed(WindowEvent event) { if (a != null) ((WindowListener)a).windowClosed(event); if (b != null) ((WindowListener)b).windowClosed(event); } - public void windowIconified(WindowEvent event) - { + public void windowIconified(WindowEvent event) { if (a != null) ((WindowListener)a).windowIconified(event); if (b != null) ((WindowListener)b).windowIconified(event); } - public void windowDeiconified(WindowEvent event) - { + public void windowDeiconified(WindowEvent event) { if (a != null) ((WindowListener)a).windowDeiconified(event); if (b != null) ((WindowListener)b).windowDeiconified(event); } - public void windowActivated(WindowEvent event) - { + public void windowActivated(WindowEvent event) { if (a != null) ((WindowListener)a).windowActivated(event); if (b != null) ((WindowListener)b).windowActivated(event); } - public void windowDeactivated(WindowEvent event) - { + public void windowDeactivated(WindowEvent event) { if (a != null) ((WindowListener)a).windowDeactivated(event); if (b != null) ((WindowListener)b).windowDeactivated(event); } - public void actionPerformed(ActionEvent event) - { + public void actionPerformed(ActionEvent event) { if (a != null) ((HActionListener)a).actionPerformed(event); if (b != null) ((HActionListener)b).actionPerformed(event); } - public void focusLost(FocusEvent event) - { + public void focusLost(FocusEvent event) { if (a != null) ((HFocusListener)a).focusLost(event); if (b != null) ((HFocusListener)b).focusLost(event); } - public void focusGained(FocusEvent event) - { + public void focusGained(FocusEvent event) { if (a != null) ((HFocusListener)a).focusGained(event); if (b != null) ((HFocusListener)b).focusGained(event); } - public void valueChanged(HAdjustmentEvent event) - { + public void valueChanged(HAdjustmentEvent event) { if (a != null) ((HAdjustmentListener)a).valueChanged(event); if (b != null) ((HAdjustmentListener)b).valueChanged(event); } - public void selectionChanged(HItemEvent event) - { + public void selectionChanged(HItemEvent event) { if (a != null) ((HItemListener)a).selectionChanged(event); if (b != null) ((HItemListener)b).selectionChanged(event); } - public void currentItemChanged(HItemEvent event) - { + public void currentItemChanged(HItemEvent event) { if (a != null) ((HItemListener)a).currentItemChanged(event); if (b != null) ((HItemListener)b).currentItemChanged(event); } - public void textChanged(HTextEvent event) - { + public void textChanged(HTextEvent event) { if (a != null) ((HTextListener)a).textChanged(event); if (b != null) ((HTextListener)b).textChanged(event); } - public void caretMoved(HTextEvent event) - { + public void caretMoved(HTextEvent event) { if (a != null) ((HTextListener)a).caretMoved(event); if (b != null) ((HTextListener)b).caretMoved(event); } - public void keyTyped(KeyEvent event) - { + public void keyTyped(KeyEvent event) { if (a != null) ((HKeyListener)a).keyTyped(event); if (b != null) ((HKeyListener)b).keyTyped(event); } - public void keyPressed(KeyEvent event) - { + public void keyPressed(KeyEvent event) { if (a != null) ((HKeyListener)a).keyPressed(event); if (b != null) ((HKeyListener)b).keyPressed(event); } - public void keyReleased(KeyEvent event) - { + public void keyReleased(KeyEvent event) { if (a != null) ((HKeyListener)a).keyReleased(event); if (b != null) ((HKeyListener)b).keyReleased(event); } - public void statusChanged(ResourceStatusEvent event) - { + public void statusChanged(ResourceStatusEvent event) { if (a != null) ((ResourceStatusListener)a).statusChanged(event); if (b != null) ((ResourceStatusListener)b).statusChanged(event); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HFlatEffectMatte.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HFlatEffectMatte.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HFlatEffectMatte.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HFlatEffectMatte.java 2017-06-23 13:35:05.000000000 +0000 @@ -29,18 +29,15 @@ private int position = 0; private int repeatCount = -1; - public HFlatEffectMatte() - { + public HFlatEffectMatte() { } - public HFlatEffectMatte(float[] data) - { + public HFlatEffectMatte(float[] data) { this(); setMatteData(data); } - public void setMatteData(float[] data) - { + public void setMatteData(float[] data) { if (data == null) { matteData = null; return; @@ -52,28 +49,23 @@ matteData = data; } - public float[] getMatteData() - { + public float[] getMatteData() { return matteData; } - public void start() - { + public void start() { isAnimated = true; } - public void stop() - { + public void stop() { isAnimated = false; } - public boolean isAnimated() - { + public boolean isAnimated() { return isAnimated; } - public void setPosition(int position) - { + public void setPosition(int position) { if (matteData == null) return; if (position < 0) @@ -84,13 +76,11 @@ this.position = position; } - public int getPosition() - { + public int getPosition() { return position; } - public void setRepeatCount(int count) - { + public void setRepeatCount(int count) { if (count <= 0 && count != -1) { org.videolan.Logger.getLogger("HImageEffectMatte").error("setRepeatCount(): invalid count"); throw new IllegalArgumentException("setRepeatCount(): invalid count"); @@ -99,25 +89,21 @@ repeatCount = count; } - public int getRepeatCount() - { + public int getRepeatCount() { return repeatCount; } - public void setDelay(int count) - { + public void setDelay(int count) { if (count < 1) count = 1; delay = count; } - public int getDelay() - { + public int getDelay() { return delay; } - public void setPlayMode(int mode) - { + public void setPlayMode(int mode) { if (mode != PLAY_REPEATING && mode != PLAY_ALTERNATING) { org.videolan.Logger.getLogger("HFlatEffectMatte").error("setPlayMode(): invalid mode"); throw new IllegalArgumentException("setPlayMode(): invalid mode"); @@ -125,8 +111,7 @@ this.mode = mode; } - public int getPlayMode() - { + public int getPlayMode() { return mode; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HFlatMatte.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HFlatMatte.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HFlatMatte.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HFlatMatte.java 2017-06-23 13:35:05.000000000 +0000 @@ -23,23 +23,19 @@ public class HFlatMatte implements HMatte { private float data; - public HFlatMatte() - { + public HFlatMatte() { this.data = 1.0F; } - public HFlatMatte(float data) - { + public HFlatMatte(float data) { this.data = data; } - public void setMatteData(float data) - { + public void setMatteData(float data) { this.data = data; } - public float getMatteData() - { + public float getMatteData() { return data; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HFontCapabilities.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HFontCapabilities.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HFontCapabilities.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HFontCapabilities.java 2017-06-23 13:35:06.000000000 +0000 @@ -22,19 +22,16 @@ import java.awt.Font; public class HFontCapabilities { - protected HFontCapabilities() - { + protected HFontCapabilities() { org.videolan.Logger.unimplemented(null, "HFontCapabilities"); } - public static int[] getSupportedCharacterRanges(Font font) - { + public static int[] getSupportedCharacterRanges(Font font) { org.videolan.Logger.unimplemented("HFontCapabilities", "getSupportedCharacterRanges"); return null; } - public static boolean isCharAvailable(Font font, char c) - { + public static boolean isCharAvailable(Font font, char c) { org.videolan.Logger.unimplemented("HFontCapabilities", "isCharAvailable"); return true; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HGraphicButton.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HGraphicButton.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HGraphicButton.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HGraphicButton.java 2017-06-23 13:35:07.000000000 +0000 @@ -27,139 +27,120 @@ import org.havi.ui.event.HFocusListener; public class HGraphicButton extends HIcon implements HActionable { - public HGraphicButton() - { + public HGraphicButton() { org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public HGraphicButton(Image image, int x, int y, int width, int height) - { + public HGraphicButton(Image image, int x, int y, int width, int height) { org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } public HGraphicButton(Image imageNormal, Image imageFocused, - Image imageActioned, int x, int y, int width, int height) - { + Image imageActioned, int x, int y, int width, int height) { org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public HGraphicButton(Image image) - { + public HGraphicButton(Image image) { org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } public HGraphicButton(Image imageNormal, Image imageFocused, - Image imageActioned) - { + Image imageActioned) { org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public static void setDefaultLook(HGraphicLook hlook) - { + public static void setDefaultLook(HGraphicLook hlook) { DefaultLook = hlook; } - public static HGraphicLook getDefaultLook() - { + public static HGraphicLook getDefaultLook() { if (DefaultLook == null) org.videolan.Logger.unimplemented("", "getDefaultLook"); return DefaultLook; } - public void setMove(int keyCode, HNavigable target) - { - throw new Error("Not implemented"); + public void setMove(int keyCode, HNavigable target) { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public HNavigable getMove(int keyCode) - { - throw new Error("Not implemented"); + public HNavigable getMove(int keyCode) { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); + return null; } public void setFocusTraversal(HNavigable up, HNavigable down, - HNavigable left, HNavigable right) - { - throw new Error("Not implemented"); + HNavigable left, HNavigable right) { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public boolean isSelected() - { - throw new Error("Not implemented"); + public boolean isSelected() { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); + return false; } - public void setGainFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setGainFocusSound(HSound sound) { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public void setLoseFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setLoseFocusSound(HSound sound) { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public HSound getGainFocusSound() - { - throw new Error("Not implemented"); + public HSound getGainFocusSound() { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); + return null; } - public HSound getLoseFocusSound() - { - throw new Error("Not implemented"); + public HSound getLoseFocusSound() { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); + return null; } - public void addHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void addHFocusListener(HFocusListener l) { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public void removeHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void removeHFocusListener(HFocusListener l) { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public int[] getNavigationKeys() - { - throw new Error("Not implemented"); + public int[] getNavigationKeys() { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); + return null; } - public void processHFocusEvent(HFocusEvent evt) - { - throw new Error("Not implemented"); + public void processHFocusEvent(HFocusEvent evt) { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public void addHActionListener(HActionListener l) - { - throw new Error("Not implemented"); + public void addHActionListener(HActionListener l) { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public void removeHActionListener(HActionListener l) - { - throw new Error("Not implemented"); + public void removeHActionListener(HActionListener l) { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public void setActionCommand(String command) - { - throw new Error("Not implemented"); + public void setActionCommand(String command) { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public void setActionSound(HSound sound) - { - throw new Error("Not implemented"); + public void setActionSound(HSound sound) { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public HSound getActionSound() - { - throw new Error("Not implemented"); + public HSound getActionSound() { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); + return null; } - public void processHActionEvent(HActionEvent evt) - { - throw new Error("Not implemented"); + public void processHActionEvent(HActionEvent evt) { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); } - public String getActionCommand() - { - throw new Error("Not implemented"); + public String getActionCommand() { + org.videolan.Logger.unimplemented(HGraphicButton.class.getName(), ""); + return ""; } private static HGraphicLook DefaultLook = null; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HGraphicLook.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HGraphicLook.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HGraphicLook.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HGraphicLook.java 2017-06-23 13:35:08.000000000 +0000 @@ -23,70 +23,53 @@ import java.awt.Graphics; import java.awt.Insets; -public class HGraphicLook - implements HExtendedLook -{ - public HGraphicLook() - { +public class HGraphicLook implements HExtendedLook { + public HGraphicLook() { } - public void fillBackground(Graphics g, HVisible visible, int state) - { + public void fillBackground(Graphics g, HVisible visible, int state) { org.videolan.Logger.unimplemented(HGraphicLook.class.getName(), "fillBackground"); - throw new Error("Not implemented"); } - public void renderBorders(Graphics g, HVisible visible, int state) - { + public void renderBorders(Graphics g, HVisible visible, int state) { org.videolan.Logger.unimplemented(HGraphicLook.class.getName(), "renderBorders"); - throw new Error("Not implemented"); } - public void renderVisible(Graphics g, HVisible visible, int state) - { + public void renderVisible(Graphics g, HVisible visible, int state) { org.videolan.Logger.unimplemented(HGraphicLook.class.getName(), "renderVisible"); - throw new Error("Not implemented"); } - - public void showLook(Graphics g, HVisible visible, int state) - { + + public void showLook(Graphics g, HVisible visible, int state) { org.videolan.Logger.unimplemented(HGraphicLook.class.getName(), "showLook"); - throw new Error("Not implemented"); } - public void widgetChanged (HVisible visible, HChangeData[] changes) - { + public void widgetChanged (HVisible visible, HChangeData[] changes) { if (visible.isVisible()) visible.repaint(); } - - public Dimension getMinimumSize(HVisible hvisible) - { + + public Dimension getMinimumSize(HVisible hvisible) { org.videolan.Logger.unimplemented(HGraphicLook.class.getName(), "getMinimumSize"); - throw new Error("Not implemented"); + return null; } - public Dimension getPreferredSize(HVisible hvisible) - { + public Dimension getPreferredSize(HVisible hvisible) { org.videolan.Logger.unimplemented(HGraphicLook.class.getName(), "getPreferredSize"); - throw new Error("Not implemented"); + return null; } - public Dimension getMaximumSize(HVisible hvisible) - { + public Dimension getMaximumSize(HVisible hvisible) { org.videolan.Logger.unimplemented(HGraphicLook.class.getName(), "getMaximumSize"); - throw new Error("Not implemented"); + return null; } - public boolean isOpaque(HVisible visible) - { + public boolean isOpaque(HVisible visible) { org.videolan.Logger.unimplemented(HGraphicLook.class.getName(), "isOpaque"); - throw new Error("Not implemented"); + return false; } - public Insets getInsets(HVisible hvisible) - { + public Insets getInsets(HVisible hvisible) { org.videolan.Logger.unimplemented(HGraphicLook.class.getName(), "getInsets"); - throw new Error("Not implemented"); + return new Insets(0, 0, 0, 0); } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HGraphicsConfiguration.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HGraphicsConfiguration.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HGraphicsConfiguration.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HGraphicsConfiguration.java 2017-06-23 13:35:04.000000000 +0000 @@ -31,7 +31,6 @@ public class HGraphicsConfiguration extends HScreenConfiguration { protected HGraphicsConfiguration() { - } HGraphicsConfiguration(HGraphicsConfigTemplate hgct) { @@ -78,26 +77,25 @@ public Color getPunchThroughToBackgroundColor(int percentage) { org.videolan.Logger.unimplemented("HGraphicsConfigTemplate", ""); - throw new Error("Not implemented"); + return null; } public Color getPunchThroughToBackgroundColor(int percentage, HVideoDevice hvd) { org.videolan.Logger.unimplemented("HGraphicsConfigTemplate", ""); - throw new Error("Not implemented"); + return null; } public Color getPunchThroughToBackgroundColor(Color color, int percentage) { org.videolan.Logger.unimplemented("HGraphicsConfigTemplate", ""); - throw new Error("Not implemented"); + return null; } public Color getPunchThroughToBackgroundColor(Color color, int percentage, HVideoDevice v) { org.videolan.Logger.unimplemented("HGraphicsConfigTemplate", ""); - throw new Error("Not implemented"); + return null; } public void dispose(Color c) { - } private HGraphicsConfigTemplate hgct; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HIcon.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HIcon.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HIcon.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HIcon.java 2017-06-23 13:35:06.000000000 +0000 @@ -24,102 +24,91 @@ import org.havi.ui.event.HFocusEvent; import org.havi.ui.event.HFocusListener; +import org.videolan.BDJXletContext; +import org.videolan.Logger; + public class HIcon extends HStaticIcon implements HNavigable { - public HIcon() - { + public HIcon() { org.videolan.Logger.unimplemented(HIcon.class.getName(), ""); } - public HIcon(Image image) - { + public HIcon(Image image) { org.videolan.Logger.unimplemented(HIcon.class.getName(), ""); } - public HIcon(Image image, int x, int y, int width, int height) - { + public HIcon(Image image, int x, int y, int width, int height) { org.videolan.Logger.unimplemented(HIcon.class.getName(), ""); } public HIcon(Image imageNormal, Image imageFocus, int x, int y, int width, - int height) - { + int height) { org.videolan.Logger.unimplemented(HIcon.class.getName(), ""); } - public static void setDefaultLook(HGraphicLook hlook) - { - DefaultLook = hlook; + public static void setDefaultLook(HGraphicLook hlook) { + BDJXletContext.setXletDefaultLook(PROPERTY_LOOK, hlook); } - public static HGraphicLook getDefaultLook() - { - if (DefaultLook == null) - org.videolan.Logger.unimplemented("", "getDefaultLook"); - return DefaultLook; + public static HGraphicLook getDefaultLook() { + return (HGraphicLook)BDJXletContext.getXletDefaultLook(PROPERTY_LOOK, DEFAULT_LOOK); } - public void setMove(int keyCode, HNavigable target) - { - throw new Error("Not implemented"); + public void setMove(int keyCode, HNavigable target) { + Logger.unimplemented("", ""); } - public HNavigable getMove(int keyCode) - { - throw new Error("Not implemented"); + public HNavigable getMove(int keyCode) { + Logger.unimplemented("", ""); + return null; } public void setFocusTraversal(HNavigable up, HNavigable down, - HNavigable left, HNavigable right) - { - throw new Error("Not implemented"); + HNavigable left, HNavigable right) { + Logger.unimplemented("", ""); } - public boolean isSelected() - { - throw new Error("Not implemented"); + public boolean isSelected() { + Logger.unimplemented("", ""); + return false; } - public void setGainFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setGainFocusSound(HSound sound) { + Logger.unimplemented("", ""); } - public void setLoseFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setLoseFocusSound(HSound sound) { + Logger.unimplemented("", ""); } - public HSound getGainFocusSound() - { - throw new Error("Not implemented"); + public HSound getGainFocusSound() { + Logger.unimplemented("", ""); + return null; } - public HSound getLoseFocusSound() - { - throw new Error("Not implemented"); + public HSound getLoseFocusSound() { + Logger.unimplemented("", ""); + return null; } - public void addHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void addHFocusListener(HFocusListener l) { + Logger.unimplemented("", ""); } - public void removeHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void removeHFocusListener(HFocusListener l) { + Logger.unimplemented("", ""); } - public int[] getNavigationKeys() - { - throw new Error("Not implemented"); + public int[] getNavigationKeys() { + Logger.unimplemented("", ""); + return null; } - public void processHFocusEvent(HFocusEvent evt) - { - throw new Error("Not implemented"); + public void processHFocusEvent(HFocusEvent evt) { + Logger.unimplemented("", ""); } - private static HGraphicLook DefaultLook = null; + static final Class DEFAULT_LOOK = HGraphicLook.class; + private static final String PROPERTY_LOOK = HIcon.class.getName(); private static final long serialVersionUID = 2006124827619610922L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HImageEffectMatte.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HImageEffectMatte.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HImageEffectMatte.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HImageEffectMatte.java 2017-06-23 13:35:07.000000000 +0000 @@ -33,18 +33,15 @@ private int position = 0; private int repeatCount = -1; - public HImageEffectMatte() - { + public HImageEffectMatte() { } - public HImageEffectMatte(Image[] data) - { + public HImageEffectMatte(Image[] data) { this(); setMatteData(data); } - public void setMatteData(Image[] data) - { + public void setMatteData(Image[] data) { if (data == null) { matteData = null; offsets = null; @@ -61,13 +58,11 @@ offsets[i] = new Point(0, 0); } - public Image[] getMatteData() - { + public Image[] getMatteData() { return matteData; } - public void setOffset(Point p, int index) - { + public void setOffset(Point p, int index) { if (p == null) { org.videolan.Logger.getLogger("HImageEffectMatte").error("setOffset(): no point"); throw new IllegalArgumentException("setOffset(): point is null"); @@ -81,28 +76,23 @@ offsets[index] = p; } - public Point getOffset(int index) - { + public Point getOffset(int index) { return offsets[index]; } - public void start() - { + public void start() { isAnimated = true; } - public void stop() - { + public void stop() { isAnimated = false; } - public boolean isAnimated() - { + public boolean isAnimated() { return isAnimated; } - public void setPosition(int position) - { + public void setPosition(int position) { if (matteData == null) return; if (position < 0) @@ -113,13 +103,11 @@ this.position = position; } - public int getPosition() - { + public int getPosition() { return position; } - public void setRepeatCount(int count) - { + public void setRepeatCount(int count) { if (count <= 0 && count != -1) { org.videolan.Logger.getLogger("HImageEffectMatte").error("setRepeatCount(): invalid count"); throw new IllegalArgumentException("setRepeatCount(): invalid count"); @@ -128,25 +116,21 @@ repeatCount = count; } - public int getRepeatCount() - { + public int getRepeatCount() { return repeatCount; } - public void setDelay(int count) - { + public void setDelay(int count) { if (count < 1) count = 1; delay = count; } - public int getDelay() - { + public int getDelay() { return delay; } - public void setPlayMode(int mode) - { + public void setPlayMode(int mode) { if (mode != PLAY_REPEATING && mode != PLAY_ALTERNATING) { org.videolan.Logger.getLogger("HImageEffectMatte").error("setPlayMode(): invalid mode"); throw new IllegalArgumentException("setPlayMode(): invalid mode"); @@ -154,8 +138,7 @@ this.mode = mode; } - public int getPlayMode() - { + public int getPlayMode() { return mode; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HImageHints.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HImageHints.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HImageHints.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HImageHints.java 2017-06-23 13:35:07.000000000 +0000 @@ -20,18 +20,15 @@ package org.havi.ui; public class HImageHints { - public HImageHints() - { + public HImageHints() { type = NATURAL_IMAGE; } - public void setType(int type) - { + public void setType(int type) { this.type = type; } - public int getType() - { + public int getType() { return type; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HImageMatte.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HImageMatte.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HImageMatte.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HImageMatte.java 2017-06-23 13:35:06.000000000 +0000 @@ -27,32 +27,26 @@ private Image data = null; private Point offset = new Point(0, 0); - public HImageMatte() - { + public HImageMatte() { } - public HImageMatte(Image data) - { + public HImageMatte(Image data) { this.data = data; } - public void setMatteData(Image data) - { + public void setMatteData(Image data) { this.data = data; } - public Image getMatteData() - { + public Image getMatteData() { return this.data; } - public void setOffset(Point p) - { + public void setOffset(Point p) { this.offset = p; } - public Point getOffset() - { + public Point getOffset() { return this.offset; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HInvalidLookException.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HInvalidLookException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HInvalidLookException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HInvalidLookException.java 2017-06-23 13:35:05.000000000 +0000 @@ -20,15 +20,13 @@ package org.havi.ui; public class HInvalidLookException extends HUIException { - public HInvalidLookException() - { + public HInvalidLookException() { super(); } - public HInvalidLookException(String reason) - { + public HInvalidLookException(String reason) { super(reason); } - + private static final long serialVersionUID = -930701028428083791L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HListElement.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HListElement.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HListElement.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HListElement.java 2017-06-23 13:35:07.000000000 +0000 @@ -1,6 +1,7 @@ /* * This file is part of libbluray * Copyright (C) 2010 William Hahne + * Copyright (C) 2016 Petri Hintukainen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,33 +23,31 @@ import java.awt.Image; public class HListElement { - public HListElement(String label) - { - org.videolan.Logger.unimplemented(HListElement.class.getName(), ""); + public HListElement(String label) { + this.label = label; } - public HListElement(Image icon, String label) - { - org.videolan.Logger.unimplemented(HListElement.class.getName(), ""); + public HListElement(Image icon, String label) { + this.label = label; + this.icon = icon; } - public String getLabel() - { - throw new Error("Not implemented"); + public String getLabel() { + return label; } - public Image getIcon() - { - throw new Error("Not implemented"); + public Image getIcon() { + return icon; } - public void setLabel(String label) - { - throw new Error("Not implemented"); + public void setLabel(String label) { + this.label = label; } - public void setIcon(Image icon) - { - throw new Error("Not implemented"); + public void setIcon(Image icon) { + this.icon = icon; } + + private Image icon = null; + private String label = null; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HListGroup.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HListGroup.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HListGroup.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HListGroup.java 2017-06-23 13:35:07.000000000 +0000 @@ -25,272 +25,243 @@ import org.havi.ui.event.HItemEvent; public class HListGroup extends HVisible implements HItemValue { - public HListGroup() - { + public HListGroup() { org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public HListGroup(HListElement[] items) - { + public HListGroup(HListElement[] items) { org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public HListGroup(HListElement[] items, int x, int y, int width, int height) - { + public HListGroup(HListElement[] items, int x, int y, int width, int height) { org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public void setLook(HLook hlook) throws HInvalidLookException - { - throw new Error("Not implemented"); + public void setLook(HLook hlook) throws HInvalidLookException { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public static void setDefaultLook(HListGroupLook look) - { + public static void setDefaultLook(HListGroupLook look) { DefaultLook = look; } - public static HListGroupLook getDefaultLook() - { + public static HListGroupLook getDefaultLook() { if (DefaultLook == null) org.videolan.Logger.unimplemented("", "getDefaultLook"); return DefaultLook; } - public HListElement[] getListContent() - { - throw new Error("Not implemented"); + public HListElement[] getListContent() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return null; } - public void setListContent(HListElement[] elements) - { - throw new Error("Not implemented"); + public void setListContent(HListElement[] elements) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public void addItem(HListElement item, int index) - { - throw new Error("Not implemented"); + public void addItem(HListElement item, int index) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public void addItems(HListElement[] items, int index) - { - throw new Error("Not implemented"); + public void addItems(HListElement[] items, int index) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public HListElement getItem(int index) - { - throw new Error("Not implemented"); + public HListElement getItem(int index) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return null; } - public int getIndex(HListElement item) - { - throw new Error("Not implemented"); + public int getIndex(HListElement item) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return 0; } - public int getNumItems() - { - throw new Error("Not implemented"); + public int getNumItems() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return 0; } - public HListElement removeItem(int index) - { - throw new Error("Not implemented"); + public HListElement removeItem(int index) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return null; } - public void removeAllItems() - { - throw new Error("Not implemented"); + public void removeAllItems() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public int getCurrentIndex() - { - throw new Error("Not implemented"); + public int getCurrentIndex() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return 0; } - public HListElement getCurrentItem() - { - throw new Error("Not implemented"); + public HListElement getCurrentItem() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return null; } - public boolean setCurrentItem(int index) - { - throw new Error("Not implemented"); + public boolean setCurrentItem(int index) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return false; } - public int[] getSelectionIndices() - { - throw new Error("Not implemented"); + public int[] getSelectionIndices() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return null; } - public HListElement[] getSelection() - { - throw new Error("Not implemented"); + public HListElement[] getSelection() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return null; } - public void clearSelection() - { - throw new Error("Not implemented"); + public void clearSelection() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public int getNumSelected() - { - throw new Error("Not implemented"); + public int getNumSelected() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return 0; } - public boolean getMultiSelection() - { - throw new Error("Not implemented"); + public boolean getMultiSelection() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return false; } - public void setMultiSelection(boolean multi) - { - throw new Error("Not implemented"); + public void setMultiSelection(boolean multi) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public void setItemSelected(int index, boolean sel) - { - throw new Error("Not implemented"); + public void setItemSelected(int index, boolean sel) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public boolean isItemSelected(int index) - { - throw new Error("Not implemented"); + public boolean isItemSelected(int index) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return false; } - public int getScrollPosition() - { - throw new Error("Not implemented"); + public int getScrollPosition() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return 0; } - public void setScrollPosition(int scroll) - { - throw new Error("Not implemented"); + public void setScrollPosition(int scroll) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public Dimension getIconSize() - { - throw new Error("Not implemented"); + public Dimension getIconSize() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return null; } - public void setIconSize(Dimension size) - { - throw new Error("Not implemented"); + public void setIconSize(Dimension size) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public Dimension getLabelSize() - { - throw new Error("Not implemented"); + public Dimension getLabelSize() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return null; } - public void setLabelSize(Dimension size) - { - throw new Error("Not implemented"); + public void setLabelSize(Dimension size) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public void setMove(int keyCode, HNavigable target) - { - throw new Error("Not implemented"); + public void setMove(int keyCode, HNavigable target) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public HNavigable getMove(int keyCode) - { - throw new Error("Not implemented"); + public HNavigable getMove(int keyCode) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return null; } public void setFocusTraversal(HNavigable up, HNavigable down, - HNavigable left, HNavigable right) - { - throw new Error("Not implemented"); + HNavigable left, HNavigable right) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public boolean isSelected() - { - throw new Error("Not implemented"); + public boolean isSelected() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return false; } - public void setGainFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setGainFocusSound(HSound sound) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public void setLoseFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setLoseFocusSound(HSound sound) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public HSound getGainFocusSound() - { - throw new Error("Not implemented"); + public HSound getGainFocusSound() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return null; } - public HSound getLoseFocusSound() - { - throw new Error("Not implemented"); + public HSound getLoseFocusSound() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return null; } - public void addHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void addHFocusListener(HFocusListener l) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public void removeHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void removeHFocusListener(HFocusListener l) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public int[] getNavigationKeys() - { - throw new Error("Not implemented"); + public int[] getNavigationKeys() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return null; } - public void processHFocusEvent(HFocusEvent evt) - { - throw new Error("Not implemented"); + public void processHFocusEvent(HFocusEvent evt) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public int getOrientation() - { - throw new Error("Not implemented"); + public int getOrientation() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return 0; } - public void setOrientation(int orient) - { - throw new Error("Not implemented"); + public void setOrientation(int orient) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public void addItemListener(org.havi.ui.event.HItemListener l) - { - throw new Error("Not implemented"); + public void addItemListener(org.havi.ui.event.HItemListener l) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public void removeItemListener(org.havi.ui.event.HItemListener l) - { - throw new Error("Not implemented"); + public void removeItemListener(org.havi.ui.event.HItemListener l) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public void setSelectionSound(HSound sound) - { - throw new Error("Not implemented"); + public void setSelectionSound(HSound sound) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public HSound getSelectionSound() - { - throw new Error("Not implemented"); + public HSound getSelectionSound() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return null; } - public boolean getSelectionMode() - { - throw new Error("Not implemented"); + public boolean getSelectionMode() { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); + return false; } - public void setSelectionMode(boolean edit) - { - throw new Error("Not implemented"); + public void setSelectionMode(boolean edit) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } - public void processHItemEvent(HItemEvent evt) - { - throw new Error("Not implemented"); + public void processHItemEvent(HItemEvent evt) { + org.videolan.Logger.unimplemented(HListGroup.class.getName(), ""); } public static final int ITEM_NOT_FOUND = -1; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HListGroupLook.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HListGroupLook.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HListGroupLook.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HListGroupLook.java 2017-06-23 13:35:07.000000000 +0000 @@ -25,78 +25,72 @@ import java.awt.Graphics; public class HListGroupLook implements HExtendedLook, HAdjustableLook { - public HListGroupLook() - { + public HListGroupLook() { org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); } - public void showLook(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void showLook(Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); } - public void fillBackground(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void fillBackground(Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); } - public void renderBorders(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void renderBorders(Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); } - public void renderVisible(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void renderVisible(Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); } - public void widgetChanged(HVisible visible, HChangeData[] changes) - { - throw new Error("Not implemented"); + public void widgetChanged(HVisible visible, HChangeData[] changes) { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); } - public Dimension getMinimumSize(HVisible visible) - { - throw new Error("Not implemented"); + public Dimension getMinimumSize(HVisible visible) { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); + return null; } - public Dimension getPreferredSize(HVisible visible) - { - throw new Error("Not implemented"); + public Dimension getPreferredSize(HVisible visible) { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); + return null; } - public Dimension getMaximumSize(HVisible visible) - { - throw new Error("Not implemented"); + public Dimension getMaximumSize(HVisible visible) { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); + return null; } - public boolean isOpaque(HVisible visible) - { - throw new Error("Not implemented"); + public boolean isOpaque(HVisible visible) { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); + return false; } - public java.awt.Insets getInsets(HVisible hvisible) - { - throw new Error("Not implemented"); + public Insets getInsets(HVisible hvisible) { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); + return null; } - public int hitTest(HOrientable component, Point pt) - { - throw new Error("Not implemented"); + public int hitTest(HOrientable component, Point pt) { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); + return 0; } - public Integer getValue(HOrientable component, Point pt) - { - throw new Error("Not implemented"); + public Integer getValue(HOrientable component, Point pt) { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); + return null; } - public Insets getElementInsets() - { - throw new Error("Not implemented"); + public Insets getElementInsets() { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); + return null; } - public int getNumVisible(HVisible visible) - { - throw new Error("Not implemented"); + public int getNumVisible(HVisible visible) { + org.videolan.Logger.unimplemented(HListGroupLook.class.getName(), ""); + return 0; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HMatteException.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HMatteException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HMatteException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HMatteException.java 2017-06-23 13:35:06.000000000 +0000 @@ -20,13 +20,11 @@ package org.havi.ui; public class HMatteException extends HUIException { - public HMatteException() - { + public HMatteException() { super(); } - public HMatteException(String reason) - { + public HMatteException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HMatte.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HMatte.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HMatte.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HMatte.java 2017-06-23 13:35:04.000000000 +0000 @@ -20,5 +20,4 @@ package org.havi.ui; public interface HMatte { - } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HMultilineEntry.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HMultilineEntry.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HMultilineEntry.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HMultilineEntry.java 2017-06-23 13:35:08.000000000 +0000 @@ -23,58 +23,47 @@ import java.awt.Font; public class HMultilineEntry extends HSinglelineEntry { - public HMultilineEntry() - { + public HMultilineEntry() { org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), ""); } public HMultilineEntry(String text, int x, int y, int width, int height, - int maxChars, Font font, Color color) - { + int maxChars, Font font, Color color) { org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), ""); } - public HMultilineEntry(int x, int y, int width, int height, int maxChars) - { + public HMultilineEntry(int x, int y, int width, int height, int maxChars) { org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), ""); - throw new Error("Not implemented"); } - public HMultilineEntry(String text, int maxChars, Font font, Color color) - { + public HMultilineEntry(String text, int maxChars, Font font, Color color) { org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), ""); } - public HMultilineEntry(int maxChars) - { + public HMultilineEntry(int maxChars) { org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), ""); } - public static void setDefaultLook(HMultilineEntryLook look) - { + public static void setDefaultLook(HMultilineEntryLook look) { DefaultLook = look; } - public static HSinglelineEntryLook getDefaultLook() - { + public static HSinglelineEntryLook getDefaultLook() { if (DefaultLook == null) org.videolan.Logger.unimplemented("", "getDefaultLook"); return DefaultLook; } - public void setLook(HLook hlook) throws HInvalidLookException - { - throw new Error("Not implemented"); + public void setLook(HLook hlook) throws HInvalidLookException { + org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), ""); } - public void caretNextLine() - { - throw new Error("Not implemented"); + public void caretNextLine() { + org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), ""); } - public void caretPreviousLine() - { - throw new Error("Not implemented"); + public void caretPreviousLine() { + org.videolan.Logger.unimplemented(HMultilineEntry.class.getName(), ""); } private static HSinglelineEntryLook DefaultLook = null; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HMultilineEntryLook.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HMultilineEntryLook.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HMultilineEntryLook.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HMultilineEntryLook.java 2017-06-23 13:35:06.000000000 +0000 @@ -23,83 +23,76 @@ import java.awt.Insets; public class HMultilineEntryLook extends HSinglelineEntryLook { - public HMultilineEntryLook() - { + public HMultilineEntryLook() { org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); } - public void fillBackground(java.awt.Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void fillBackground(java.awt.Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); } - public void renderBorders(java.awt.Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void renderBorders(java.awt.Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); } - public void renderVisible(java.awt.Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void renderVisible(java.awt.Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); } - public void showLook(java.awt.Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void showLook(java.awt.Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); } - public void widgetChanged(HVisible visible, HChangeData[] changes) - { - throw new Error("Not implemented"); + public void widgetChanged(HVisible visible, HChangeData[] changes) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); } - public Dimension getMinimumSize(HVisible hvisible) - { - throw new Error("Not implemented"); + public Dimension getMinimumSize(HVisible hvisible) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); + return null; } - public Dimension getPreferredSize(HVisible hvisible) - { - throw new Error("Not implemented"); + public Dimension getPreferredSize(HVisible hvisible) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); + return null; } - public Dimension getMaximumSize(HVisible hvisible) - { - throw new Error("Not implemented"); + public Dimension getMaximumSize(HVisible hvisible) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); + return null; } - public boolean isOpaque(HVisible visible) - { - throw new Error("Not implemented"); + public boolean isOpaque(HVisible visible) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); + return false; } - public Insets getInsets(HVisible hvisible) - { - throw new Error("Not implemented"); + public Insets getInsets(HVisible hvisible) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); + return null; } - public int getCaretPositionNextLine(HVisible visible) - { - throw new Error("Not implemented"); + public int getCaretPositionNextLine(HVisible visible) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); + return 0; } - public int getCaretPositionPreviousLine(HVisible visible) - { - throw new Error("Not implemented"); + public int getCaretPositionPreviousLine(HVisible visible) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); + return 0; } - public int getCaretCharPositionForLine(HVisible visible, int line) - { - throw new Error("Not implemented"); + public int getCaretCharPositionForLine(HVisible visible, int line) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); + return 0; } - public int[] getVisibleSoftLineBreakPositions(HVisible visible) - { - throw new Error("Not implemented"); + public int[] getVisibleSoftLineBreakPositions(HVisible visible) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); + return null; } - - public int[] getSoftLineBreakPositions(HVisible visible) - { - throw new Error("Not implemented"); + public int[] getSoftLineBreakPositions(HVisible visible) { + org.videolan.Logger.unimplemented(HMultilineEntryLook.class.getName(), ""); + return null; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HNoInputPreferred.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HNoInputPreferred.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HNoInputPreferred.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HNoInputPreferred.java 2017-06-23 13:35:05.000000000 +0000 @@ -20,5 +20,4 @@ package org.havi.ui; public interface HNoInputPreferred { - } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HPermissionDeniedException.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HPermissionDeniedException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HPermissionDeniedException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HPermissionDeniedException.java 2017-06-23 13:35:08.000000000 +0000 @@ -20,13 +20,11 @@ package org.havi.ui; public class HPermissionDeniedException extends Exception { - public HPermissionDeniedException() - { + public HPermissionDeniedException() { super(); } - public HPermissionDeniedException(String reason) - { + public HPermissionDeniedException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HRange.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HRange.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HRange.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HRange.java 2017-06-23 13:35:05.000000000 +0000 @@ -23,93 +23,81 @@ import org.havi.ui.event.HFocusListener; public class HRange extends HStaticRange implements HNavigable { - public HRange() - { + public HRange() { org.videolan.Logger.unimplemented(HRange.class.getName(), ""); } public HRange(int orientation, int minimum, int maximum, int value, int x, - int y, int width, int height) - { + int y, int width, int height) { org.videolan.Logger.unimplemented(HRange.class.getName(), ""); } - public HRange(int orientation, int minimum, int maximum, int value) - { + public HRange(int orientation, int minimum, int maximum, int value) { org.videolan.Logger.unimplemented(HRange.class.getName(), ""); } - public static void setDefaultLook(HRangeLook look) - { + public static void setDefaultLook(HRangeLook look) { DefaultLook = look; } - public static HRangeLook getDefaultLook() - { + public static HRangeLook getDefaultLook() { if (DefaultLook == null) org.videolan.Logger.unimplemented("", "getDefaultLook"); return DefaultLook; } - public void setMove(int keyCode, HNavigable target) - { - throw new Error("Not implemented"); + public void setMove(int keyCode, HNavigable target) { + org.videolan.Logger.unimplemented(HRange.class.getName(), ""); } - public HNavigable getMove(int keyCode) - { - throw new Error("Not implemented"); + public HNavigable getMove(int keyCode) { + org.videolan.Logger.unimplemented(HRange.class.getName(), ""); + return null; } public void setFocusTraversal(HNavigable up, HNavigable down, - HNavigable left, HNavigable right) - { - throw new Error("Not implemented"); + HNavigable left, HNavigable right) { + org.videolan.Logger.unimplemented(HRange.class.getName(), ""); } - public boolean isSelected() - { - throw new Error("Not implemented"); + public boolean isSelected() { + org.videolan.Logger.unimplemented(HRange.class.getName(), ""); + return false; } - public void setGainFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setGainFocusSound(HSound sound) { + org.videolan.Logger.unimplemented(HRange.class.getName(), ""); } - public void setLoseFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setLoseFocusSound(HSound sound) { + org.videolan.Logger.unimplemented(HRange.class.getName(), ""); } - public HSound getGainFocusSound() - { - throw new Error("Not implemented"); + public HSound getGainFocusSound() { + org.videolan.Logger.unimplemented(HRange.class.getName(), ""); + return null; } - public HSound getLoseFocusSound() - { - throw new Error("Not implemented"); + public HSound getLoseFocusSound() { + org.videolan.Logger.unimplemented(HRange.class.getName(), ""); + return null; } - public void addHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void addHFocusListener(HFocusListener l) { + org.videolan.Logger.unimplemented(HRange.class.getName(), ""); } - public void removeHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void removeHFocusListener(HFocusListener l) { + org.videolan.Logger.unimplemented(HRange.class.getName(), ""); } - public int[] getNavigationKeys() - { - throw new Error("Not implemented"); + public int[] getNavigationKeys() { + org.videolan.Logger.unimplemented(HRange.class.getName(), ""); + return null; } - public void processHFocusEvent(HFocusEvent evt) - { - throw new Error("Not implemented"); + public void processHFocusEvent(HFocusEvent evt) { + org.videolan.Logger.unimplemented(HRange.class.getName(), ""); } private static HRangeLook DefaultLook = null; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HRangeLook.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HRangeLook.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HRangeLook.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HRangeLook.java 2017-06-23 13:35:07.000000000 +0000 @@ -25,68 +25,62 @@ import java.awt.Dimension; public class HRangeLook implements HExtendedLook, HAdjustableLook { - public HRangeLook() - { + public HRangeLook() { org.videolan.Logger.unimplemented(HRangeLook.class.getName(), ""); } - public void fillBackground(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void fillBackground(Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HRangeLook.class.getName(), ""); } - public void renderBorders(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void renderBorders(Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HRangeLook.class.getName(), ""); } - public void renderVisible(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void renderVisible(Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HRangeLook.class.getName(), ""); } - public void showLook(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void showLook(Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HRangeLook.class.getName(), ""); } - public void widgetChanged(HVisible visible, HChangeData[] changes) - { - throw new Error("Not implemented"); + public void widgetChanged(HVisible visible, HChangeData[] changes) { + org.videolan.Logger.unimplemented(HRangeLook.class.getName(), ""); } - public Dimension getMinimumSize(HVisible hvisible) - { - throw new Error("Not implemented"); + public Dimension getMinimumSize(HVisible hvisible) { + org.videolan.Logger.unimplemented(HRangeLook.class.getName(), ""); + return null; } - public Dimension getPreferredSize(HVisible hvisible) - { - throw new Error("Not implemented"); + public Dimension getPreferredSize(HVisible hvisible) { + org.videolan.Logger.unimplemented(HRangeLook.class.getName(), ""); + return null; } - public Dimension getMaximumSize(HVisible hvisible) - { - throw new Error("Not implemented"); + public Dimension getMaximumSize(HVisible hvisible) { + org.videolan.Logger.unimplemented(HRangeLook.class.getName(), ""); + return null; } - public boolean isOpaque(HVisible visible) - { - throw new Error("Not implemented"); + public boolean isOpaque(HVisible visible) { + org.videolan.Logger.unimplemented(HRangeLook.class.getName(), ""); + return false; } - public Insets getInsets(HVisible hvisible) - { - throw new Error("Not implemented"); + public Insets getInsets(HVisible hvisible) { + org.videolan.Logger.unimplemented(HRangeLook.class.getName(), ""); + return null; } - public int hitTest(HOrientable component, Point pt) - { - throw new Error("Not implemented"); + public int hitTest(HOrientable component, Point pt) { + org.videolan.Logger.unimplemented(HRangeLook.class.getName(), ""); + return 0; } - public Integer getValue(HOrientable component, Point pt) - { - throw new Error("Not implemented"); + public Integer getValue(HOrientable component, Point pt) { + org.videolan.Logger.unimplemented(HRangeLook.class.getName(), ""); + return null; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HRangeValue.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HRangeValue.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HRangeValue.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HRangeValue.java 2017-06-23 13:35:06.000000000 +0000 @@ -25,148 +25,129 @@ import org.havi.ui.event.HFocusListener; public class HRangeValue extends HRange implements HAdjustmentValue { - public HRangeValue() - { + public HRangeValue() { org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } public HRangeValue(int orientation, int minimum, int maximum, int value, - int x, int y, int width, int height) - { + int x, int y, int width, int height) { org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public HRangeValue(int orientation, int minimum, int maximum, int value) - { + public HRangeValue(int orientation, int minimum, int maximum, int value) { org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public static void setDefaultLook(HRangeLook look) - { + public static void setDefaultLook(HRangeLook look) { DefaultLook = look; } - public static HRangeLook getDefaultLook() - { + public static HRangeLook getDefaultLook() { if (DefaultLook == null) org.videolan.Logger.unimplemented("", "getDefaultLook"); return DefaultLook; } - public void setMove(int keyCode, HNavigable target) - { - throw new Error("Not implemented"); + public void setMove(int keyCode, HNavigable target) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public HNavigable getMove(int keyCode) - { - throw new Error("Not implemented"); + public HNavigable getMove(int keyCode) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); + return null; } public void setFocusTraversal(HNavigable up, HNavigable down, - HNavigable left, HNavigable right) - { - throw new Error("Not implemented"); + HNavigable left, HNavigable right) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public boolean isSelected() - { - throw new Error("Not implemented"); + public boolean isSelected() { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); + return false; } - public void setGainFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setGainFocusSound(HSound sound) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public void setLoseFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setLoseFocusSound(HSound sound) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public HSound getGainFocusSound() - { - throw new Error("Not implemented"); + public HSound getGainFocusSound() { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); + return null; } - public HSound getLoseFocusSound() - { - throw new Error("Not implemented"); + public HSound getLoseFocusSound() { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); + return null; } - public void addHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void addHFocusListener(HFocusListener l) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public void removeHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void removeHFocusListener(HFocusListener l) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public int[] getNavigationKeys() - { - throw new Error("Not implemented"); + public int[] getNavigationKeys() { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); + return null; } - public void processHFocusEvent(HFocusEvent evt) - { - throw new Error("Not implemented"); + public void processHFocusEvent(HFocusEvent evt) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public void setUnitIncrement(int increment) - { - throw new Error("Not implemented"); + public void setUnitIncrement(int increment) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public int getUnitIncrement() - { - throw new Error("Not implemented"); + public int getUnitIncrement() { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); + return 0; } - public void setBlockIncrement(int increment) - { - throw new Error("Not implemented"); + public void setBlockIncrement(int increment) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public int getBlockIncrement() - { - throw new Error("Not implemented"); + public int getBlockIncrement() { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); + return 0; } - public void addAdjustmentListener(HAdjustmentListener l) - { - throw new Error("Not implemented"); + public void addAdjustmentListener(HAdjustmentListener l) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public void removeAdjustmentListener(HAdjustmentListener l) - { - throw new Error("Not implemented"); + public void removeAdjustmentListener(HAdjustmentListener l) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public void setAdjustmentSound(HSound sound) - { - throw new Error("Not implemented"); + public void setAdjustmentSound(HSound sound) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public HSound getAdjustmentSound() - { - throw new Error("Not implemented"); + public HSound getAdjustmentSound() { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); + return null; } - public boolean getAdjustMode() - { - throw new Error("Not implemented"); + public boolean getAdjustMode() { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); + return false; } - public void setAdjustMode(boolean adjust) - { - throw new Error("Not implemented"); + public void setAdjustMode(boolean adjust) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } - public void processHAdjustmentEvent(HAdjustmentEvent evt) - { - throw new Error("Not implemented"); + public void processHAdjustmentEvent(HAdjustmentEvent evt) { + org.videolan.Logger.unimplemented(HRangeValue.class.getName(), ""); } private static HRangeLook DefaultLook = null; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScene.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScene.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScene.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScene.java 2017-06-23 13:35:06.000000000 +0000 @@ -36,12 +36,16 @@ import org.havi.ui.event.HEventGroup; import org.videolan.BDJXletContext; import org.videolan.GUIManager; +import org.videolan.Logger; import java.awt.BDToolkit; public class HScene extends Container implements HComponentOrdering { protected HScene() { context = BDJXletContext.getCurrentContext(); + if (context == null) { + logger.error("HScene() created from privileged context: " + Logger.dumpStack()); + } BDToolkit.addComponent(this); } @@ -52,8 +56,7 @@ public void paint(Graphics g) { if (backgroundMode == BACKGROUND_FILL) { g.setColor(getBackground()); - g.fillRect(super.getX(), super.getY(), super.getWidth(), super - .getHeight()); + g.fillRect(super.getX(), super.getY(), super.getWidth(), super.getHeight()); } if (image != null) { @@ -239,8 +242,10 @@ } public synchronized void dispose() { - if (null != BDJXletContext.getCurrentContext()) - HSceneFactory.getInstance().dispose(this); + HSceneFactory sf = HSceneFactory.getInstance(); + if (sf != null) { + sf.dispose(this); + } } protected void disposeImpl() @@ -376,15 +381,27 @@ } public void setVisible(boolean visible) { + if (visible == isVisible()) + return; super.setVisible(visible); + + /* + * This doesn't work + * - visible state of other HScenes is never restored + * => no focus, key events are lost + * - Scenes are not wiped from GUI + if (visible) { for (int i = 0; i < GUIManager.getInstance().getComponentCount(); i++) { Component c = GUIManager.getInstance().getComponent(i); if (c != this) c.setVisible(false); - } + } } - GUIManager.getInstance().setVisible(visible); + */ + + if (visible) + GUIManager.getInstance().setVisible(visible); } public int getBackgroundMode() { @@ -430,5 +447,7 @@ private boolean shortcutsEnabled = true; private BDJXletContext context; + private static final Logger logger = Logger.getLogger(HScene.class.getName()); + private static final long serialVersionUID = 422730746877212409L; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreenConfigTemplate.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreenConfigTemplate.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreenConfigTemplate.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreenConfigTemplate.java 2017-06-23 13:35:06.000000000 +0000 @@ -22,6 +22,8 @@ import java.awt.Dimension; import java.util.Arrays; +import org.videolan.Logger; + public abstract class HScreenConfigTemplate { HScreenConfigTemplate() { objectArray = new Object[getPreferenceObjectCount()]; @@ -30,35 +32,47 @@ } public void setPreference(int preference, int priority) { - if ((priority < REQUIRED) || (priority > REQUIRED_NOT)) + if ((priority < REQUIRED) || (priority > REQUIRED_NOT)) { + logger.error("invalid priority " + priority); throw new IllegalArgumentException("invalid priority"); + } int index = getPreferenceIndex(preference); - if (index < 0) + if (index < 0) { + logger.error("invalid preference " + preference); throw new IllegalArgumentException("invalid preference"); + } priorityArray[index] = priority; } public void setPreference(int preference, Object object, int priority) { - if ((priority < REQUIRED) || (priority > REQUIRED_NOT)) + if ((priority < REQUIRED) || (priority > REQUIRED_NOT)) { + logger.error("invalid priority " + priority); throw new IllegalArgumentException("invalid priority"); + } int index = getPreferenceObjectIndex(preference); - if (index < 0) + if (index < 0) { + logger.error("invalid preference " + preference); throw new IllegalArgumentException("invalid preference"); + } objectArray[index] = object; priorityArray[getPreferenceIndex(preference)] = priority; } public int getPreferencePriority(int preference) { int index = getPreferenceIndex(preference); - if (index < 0) + if (index < 0) { + logger.error("invalid preference " + preference); throw new IllegalArgumentException("invalid preference"); + } return priorityArray[getPreferenceIndex(preference)]; } public Object getPreferenceObject(int preference) { int index = getPreferenceObjectIndex(preference); - if (index < 0) + if (index < 0) { + logger.error("invalid preference " + preference); throw new IllegalArgumentException("invalid preference"); + } return objectArray[getPreferenceObjectIndex(preference)]; } @@ -169,4 +183,6 @@ { 960, 540, 16, 9 }, }; + + private static final Logger logger = Logger.getLogger(HScreenConfigTemplate.class.getName()); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreenConfiguration.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreenConfiguration.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreenConfiguration.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreenConfiguration.java 2017-06-23 13:35:06.000000000 +0000 @@ -24,7 +24,6 @@ public abstract class HScreenConfiguration extends Object { HScreenConfiguration() { - } HScreenConfiguration(HScreenConfigTemplate hsct) { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreenDevice.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreenDevice.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreenDevice.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreenDevice.java 2017-06-23 13:35:06.000000000 +0000 @@ -56,7 +56,7 @@ public Dimension getScreenAspectRatio() { org.videolan.Logger.unimplemented(HScreenDevice.class.getName(), "getScreenAspectRatio"); - throw new Error("Not implemented"); + return new Dimension(16, 9); } public boolean reserveDevice(ResourceClient client) { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreenDimension.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreenDimension.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreenDimension.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreenDimension.java 2017-06-23 13:35:08.000000000 +0000 @@ -20,18 +20,23 @@ package org.havi.ui; public class HScreenDimension { - public HScreenDimension(float width, float height) - { - this.width = width; - this.height = height; + public HScreenDimension(float width, float height) { + setSize(width, height); } - public void setSize(float width, float height) - { + public void setSize(float width, float height) { + if (width < 0.0f) + width = 0.0f; + if (height < 0.0f) + height = 0.0f; this.width = width; this.height = height; } + public String toString() { + return getClass().getName() + "[" + width + "x" + height + "]"; + } + public float width; public float height; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreen.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreen.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreen.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreen.java 2017-06-23 13:35:04.000000000 +0000 @@ -20,88 +20,75 @@ package org.havi.ui; public class HScreen { - private HScreen() - { + private HScreen() { hVideoDevice = new HVideoDevice(); hGraphicsDevice = new HGraphicsDevice(); hBackgroundDevice = new HBackgroundDevice(); } - public static HScreen[] getHScreens() - { + public static HScreen[] getHScreens() { HScreen[] screens = new HScreen[1]; screens[0] = DEFAULT_HSCREEN; return screens; } - public static HScreen getDefaultHScreen() - { + public static HScreen getDefaultHScreen() { return DEFAULT_HSCREEN; } - public HVideoDevice[] getHVideoDevices() - { + public HVideoDevice[] getHVideoDevices() { HVideoDevice[] devices = new HVideoDevice[1]; devices[0] = hVideoDevice; return devices; } - public HVideoDevice getDefaultHVideoDevice() - { + public HVideoDevice getDefaultHVideoDevice() { return hVideoDevice; } - public HVideoConfiguration getBestConfiguration(HVideoConfigTemplate[] hvcta) - { + public HVideoConfiguration getBestConfiguration(HVideoConfigTemplate[] hvcta) { return hVideoDevice.getBestConfiguration(hvcta); } - public HGraphicsDevice[] getHGraphicsDevices() - { + public HGraphicsDevice[] getHGraphicsDevices() { HGraphicsDevice[] devices = new HGraphicsDevice[1]; devices[0] = hGraphicsDevice; return devices; } - public HGraphicsDevice getDefaultHGraphicsDevice() - { + public HGraphicsDevice getDefaultHGraphicsDevice() { return hGraphicsDevice; } public HGraphicsConfiguration getBestConfiguration( - HGraphicsConfigTemplate[] hgcta) - { + HGraphicsConfigTemplate[] hgcta) { return hGraphicsDevice.getBestConfiguration(hgcta); } - public HBackgroundDevice[] getHBackgroundDevices() - { + public HBackgroundDevice[] getHBackgroundDevices() { HBackgroundDevice[] devices = new HBackgroundDevice[1]; devices[0] = hBackgroundDevice; return devices; } - public HBackgroundDevice getDefaultHBackgroundDevice() - { + public HBackgroundDevice getDefaultHBackgroundDevice() { return hBackgroundDevice; } public HBackgroundConfiguration getBestConfiguration( - HBackgroundConfigTemplate[] hbcta) - { + HBackgroundConfigTemplate[] hbcta) { return hBackgroundDevice.getBestConfiguration(hbcta); } public HScreenConfiguration[] getCoherentScreenConfigurations( - HScreenConfigTemplate[] hscta) - { + HScreenConfigTemplate[] hscta) { + if ((hscta == null) || (hscta.length == 0)) throw new IllegalArgumentException("HScreenConfigTemplate[] hscta cannot be null"); HScreenConfiguration[] hsc = new HScreenConfiguration[hscta.length]; - for (int i = 0; i < hscta.length; i++) - { + for (int i = 0; i < hscta.length; i++) { if ((hscta[i] instanceof HVideoConfigTemplate)) hsc[i] = hVideoDevice.getBestConfiguration((HVideoConfigTemplate)hscta[i]); else if ((hscta[i] instanceof HGraphicsConfigTemplate)) @@ -117,8 +104,8 @@ public boolean setCoherentScreenConfigurations(HScreenConfiguration[] hsca) throws java.lang.SecurityException, HPermissionDeniedException, - HConfigurationException - { + HConfigurationException { + if ((hsca == null) || (hsca.length == 0)) throw new IllegalArgumentException("HScreenConfiguration[] hsca cannot be null"); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreenPoint.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreenPoint.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreenPoint.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreenPoint.java 2017-06-23 13:35:08.000000000 +0000 @@ -20,16 +20,30 @@ package org.havi.ui; public class HScreenPoint { - public HScreenPoint(float x, float y) - { + public HScreenPoint(float x, float y) { + setLocation(x, y); + } + + public void setLocation(float x, float y) { this.x = x; this.y = y; } - public void setLocation(float x, float y) + public boolean equals(Object obj) { - this.x = x; - this.y = y; + if (!(obj instanceof HScreenPoint)) + return false; + + HScreenPoint other = (HScreenPoint)obj; + Float x1 = new Float(this.x); + Float y1 = new Float(this.y); + Float x2 = new Float(other.x); + Float y2 = new Float(other.y); + return x1.equals(x2) && y1.equals(y2); + } + + public String toString() { + return "[" + x + "," + y + "]"; } public float x; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreenRectangle.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreenRectangle.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HScreenRectangle.java 2015-04-06 16:23:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HScreenRectangle.java 2017-06-23 13:35:06.000000000 +0000 @@ -20,29 +20,40 @@ package org.havi.ui; public class HScreenRectangle { - public HScreenRectangle(float x, float y, float width, float height) - { - this.x = x; - this.y = y; - this.width = width; - this.height = height; + public HScreenRectangle(float x, float y, float width, float height) { + setLocation(x, y); + setSize(width, height); } - public void setLocation(float x, float y) - { + public void setLocation(float x, float y) { this.x = x; this.y = y; } - public void setSize(float width, float height) - { - this.width = width; - this.height = height; + public void setSize(float width, float height) { + this.width = Math.max(0.0f, width); + this.height = Math.max(0.0f, height); } - public String toString() + public boolean equals(Object obj) { - return "HScreenRectangle[" + x + "," + y + " " + width + "x" + height + "]"; + if (!(obj instanceof HScreenRectangle)) + return false; + + HScreenRectangle other = (HScreenRectangle)obj; + Float x1 = new Float(this.x); + Float y1 = new Float(this.y); + Float w1 = new Float(this.width); + Float h1 = new Float(this.height); + Float x2 = new Float(other.x); + Float y2 = new Float(other.y); + Float w2 = new Float(other.width); + Float h2 = new Float(other.height); + return x1.equals(x2) && y1.equals(y2) && w1.equals(w2) && h1.equals(h2); + } + + public String toString() { + return getClass().getName() + "[" + x + "," + y + " " + width + "x" + height + "]"; } public float x; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HSinglelineEntry.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HSinglelineEntry.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HSinglelineEntry.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HSinglelineEntry.java 2017-06-23 13:35:08.000000000 +0000 @@ -29,240 +29,216 @@ import org.havi.ui.event.HTextListener; public class HSinglelineEntry extends HVisible implements HTextValue { - public HSinglelineEntry() - { + public HSinglelineEntry() { org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } public HSinglelineEntry(String text, int x, int y, int width, int height, - int maxChars, Font font, Color color) - { + int maxChars, Font font, Color color) { org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public HSinglelineEntry(int x, int y, int width, int height, int maxChars) - { + public HSinglelineEntry(int x, int y, int width, int height, int maxChars) { org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public HSinglelineEntry(String text, int maxChars, Font font, Color color) - { + public HSinglelineEntry(String text, int maxChars, Font font, Color color) { org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public HSinglelineEntry(int maxChars) - { + public HSinglelineEntry(int maxChars) { org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public void setTextContent(String string, int state) - { - throw new Error("Not implemented"); + public void setTextContent(String string, int state) { + super.setTextContent(string, ALL_STATES); + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), "setTextContent"); } - public String getTextContent(int state) - { - throw new Error("Not implemented"); + public String getTextContent(int state) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return ""; } - public int getCaretCharPosition() - { - throw new Error("Not implemented"); + public int getCaretCharPosition() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return 0; } - public int setCaretCharPosition(int position) - { - throw new Error("Not implemented"); + public int setCaretCharPosition(int position) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return 0; } - public void setType(int type) - { - throw new Error("Not implemented"); + public void setType(int type) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public void setValidInput(char[] inputChars) - { - throw new Error("Not implemented"); + public void setValidInput(char[] inputChars) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public boolean echoCharIsSet() - { - throw new Error("Not implemented"); + public boolean echoCharIsSet() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return false; } - public char getEchoChar() - { - throw new Error("Not implemented"); + public char getEchoChar() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return 0; } - public void setEchoChar(char c) - { - throw new Error("Not implemented"); + public void setEchoChar(char c) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public static void setDefaultLook(HSinglelineEntryLook look) - { + public static void setDefaultLook(HSinglelineEntryLook look) { DefaultLook = look; } - public static HSinglelineEntryLook getDefaultLook() - { + public static HSinglelineEntryLook getDefaultLook() { if (DefaultLook == null) org.videolan.Logger.unimplemented("", "getDefaultLook"); return DefaultLook; } - public void setLook(HLook hlook) throws HInvalidLookException - { - throw new Error("Not implemented"); + public void setLook(HLook hlook) throws HInvalidLookException { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public boolean insertChar(char c) - { - throw new Error("Not implemented"); + public boolean insertChar(char c) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return false; } - public boolean deletePreviousChar() - { - throw new Error("Not implemented"); + public boolean deletePreviousChar() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return false; } - public boolean deleteNextChar() - { - throw new Error("Not implemented"); + public boolean deleteNextChar() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return false; } - public void caretNextCharacter() - { - throw new Error("Not implemented"); + public void caretNextCharacter() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public void caretPreviousCharacter() - { - throw new Error("Not implemented"); + public void caretPreviousCharacter() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public void setMaxChars(int maxChars) - { - throw new Error("Not implemented"); + public void setMaxChars(int maxChars) { + if (maxChars < 0) + this.maxChars = 0; + else + this.maxChars = maxChars; } - public int getMaxChars() - { - throw new Error("Not implemented"); + public int getMaxChars() { + return maxChars; } - public void setMove(int keyCode, HNavigable target) - { - throw new Error("Not implemented"); + public void setMove(int keyCode, HNavigable target) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public HNavigable getMove(int keyCode) - { - throw new Error("Not implemented"); + public HNavigable getMove(int keyCode) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return null; } public void setFocusTraversal(HNavigable up, HNavigable down, - HNavigable left, HNavigable right) - { - throw new Error("Not implemented"); + HNavigable left, HNavigable right) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public boolean isSelected() - { - throw new Error("Not implemented"); + public boolean isSelected() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return false; } - public void setGainFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setGainFocusSound(HSound sound) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public void setLoseFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setLoseFocusSound(HSound sound) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public HSound getGainFocusSound() - { - throw new Error("Not implemented"); + public HSound getGainFocusSound() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return null; } - public HSound getLoseFocusSound() - { - throw new Error("Not implemented"); + public HSound getLoseFocusSound() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return null; } - public void addHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void addHFocusListener(HFocusListener l) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public void removeHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void removeHFocusListener(HFocusListener l) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public int[] getNavigationKeys() - { - throw new Error("Not implemented"); + public int[] getNavigationKeys() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return null; } - public void processHFocusEvent(HFocusEvent evt) - { - throw new Error("Not implemented"); + public void processHFocusEvent(HFocusEvent evt) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public void addHKeyListener(HKeyListener l) - { - throw new Error("Not implemented"); + public void addHKeyListener(HKeyListener l) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public void removeHKeyListener(HKeyListener l) - { - throw new Error("Not implemented"); + public void removeHKeyListener(HKeyListener l) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public void addHTextListener(HTextListener l) - { - throw new Error("Not implemented"); + public void addHTextListener(HTextListener l) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public void removeHTextListener(HTextListener l) - { - throw new Error("Not implemented"); + public void removeHTextListener(HTextListener l) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public boolean getEditMode() - { - throw new Error("Not implemented"); + public boolean getEditMode() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return false; } - public void setEditMode(boolean edit) - { - throw new Error("Not implemented"); + public void setEditMode(boolean edit) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public int getType() - { - throw new Error("Not implemented"); + public int getType() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return 0; } - public char[] getValidInput() - { - throw new Error("Not implemented"); + public char[] getValidInput() { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); + return null; } - public void processHTextEvent(HTextEvent evt) - { - throw new Error("Not implemented"); + public void processHTextEvent(HTextEvent evt) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } - public void processHKeyEvent(HKeyEvent evt) - { - throw new Error("Not implemented"); + public void processHKeyEvent(HKeyEvent evt) { + org.videolan.Logger.unimplemented(HSinglelineEntry.class.getName(), ""); } + private int maxChars; + private static HSinglelineEntryLook DefaultLook = null; private static final long serialVersionUID = 7577783421311076636L; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HSinglelineEntryLook.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HSinglelineEntryLook.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HSinglelineEntryLook.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HSinglelineEntryLook.java 2017-06-23 13:35:05.000000000 +0000 @@ -24,58 +24,52 @@ import java.awt.Insets; public class HSinglelineEntryLook implements HExtendedLook { - public HSinglelineEntryLook() - { + public HSinglelineEntryLook() { org.videolan.Logger.unimplemented(HSinglelineEntryLook.class.getName(), ""); } - public void fillBackground(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void fillBackground(Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HSinglelineEntryLook.class.getName(), ""); } - public void renderBorders(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void renderBorders(Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HSinglelineEntryLook.class.getName(), ""); } - public void renderVisible(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void renderVisible(Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HSinglelineEntryLook.class.getName(), ""); } - public void showLook(Graphics g, HVisible visible, int state) - { - throw new Error("Not implemented"); + public void showLook(Graphics g, HVisible visible, int state) { + org.videolan.Logger.unimplemented(HSinglelineEntryLook.class.getName(), ""); } - public void widgetChanged(HVisible visible, HChangeData[] changes) - { - throw new Error("Not implemented"); + public void widgetChanged(HVisible visible, HChangeData[] changes) { + org.videolan.Logger.unimplemented(HSinglelineEntryLook.class.getName(), ""); } - public Dimension getMinimumSize(HVisible hvisible) - { - throw new Error("Not implemented"); + public Dimension getMinimumSize(HVisible hvisible) { + org.videolan.Logger.unimplemented(HSinglelineEntryLook.class.getName(), ""); + return null; } - public Dimension getPreferredSize(HVisible hvisible) - { - throw new Error("Not implemented"); + public Dimension getPreferredSize(HVisible hvisible) { + org.videolan.Logger.unimplemented(HSinglelineEntryLook.class.getName(), ""); + return null; } - public Dimension getMaximumSize(HVisible hvisible) - { - throw new Error("Not implemented"); + public Dimension getMaximumSize(HVisible hvisible) { + org.videolan.Logger.unimplemented(HSinglelineEntryLook.class.getName(), ""); + return null; } - public boolean isOpaque(HVisible visible) - { - throw new Error("Not implemented"); + public boolean isOpaque(HVisible visible) { + org.videolan.Logger.unimplemented(HSinglelineEntryLook.class.getName(), ""); + return false; } - public Insets getInsets(HVisible hvisible) - { - throw new Error("Not implemented"); + public Insets getInsets(HVisible hvisible) { + org.videolan.Logger.unimplemented(HSinglelineEntryLook.class.getName(), ""); + return null; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HStaticAnimation.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HStaticAnimation.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HStaticAnimation.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HStaticAnimation.java 2017-06-23 13:35:07.000000000 +0000 @@ -23,93 +23,81 @@ public class HStaticAnimation extends HVisible implements HNoInputPreferred, HAnimateEffect { - public HStaticAnimation() - { + public HStaticAnimation() { org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); } public HStaticAnimation(Image[] imagesNormal, int delay, int playMode, - int repeatCount, int x, int y, int width, int height) - { + int repeatCount, int x, int y, int width, int height) { org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); } public HStaticAnimation(Image[] imagesNormal, int delay, int playMode, - int repeatCount) - { + int repeatCount) { org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); } - public void setLook(HLook hlook) throws HInvalidLookException - { - throw new Error("Not implemented"); + public void setLook(HLook hlook) throws HInvalidLookException { + org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); } - public static void setDefaultLook(HAnimateLook hlook) - { + public static void setDefaultLook(HAnimateLook hlook) { DefaultLook = hlook; } - public static HAnimateLook getDefaultLook() - { + public static HAnimateLook getDefaultLook() { if (DefaultLook == null) org.videolan.Logger.unimplemented("", "getDefaultLook"); return DefaultLook; } - public void start() - { - throw new Error("Not implemented"); + public void start() { + org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); } - public void stop() - { - throw new Error("Not implemented"); + public void stop() { + org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); } - public boolean isAnimated() - { - throw new Error("Not implemented"); + public boolean isAnimated() { + org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); + return false; } - public void setPosition(int position) - { - throw new Error("Not implemented"); + public void setPosition(int position) { + org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); } - public int getPosition() - { - throw new Error("Not implemented"); + public int getPosition() { + org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); + return 0; } - public void setRepeatCount(int count) - { - throw new Error("Not implemented"); + public void setRepeatCount(int count) { + org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); } - public int getRepeatCount() - { - throw new Error("Not implemented"); + public int getRepeatCount() { + org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); + return 0; } - public void setDelay(int count) - { - throw new Error("Not implemented"); + public void setDelay(int count) { + org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); } - public int getDelay() - { - throw new Error("Not implemented"); + public int getDelay() { + org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); + return 0; } - public void setPlayMode(int mode) - { - throw new Error("Not implemented"); + public void setPlayMode(int mode) { + org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); } - public int getPlayMode() - { - throw new Error("Not implemented"); + public int getPlayMode() { + org.videolan.Logger.unimplemented(HStaticAnimation.class.getName(), ""); + return 0; } private static HAnimateLook DefaultLook = null; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HStaticIcon.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HStaticIcon.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HStaticIcon.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HStaticIcon.java 2017-06-23 13:35:04.000000000 +0000 @@ -23,38 +23,32 @@ import org.videolan.BDJXletContext; public class HStaticIcon extends HVisible implements HNoInputPreferred { - public HStaticIcon() - { + public HStaticIcon() { super(getDefaultLook()); } - public HStaticIcon(Image imageNormal, int x, int y, int width, int height) - { + public HStaticIcon(Image imageNormal, int x, int y, int width, int height) { super(getDefaultLook(), x, y, width, height); setGraphicContent(imageNormal, NORMAL_STATE); } - public HStaticIcon(Image imageNormal) - { + public HStaticIcon(Image imageNormal) { super(getDefaultLook()); setGraphicContent(imageNormal, NORMAL_STATE); } - public void setLook(HLook hlook) throws HInvalidLookException - { + public void setLook(HLook hlook) throws HInvalidLookException { if ((hlook != null) && !(hlook instanceof HGraphicLook)) { throw new HInvalidLookException(); } super.setLook(hlook); } - public static void setDefaultLook(HGraphicLook hlook) - { + public static void setDefaultLook(HGraphicLook hlook) { BDJXletContext.setXletDefaultLook(PROPERTY_LOOK,hlook); } - public static HGraphicLook getDefaultLook() - { + public static HGraphicLook getDefaultLook() { return (HGraphicLook) BDJXletContext.getXletDefaultLook(PROPERTY_LOOK,DEFAULT_LOOK); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HStaticRange.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HStaticRange.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HStaticRange.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HStaticRange.java 2017-06-23 13:35:08.000000000 +0000 @@ -1,6 +1,7 @@ /* * This file is part of libbluray * Copyright (C) 2010 William Hahne + * Copyright (C) 2016 Petri Hintukainen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,105 +20,117 @@ package org.havi.ui; +import org.videolan.Logger; + public class HStaticRange extends HVisible implements HNoInputPreferred, HOrientable { - public HStaticRange() - { - org.videolan.Logger.unimplemented(HStaticRange.class.getName(), ""); + + public HStaticRange() { + this(0, 0, 100, 0, 0, 0, -1, -1); } - public HStaticRange(int orientation, int minimum, int maximum, int value, - int x, int y, int width, int height) - { - org.videolan.Logger.unimplemented(HStaticRange.class.getName(), ""); + public HStaticRange(int orientation, int minimum, int maximum, int value) { + this(orientation, minimum, maximum, value, 0, 0, -1, -1); } - public HStaticRange(int orientation, int minimum, int maximum, int value) - { - org.videolan.Logger.unimplemented(HStaticRange.class.getName(), ""); + public HStaticRange(int orientation, int minimum, int maximum, int value, + int x, int y, int width, int height) { + + super(getDefaultLook(), x, y, width, height); + + logger.unimplemented(""); + + setOrientation(orientation); + setRange(minimum, maximum); + setValue(value); + setHorizontalAlignment(HALIGN_CENTER); + setVerticalAlignment(VALIGN_CENTER); } - public void setLook(HLook hlook) throws HInvalidLookException - { - throw new Error("Not implemented"); + public void setLook(HLook hlook) throws HInvalidLookException { + if (hlook == null || (hlook instanceof HRangeLook)) { + super.setLook(hlook); + } else { + logger.error("invalid look"); + throw new HInvalidLookException(); + } } - public static void setDefaultLook(HRangeLook look) - { + public static void setDefaultLook(HRangeLook look) { DefaultLook = look; } - public static HRangeLook getDefaultLook() - { + public static HRangeLook getDefaultLook() { if (DefaultLook == null) - org.videolan.Logger.unimplemented("", "getDefaultLook"); + Logger.unimplemented("", "getDefaultLook"); return DefaultLook; } - public int getOrientation() - { - throw new Error("Not implemented"); + public int getOrientation() { + return orientation; } - public void setOrientation(int orient) - { - throw new Error("Not implemented"); + public void setOrientation(int orient) { + logger.unimplemented("setOrientation"); + this.orientation = orient; } - public boolean setRange(int minimum, int maximum) - { - throw new Error("Not implemented"); + public boolean setRange(int minimum, int maximum) { + logger.unimplemented("setRange"); + return false; } - public int getMinValue() - { - throw new Error("Not implemented"); + public int getMinValue() { + return minimum; } - public int getMaxValue() - { - throw new Error("Not implemented"); + public int getMaxValue() { + return maximum; } - public void setValue(int value) - { - throw new Error("Not implemented"); + public void setValue(int value) { + logger.unimplemented("setValue"); } - public int getValue() - { - throw new Error("Not implemented"); + public int getValue() { + return value; } - public void setThumbOffsets(int minOffset, int maxOffset) - { - throw new Error("Not implemented"); + public void setThumbOffsets(int minOffset, int maxOffset) { + logger.unimplemented("setThumbOffset"); } - public int getThumbMinOffset() - { - throw new Error("Not implemented"); + public int getThumbMinOffset() { + return minOffset; } - public int getThumbMaxOffset() - { - throw new Error("Not implemented"); + public int getThumbMaxOffset() { + return maxOffset; } - public void setBehavior(int behavior) - { - throw new Error("Not implemented"); + public void setBehavior(int behavior) { + logger.unimplemented(""); + this.behavior = behavior; } - public int getBehavior() - { - throw new Error("Not implemented"); + public int getBehavior() { + return behavior; } + private int value = 0; + private int minimum = 0; + private int maximum = 100; + private int orientation = 0; + private int behavior = SLIDER_BEHAVIOR; + private int minOffset = 0; + private int maxOffset = 0; + public final static int SLIDER_BEHAVIOR = 0; public final static int SCROLLBAR_BEHAVIOR = 1; private static HRangeLook DefaultLook = null; private static final long serialVersionUID = 3871722305722412744L; + + private static final Logger logger = Logger.getLogger(HStaticRange.class.getName()); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HStaticText.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HStaticText.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HStaticText.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HStaticText.java 2017-06-23 13:35:08.000000000 +0000 @@ -27,13 +27,11 @@ import org.videolan.Logger; public class HStaticText extends HVisible implements HNoInputPreferred { - public HStaticText() - { + public HStaticText() { this(null, 0, 0, 0, 0); } - public HStaticText(String textNormal, int x, int y, int width, int height) - { + public HStaticText(String textNormal, int x, int y, int width, int height) { super(getDefaultLook(), x, y, width, height); setTextContent(textNormal, ALL_STATES); logger.info("HStaticText " + textNormal + " at " + x + "," + y + " " + width + "x" + height); @@ -41,8 +39,7 @@ public HStaticText(String textNormal, int x, int y, int width, int height, Font font, Color foreground, Color background, - HTextLayoutManager tlm) - { + HTextLayoutManager tlm) { this(textNormal, x, y, width, height); setFont(font); setForeground(foreground); @@ -50,15 +47,13 @@ setTextLayoutManager(tlm); } - public HStaticText(String textNormal) - { + public HStaticText(String textNormal) { this(textNormal, 0, 0, 0, 0); setTextContent(textNormal, NORMAL_STATE); } public HStaticText(String textNormal, Font font, Color foreground, - Color background, HTextLayoutManager tlm) - { + Color background, HTextLayoutManager tlm) { this(textNormal, 0, 0, 0, 0); setFont(font); setForeground(foreground); @@ -66,20 +61,17 @@ setTextLayoutManager(tlm); } - public void setLook(HLook hlook) throws HInvalidLookException - { + public void setLook(HLook hlook) throws HInvalidLookException { if ((hlook != null) && !(hlook instanceof HTextLook)) throw new HInvalidLookException(); super.setLook(hlook); } - public static void setDefaultLook(HTextLook hlook) - { + public static void setDefaultLook(HTextLook hlook) { BDJXletContext.setXletDefaultLook(PROPERTY_LOOK,hlook); } - public static HTextLook getDefaultLook() - { + public static HTextLook getDefaultLook() { return (HTextLook) BDJXletContext.getXletDefaultLook(PROPERTY_LOOK,DEFAULT_LOOK); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HStillImageBackgroundConfiguration.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HStillImageBackgroundConfiguration.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HStillImageBackgroundConfiguration.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HStillImageBackgroundConfiguration.java 2017-06-23 13:35:07.000000000 +0000 @@ -25,7 +25,6 @@ public class HStillImageBackgroundConfiguration extends HBackgroundConfiguration { protected HStillImageBackgroundConfiguration() { - } protected HStillImageBackgroundConfiguration(HBackgroundConfigTemplate hbct, Color color) { @@ -39,8 +38,7 @@ public void displayImage(HBackgroundImage image, HScreenRectangle r) throws IOException, HPermissionDeniedException, - HConfigurationException - { + HConfigurationException { this.image = image; this.rect = r; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HTextButton.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HTextButton.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HTextButton.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HTextButton.java 2017-06-23 13:35:07.000000000 +0000 @@ -27,140 +27,122 @@ import org.havi.ui.event.HFocusListener; public class HTextButton extends HText implements HActionable { - public HTextButton() - { + public HTextButton() { org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public HTextButton(String text, int x, int y, int width, int height) - { + public HTextButton(String text, int x, int y, int width, int height) { org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } public HTextButton(String text, int x, int y, int width, int height, Font font, Color foreground, Color background, - HTextLayoutManager tlm) - { + HTextLayoutManager tlm) { org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public HTextButton(String text) - { + public HTextButton(String text) { org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } public HTextButton(String text, Font font, Color foreground, - Color background, HTextLayoutManager tlm) - { + Color background, HTextLayoutManager tlm) { org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public static void setDefaultLook(HTextLook hlook) - { + public static void setDefaultLook(HTextLook hlook) { DefaultLook = hlook; } - public static HTextLook getDefaultLook() - { + public static HTextLook getDefaultLook() { if (DefaultLook == null) org.videolan.Logger.unimplemented("", "getDefaultLook"); return DefaultLook; } - public void setMove(int keyCode, HNavigable target) - { - throw new Error("Not implemented"); + public void setMove(int keyCode, HNavigable target) { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } public HNavigable getMove(int keyCode) { - throw new Error("Not implemented"); + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); + return null; } public void setFocusTraversal(HNavigable up, HNavigable down, - HNavigable left, HNavigable right) - { - throw new Error("Not implemented"); + HNavigable left, HNavigable right) { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public boolean isSelected() - { - throw new Error("Not implemented"); + public boolean isSelected() { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); + return false; } - public void setGainFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setGainFocusSound(HSound sound) { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public void setLoseFocusSound(HSound sound) - { - throw new Error("Not implemented"); + public void setLoseFocusSound(HSound sound) { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public HSound getGainFocusSound() - { - throw new Error("Not implemented"); + public HSound getGainFocusSound() { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); + return null; } - public HSound getLoseFocusSound() - { - throw new Error("Not implemented"); + public HSound getLoseFocusSound() { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); + return null; } - public void addHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void addHFocusListener(HFocusListener l) { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public void removeHFocusListener(HFocusListener l) - { - throw new Error("Not implemented"); + public void removeHFocusListener(HFocusListener l) { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public int[] getNavigationKeys() - { - throw new Error("Not implemented"); + public int[] getNavigationKeys() { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); + return null; } - public void processHFocusEvent(HFocusEvent evt) - { - throw new Error("Not implemented"); + public void processHFocusEvent(HFocusEvent evt) { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public void addHActionListener(HActionListener l) - { - throw new Error("Not implemented"); + public void addHActionListener(HActionListener l) { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public void removeHActionListener(HActionListener l) - { - throw new Error("Not implemented"); + public void removeHActionListener(HActionListener l) { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public void setActionCommand(String command) - { - throw new Error("Not implemented"); + public void setActionCommand(String command) { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public void setActionSound(HSound sound) - { - throw new Error("Not implemented"); + public void setActionSound(HSound sound) { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public HSound getActionSound() - { - throw new Error("Not implemented"); + public HSound getActionSound() { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); + return null; } - public void processHActionEvent(HActionEvent evt) - { - throw new Error("Not implemented"); + public void processHActionEvent(HActionEvent evt) { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); } - public String getActionCommand() - { - throw new Error("Not implemented"); + public String getActionCommand() { + org.videolan.Logger.unimplemented(HTextButton.class.getName(), ""); + return null; } private static HTextLook DefaultLook = null; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HText.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HText.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HText.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HText.java 2017-06-23 13:35:07.000000000 +0000 @@ -26,32 +26,28 @@ import org.havi.ui.event.HFocusEvent; import org.havi.ui.event.HFocusListener; +import org.videolan.BDJXletContext; import org.videolan.Logger; public class HText extends HStaticText implements HNavigable { - public HText() - { + public HText() { this(null); } - public HText(String text) - { + public HText(String text) { this(text, text, 0, 0, 0, 0); } - public HText(String textNormal, String textFocus) - { + public HText(String textNormal, String textFocus) { this(textNormal, textFocus, 0, 0, 0, 0); } - public HText(String text, int x, int y, int width, int height) - { + public HText(String text, int x, int y, int width, int height) { this(text, text, x, y, width, height); } public HText(String textNormal, String textFocus, int x, int y, int width, - int height) - { + int height) { super(textNormal, x, y, width, height); try { setLook(getDefaultLook()); @@ -68,27 +64,23 @@ } public HText(String text, Font font, Color foreground, Color background, - HTextLayoutManager tlm) - { + HTextLayoutManager tlm) { this(text, text, 0, 0, 0, 0, font, foreground, background, tlm); } public HText(String textNormal, String textFocus, Font font, - Color foreground, Color background, HTextLayoutManager tlm) - { + Color foreground, Color background, HTextLayoutManager tlm) { this(textNormal, textFocus, 0, 0, 0, 0, font, foreground, background, tlm); } public HText(String text, int x, int y, int width, int height, Font font, - Color foreground, Color background, HTextLayoutManager tlm) - { + Color foreground, Color background, HTextLayoutManager tlm) { this(text, text, x, y, width, height, font, foreground, background, tlm); } public HText(String textNormal, String textFocus, int x, int y, int width, int height, Font font, Color foreground, Color background, - HTextLayoutManager tlm) - { + HTextLayoutManager tlm) { this(textNormal, textFocus, x, y, width, height); setFont(font); setForeground(foreground); @@ -96,90 +88,74 @@ setTextLayoutManager(tlm); } - public static void setDefaultLook(HTextLook look) - { - DefaultLook = look; - } - - public static HTextLook getDefaultLook() - { - if (DefaultLook == null) - DefaultLook = new HTextLook(); - return DefaultLook; - } - - public void setMove(int keyCode, HNavigable target) - { + public void setMove(int keyCode, HNavigable target) { logger.unimplemented("setMove"); } - public HNavigable getMove(int keyCode) - { + public HNavigable getMove(int keyCode) { logger.unimplemented("getMove"); return this; } - public boolean isFocusable() - { + public boolean isFocusable() { return true; } public void setFocusTraversal(HNavigable up, HNavigable down, - HNavigable left, HNavigable right) - { + HNavigable left, HNavigable right) { logger.unimplemented("setFocusTraversal"); } - public boolean isSelected() - { + public boolean isSelected() { logger.unimplemented("isSelected"); return false; } - public void setGainFocusSound(HSound sound) - { + public void setGainFocusSound(HSound sound) { logger.unimplemented("setGainFocusSound"); } - public void setLoseFocusSound(HSound sound) - { + public void setLoseFocusSound(HSound sound) { logger.unimplemented("setLoseFocusSound"); } - public HSound getGainFocusSound() - { + public HSound getGainFocusSound() { logger.unimplemented("getGainFocusSound"); return null; } - public HSound getLoseFocusSound() - { + public HSound getLoseFocusSound() { logger.unimplemented("getLoseFocusSound"); return null; } - public void addHFocusListener(HFocusListener l) - { + public void addHFocusListener(HFocusListener l) { logger.unimplemented("addHFocusListener"); } - public void removeHFocusListener(HFocusListener l) - { + public void removeHFocusListener(HFocusListener l) { logger.unimplemented("removeHFocusListener"); } - public int[] getNavigationKeys() - { + public int[] getNavigationKeys() { logger.unimplemented("getNavigationKeys"); return null; } - public void processHFocusEvent(HFocusEvent evt) - { + public void processHFocusEvent(HFocusEvent evt) { logger.unimplemented("processHFocusEvent"); } - private static HTextLook DefaultLook = null; + public static void setDefaultLook(HTextLook hlook) { + BDJXletContext.setXletDefaultLook(PROPERTY_LOOK, hlook); + } + + public static HTextLook getDefaultLook() { + return (HTextLook) BDJXletContext.getXletDefaultLook(PROPERTY_LOOK, DEFAULT_LOOK); + } + + static final Class DEFAULT_LOOK = HTextLook.class; + private static final String PROPERTY_LOOK = HText.class.getName(); private static final long serialVersionUID = -8178609258303529066L; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HTextLook.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HTextLook.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HTextLook.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HTextLook.java 2017-06-23 13:35:08.000000000 +0000 @@ -29,12 +29,10 @@ public class HTextLook implements HExtendedLook { - public HTextLook() - { + public HTextLook() { } - public void fillBackground(Graphics g, HVisible visible, int state) - { + public void fillBackground(Graphics g, HVisible visible, int state) { if (visible.getBackgroundMode() == HVisible.BACKGROUND_FILL) { Color color = visible.getBackground(); Dimension dimension = visible.getSize(); @@ -43,8 +41,7 @@ } } - public void renderBorders(Graphics g, HVisible visible, int state) - { + public void renderBorders(Graphics g, HVisible visible, int state) { Insets insets = getInsets(visible); Color fg = visible.getForeground(); Dimension dimension = visible.getSize(); @@ -58,48 +55,41 @@ } } - public void renderVisible(Graphics g, HVisible visible, int state) - { + public void renderVisible(Graphics g, HVisible visible, int state) { String text = visible.getTextContent(state); - Insets insets = getInsets(visible); + //Insets insets = getInsets(visible); if (text == null) { return; } logger.unimplemented("renderVisible[text=" + text + "]"); } - public void showLook(Graphics g, HVisible visible, int state) - { + public void showLook(Graphics g, HVisible visible, int state) { fillBackground(g, visible, state); renderVisible(g, visible, state); renderBorders(g, visible, state); } - public void widgetChanged(HVisible visible, HChangeData[] changes) - { + public void widgetChanged(HVisible visible, HChangeData[] changes) { visible.repaint(); } - public Dimension getMinimumSize(HVisible hvisible) - { + public Dimension getMinimumSize(HVisible hvisible) { logger.unimplemented("getMinimumSize"); return null; } - public Dimension getPreferredSize(HVisible hvisible) - { + public Dimension getPreferredSize(HVisible hvisible) { logger.unimplemented("getPreferredSize"); return null; } - public Dimension getMaximumSize(HVisible hvisible) - { + public Dimension getMaximumSize(HVisible hvisible) { logger.unimplemented("getMAximumSize"); return null; } - public boolean isOpaque(HVisible visible) - { + public boolean isOpaque(HVisible visible) { if (visible.getBackgroundMode() != 1) { return false; } @@ -112,8 +102,7 @@ return true; } - public Insets getInsets(HVisible visible) - { + public Insets getInsets(HVisible visible) { if (!visible.getBordersEnabled()) { return new Insets(0, 0, 0, 0); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HToggleButton.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HToggleButton.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HToggleButton.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HToggleButton.java 2017-06-23 13:35:06.000000000 +0000 @@ -24,35 +24,30 @@ import org.videolan.BDJXletContext; public class HToggleButton extends HGraphicButton implements HSwitchable { - public HToggleButton() - { + public HToggleButton() { super(); iniz(); } - public HToggleButton(Image image, int x, int y, int width, int height) - { + public HToggleButton(Image image, int x, int y, int width, int height) { super(image, x, y, width, height); iniz(); } - public HToggleButton(Image image) - { + public HToggleButton(Image image) { super(image); iniz(); } public HToggleButton(Image image, int x, int y, int width, int height, - boolean state) - { + boolean state) { this(image, x, y, width, height); setSwitchableState(state); } public HToggleButton(Image imageNormal, Image imageFocused, Image imageActioned, Image imageNormalActioned, int x, int y, - int width, int height, boolean state) - { + int width, int height, boolean state) { super(imageNormal, imageFocused, imageActioned, x, y, width, height); setGraphicContent(imageNormalActioned, ACTIONED_STATE); setSwitchableState(state); @@ -60,8 +55,7 @@ } public HToggleButton(Image imageNormal, Image imageFocused, - Image imageActioned, Image imageNormalActioned, boolean state) - { + Image imageActioned, Image imageNormalActioned, boolean state) { super(imageNormal, imageFocused, imageActioned); setGraphicContent(imageNormalActioned, ACTIONED_STATE); setSwitchableState(state); @@ -69,14 +63,12 @@ } public HToggleButton(Image image, int x, int y, int width, int height, - boolean state, HToggleGroup group) - { + boolean state, HToggleGroup group) { this(image, x, y, width, height, state); setToggleGroup(group); } - public HToggleButton(Image image, boolean state, HToggleGroup group) - { + public HToggleButton(Image image, boolean state, HToggleGroup group) { this(image); setSwitchableState(state); setToggleGroup(group); @@ -84,30 +76,26 @@ public HToggleButton(Image imageNormal, Image imageFocused, Image imageActioned, Image imageNormalActioned, int x, int y, - int width, int height, boolean state, HToggleGroup group) - { + int width, int height, boolean state, HToggleGroup group) { this(imageNormal, imageFocused, imageActioned, imageNormalActioned, x, y, width, height, state); setToggleGroup(group); } public HToggleButton(Image imageNormal, Image imageFocused, Image imageActioned, Image imageNormalActioned, boolean state, - HToggleGroup group) - { + HToggleGroup group) { this(imageNormal, imageFocused, imageActioned, imageNormalActioned, state); setToggleGroup(group); } - private void iniz() - { + private void iniz() { try { setLook(getDefaultLook()); } catch (HInvalidLookException ignored) { } } - public void setToggleGroup(HToggleGroup group) - { + public void setToggleGroup(HToggleGroup group) { HToggleGroup oldGroup = toggleGroup; // Remove ourselves if already a member of a group @@ -127,44 +115,36 @@ } } - public HToggleGroup getToggleGroup() - { + public HToggleGroup getToggleGroup() { return toggleGroup; } - public void removeToggleGroup() - { + public void removeToggleGroup() { setToggleGroup(null); } - public static void setDefaultLook(HGraphicLook hlook) - { + public static void setDefaultLook(HGraphicLook hlook) { BDJXletContext.setXletDefaultLook(PROPERTY_LOOK, hlook); } - public static HGraphicLook getDefaultLook() - { + public static HGraphicLook getDefaultLook() { return (HGraphicLook) BDJXletContext.getXletDefaultLook(PROPERTY_LOOK, DEFAULT_LOOK); } - public boolean getSwitchableState() - { + public boolean getSwitchableState() { return (getInteractionState() & ACTIONED_STATE_BIT) != 0; } - public void setSwitchableState(boolean state) - { + public void setSwitchableState(boolean state) { int old = getInteractionState(); setInteractionState(state ? (old | ACTIONED_STATE_BIT) : (old & ~ACTIONED_STATE_BIT)); } - public void setUnsetActionSound(HSound sound) - { + public void setUnsetActionSound(HSound sound) { unsetActionSound = sound; } - public HSound getUnsetActionSound() - { + public HSound getUnsetActionSound() { return unsetActionSound; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HToggleGroup.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HToggleGroup.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HToggleGroup.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HToggleGroup.java 2017-06-23 13:35:08.000000000 +0000 @@ -24,17 +24,14 @@ public class HToggleGroup { - public HToggleGroup() - { + public HToggleGroup() { } - public HToggleButton getCurrent() - { + public HToggleButton getCurrent() { return current; } - public void setCurrent(HToggleButton selection) - { + public void setCurrent(HToggleButton selection) { // Treat null as unselection if (selection == null) { HToggleButton tmp = getCurrent(); @@ -56,8 +53,7 @@ } } - public void setForcedSelection(boolean forceSelection) - { + public void setForcedSelection(boolean forceSelection) { this.forceSelection = forceSelection; // Enforce new setting @@ -66,26 +62,22 @@ } } - public boolean getForcedSelection() - { + public boolean getForcedSelection() { return forceSelection; } - public void setEnabled(boolean enable) - { + public void setEnabled(boolean enable) { enabled = enable; for (Enumeration e = buttons.elements(); e.hasMoreElements();) { setEnabled((HToggleButton) e.nextElement(), enable); } } - public boolean isEnabled() - { + public boolean isEnabled() { return enabled; } - protected void add(HToggleButton button) - { + protected void add(HToggleButton button) { // Only add if not already added if (!buttons.contains(button)) { buttons.addElement(button); @@ -106,8 +98,7 @@ } } - protected void remove(HToggleButton button) - { + protected void remove(HToggleButton button) { if (!buttons.removeElement(button)) { throw new IllegalArgumentException("Not a member of this HToggleGroup"); } else { @@ -122,16 +113,14 @@ } - private void unswitch(HToggleButton button) - { + private void unswitch(HToggleButton button) { for (Enumeration e = buttons.elements(); e.hasMoreElements();) { HToggleButton b = (HToggleButton) e.nextElement(); if (b != button) b.setSwitchableState(false); } } - private void forceSelect() - { + private void forceSelect() { // assert(getCurrent() == null); if (buttons.size() > 0) { HToggleButton b = (HToggleButton) buttons.elementAt(0); @@ -140,8 +129,7 @@ } } - private void setEnabled(HToggleButton tb, boolean enable) - { + private void setEnabled(HToggleButton tb, boolean enable) { if (false) { // If HAVi 1.1 tb.setEnabled(enable); } else { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HUIException.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HUIException.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HUIException.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HUIException.java 2017-06-23 13:35:07.000000000 +0000 @@ -20,13 +20,11 @@ package org.havi.ui; public class HUIException extends Exception { - public HUIException() - { + public HUIException() { super(); } - public HUIException(String reason) - { + public HUIException(String reason) { super(reason); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HVideoComponent.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HVideoComponent.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HVideoComponent.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HVideoComponent.java 2017-06-23 13:35:08.000000000 +0000 @@ -22,27 +22,23 @@ import org.havi.ui.event.HScreenLocationModifiedListener; public class HVideoComponent extends HComponent { - protected HVideoComponent() - { + protected HVideoComponent() { org.videolan.Logger.unimplemented(HVideoComponent.class.getName(), ""); } - public HVideoDevice getVideoDevice() - { + public HVideoDevice getVideoDevice() { org.videolan.Logger.unimplemented(HVideoComponent.class.getName(), "getVideoDevice"); return new HVideoDevice(); } public void addOnScreenLocationModifiedListener( - HScreenLocationModifiedListener slml) - { + HScreenLocationModifiedListener slml) { org.videolan.Logger.unimplemented(HVideoComponent.class.getName(), "addOnScreenLocationModifiedListener"); } public void removeOnScreenLocationModifiedListener( - HScreenLocationModifiedListener slml) - { + HScreenLocationModifiedListener slml) { org.videolan.Logger.unimplemented(HVideoComponent.class.getName(), "removeOnScreenLocationModifiedListener"); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HVideoConfiguration.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HVideoConfiguration.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HVideoConfiguration.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HVideoConfiguration.java 2017-06-23 13:35:04.000000000 +0000 @@ -21,7 +21,6 @@ public class HVideoConfiguration extends HScreenConfiguration { protected HVideoConfiguration() { - } HVideoConfiguration(HVideoConfigTemplate hvct) { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HVisible.java libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HVisible.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/havi/ui/HVisible.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/havi/ui/HVisible.java 2017-06-23 13:35:07.000000000 +0000 @@ -29,18 +29,15 @@ import org.videolan.Logger; public class HVisible extends HComponent implements HState { - public HVisible() - { + public HVisible() { this(null); } - public HVisible(HLook hlook) - { + public HVisible(HLook hlook) { this(hlook, 0, 0, 0, 0); } - public HVisible(HLook hlook, int x, int y, int width, int height) - { + public HVisible(HLook hlook, int x, int y, int width, int height) { super(x, y, width, height); hLook = hlook; TextLayoutManager = new HDefaultTextLayoutManager(); @@ -48,48 +45,40 @@ content = new Object[LAST_STATE - FIRST_STATE + 1]; } - public boolean isFocusTraversable() - { + public boolean isFocusTraversable() { if (this instanceof HNavigable || this instanceof HSelectionInputPreferred) { return true; } return false; } - public void paint(Graphics g) - { + public void paint(Graphics g) { if (hLook != null) hLook.showLook(g, this, InteractionState); } - public void update(Graphics g) - { + public void update(Graphics g) { g.setColor(getBackground()); paint(g); } - public void setTextContent(String string, int state) - { + public void setTextContent(String string, int state) { setContentImpl(string, state, TEXT_CONTENT_CHANGE); } - public void setGraphicContent(Image image, int state) - { + public void setGraphicContent(Image image, int state) { setContentImpl(image, state, GRAPHIC_CONTENT_CHANGE); } - public void setAnimateContent(Image[] imageArray, int state) - { + public void setAnimateContent(Image[] imageArray, int state) { setContentImpl(imageArray, state, ANIMATE_CONTENT_CHANGE); } - public void setContent(Object object, int state) - { + public void setContent(Object object, int state) { setContentImpl(object, state, CONTENT_CHANGE); } - private void setContentImpl(Object object, int state, int hint) - { + private void setContentImpl(Object object, int state, int hint) { int states = LAST_STATE - FIRST_STATE + 1; Object[] oldData = new Object[states + 1]; @@ -154,34 +143,29 @@ return content[state - FIRST_STATE]; } - public void setLook(HLook hlook) throws HInvalidLookException - { + public void setLook(HLook hlook) throws HInvalidLookException { hLook = hlook; } - public HLook getLook() - { + public HLook getLook() { return hLook; } - public Dimension getPreferredSize() - { + public Dimension getPreferredSize() { if (hLook != null) { return hLook.getPreferredSize(this); } return getSize(); } - public Dimension getMaximumSize() - { + public Dimension getMaximumSize() { if (hLook != null) { return hLook.getMaximumSize(this); } return getSize(); } - public Dimension getMinimumSize() - { + public Dimension getMinimumSize() { if (hLook != null) { return hLook.getMinimumSize(this); } @@ -195,8 +179,7 @@ setInteractionState(InteractionState | FOCUSED_STATE_BIT); } - protected void setInteractionState(int state) - { + protected void setInteractionState(int state) { if (InteractionState == state) return; @@ -205,28 +188,23 @@ visibleChanged(STATE_CHANGE, oldState); } - public int getInteractionState() - { + public int getInteractionState() { return InteractionState; } - public void setTextLayoutManager(HTextLayoutManager manager) - { + public void setTextLayoutManager(HTextLayoutManager manager) { TextLayoutManager = manager; } - public HTextLayoutManager getTextLayoutManager() - { + public HTextLayoutManager getTextLayoutManager() { return TextLayoutManager; } - public int getBackgroundMode() - { + public int getBackgroundMode() { return BackgroundMode; } - public void setBackgroundMode(int mode) - { + public void setBackgroundMode(int mode) { if (mode != BACKGROUND_FILL && mode != NO_BACKGROUND_FILL) { logger.info("mode out of range in setBackgroundMode()"); throw new IllegalArgumentException("Unknown background fill mode"); @@ -234,34 +212,29 @@ BackgroundMode = mode; } - public boolean isOpaque() - { + public boolean isOpaque() { if (hLook == null) { return false; } return hLook.isOpaque(this); } - public void setDefaultSize(Dimension defaultSize) - { + public void setDefaultSize(Dimension defaultSize) { this.defaultSize = defaultSize; } - public Dimension getDefaultSize() - { + public Dimension getDefaultSize() { return defaultSize; } - public Object getLookData(Object key) - { + public Object getLookData(Object key) { if (lookData == null || !lookData.containsKey(key)) { return null; } return lookData.get(key); } - public void setLookData(Object key, Object data) - { + public void setLookData(Object key, Object data) { if (lookData == null) { lookData = new Hashtable(); } @@ -277,8 +250,7 @@ lookData.put(key, data); } - public void setHorizontalAlignment(int halign) - { + public void setHorizontalAlignment(int halign) { if (halign != HALIGN_LEFT && halign != HALIGN_CENTER && halign != HALIGN_RIGHT && halign != HALIGN_JUSTIFY) { logger.info("align out of range in setHorizontalAlignment()"); @@ -289,8 +261,7 @@ visibleChanged(UNKNOWN_CHANGE, new Integer(UNKNOWN_CHANGE)); } - public void setVerticalAlignment(int valign) - { + public void setVerticalAlignment(int valign) { if (valign != VALIGN_TOP && valign != VALIGN_CENTER && valign != VALIGN_BOTTOM && valign != VALIGN_JUSTIFY) { logger.info("align out of range in setVerticalAlignment()"); @@ -301,18 +272,15 @@ visibleChanged(UNKNOWN_CHANGE, new Integer(UNKNOWN_CHANGE)); } - public int getHorizontalAlignment() - { + public int getHorizontalAlignment() { return halign; } - public int getVerticalAlignment() - { + public int getVerticalAlignment() { return valign; } - public void setResizeMode(int resize) - { + public void setResizeMode(int resize) { if (resize != RESIZE_NONE && resize != RESIZE_PRESERVE_ASPECT && resize != RESIZE_ARBITRARY) { logger.info("resize out of range in setResizeMode()"); @@ -323,13 +291,11 @@ visibleChanged(UNKNOWN_CHANGE, new Integer(UNKNOWN_CHANGE)); } - public int getResizeMode() - { + public int getResizeMode() { return resizeMode; } - public void setEnabled(boolean b) - { + public void setEnabled(boolean b) { super.setEnabled(b); if (b) { setInteractionState(InteractionState & (~DISABLED_STATE_BIT)); @@ -338,8 +304,7 @@ } } - public void setBordersEnabled(boolean enable) - { + public void setBordersEnabled(boolean enable) { if (enable == BordersEnabled) return; @@ -352,8 +317,7 @@ } } - public boolean getBordersEnabled() - { + public boolean getBordersEnabled() { return BordersEnabled; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/Arrays.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/Arrays.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/Arrays.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/Arrays.java 2017-06-23 13:34:56.000000000 +0000 @@ -36,7 +36,7 @@ buffer.append('['); int length = array.length; for (int j = 0; j < length; j++) { - buffer.append(array[j]); + buffer.append(array[j]); if (j < (length - 1)) buffer.append(", "); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJActionManager.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJActionManager.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJActionManager.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJActionManager.java 2017-06-23 13:35:00.000000000 +0000 @@ -32,7 +32,7 @@ } public BDJActionManager() { - commandQueue = new BDJActionQueue("BDJActionManager"); + commandQueue = BDJActionQueue.create("BDJActionManager"); } protected static void shutdown() { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJActionQueue.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJActionQueue.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJActionQueue.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJActionQueue.java 2017-06-23 13:34:55.000000000 +0000 @@ -21,23 +21,34 @@ import java.util.LinkedList; public class BDJActionQueue implements Runnable { - public BDJActionQueue(String name) { - this(null, name); + + public static BDJActionQueue create(String name) { + return create(null, name); + } + + public static BDJActionQueue create(BDJThreadGroup threadGroup, String name) { + BDJActionQueue aq = new BDJActionQueue(threadGroup, name); + aq.startThread(threadGroup, name); + return aq; } - public BDJActionQueue(BDJThreadGroup threadGroup, String name) { + private BDJActionQueue(BDJThreadGroup threadGroup, String name) { if (threadGroup == null) { if (BDJXletContext.getCurrentContext() != null) { - logger.error("BDJActionQueue created from wrong context: " + Logger.dumpStack()); + logger.error("BDJActionQueue " + name + " created from wrong context: " + Logger.dumpStack()); + // throw new SecurityException(); } } + } + private void startThread(BDJThreadGroup threadGroup, String name) { /* run all actions in given thread group / xlet context */ thread = new Thread(threadGroup, this, name + ".BDJActionQueue"); thread.setDaemon(true); thread.start(); - watchdog = new Watchdog(name); + watchdog = new Watchdog(); + watchdog.start(name); } public void shutdown() { @@ -115,7 +126,9 @@ private Object currentAction = null; private boolean terminate = false; - Watchdog(String name) { + Watchdog() {} + + synchronized void start(String name) { Thread t = new Thread(null, this, name + ".BDJActionQueue.Monitor"); t.setDaemon(true); t.start(); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJAppProxy.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJAppProxy.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJAppProxy.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJAppProxy.java 2017-06-23 13:34:56.000000000 +0000 @@ -89,12 +89,21 @@ } } - public void stop(boolean force) { + public void stop(boolean force, int timeout) { AppCommand cmd = new AppCommand(AppCommand.CMD_STOP, new Boolean(force)); synchronized(cmds) { cmds.addLast(cmd); cmds.notifyAll(); } + if (timeout > 0) { + if (!cmd.waitDone(timeout)) { + logger.error("stop() timeout: Xlet " + context.getThreadGroup().getName()); + } + } + } + + public void stop(boolean force) { + stop(force, -1); } public void pause() { @@ -203,7 +212,10 @@ String persistent = System.getProperty("dvb.persistent.root") + File.separator + (String)context.getXletProperty("dvb.org.id") + File.separator + (String)context.getXletProperty("dvb.app.id"); - new File(persistent).mkdirs(); + File f = new File(persistent); + if (!f.exists() && !f.mkdirs()) { + logger.error("Error creating persistent storage " + persistent); + } xlet.initXlet(context); state = PAUSED; return true; @@ -243,6 +255,8 @@ context.closeSockets(); context.getThreadGroup().waitForShutdown(1000, 1 + context.numEventQueueThreads()); + context.exitXlet(); + } catch (Throwable e) { logger.error("doStop() failed: " + e + "\n" + Logger.dumpStack(e)); state = INVALID; @@ -357,7 +371,7 @@ private Thread thread; private static final Logger logger = Logger.getLogger(BDJAppProxy.class.getName()); - private class AppCommand { + private static class AppCommand { public AppCommand(int cmd, Object arg) { this.cmd = cmd; this.arg = arg; @@ -384,8 +398,8 @@ } catch (InterruptedException e) { } } + return done; } - return done; } public void release() { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJAppsDatabase.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJAppsDatabase.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJAppsDatabase.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJAppsDatabase.java 2017-06-23 13:35:00.000000000 +0000 @@ -31,16 +31,21 @@ import org.videolan.bdjo.Bdjo; public class BDJAppsDatabase extends AppsDatabase { + + private static final Object instanceLock = new Object(); + static public AppsDatabase getAppsDatabase() { - synchronized (BDJAppsDatabase.class) { + synchronized (instanceLock) { if (instance == null) instance = new BDJAppsDatabase(); + return instance; } - return instance; } + private static final Object appTableLock = new Object(); + public int size() { - synchronized (this) { + synchronized (appTableLock) { if (appTable == null) return 0; return appTable.length; @@ -49,7 +54,7 @@ public Enumeration getAppIDs(AppsDatabaseFilter filter) { Vector ids = new Vector(); - synchronized (this) { + synchronized (appTableLock) { if (appTable != null) for (int i = 0; i < appTable.length; i++) if (filter.accept(appTable[i].getIdentifier())) @@ -60,7 +65,7 @@ public Enumeration getAppAttributes(AppsDatabaseFilter filter) { Vector attributes = new Vector(); - synchronized (this) { + synchronized (appTableLock) { if (appTable != null) for (int i = 0; i < size(); i++) if (filter.accept(appTable[i].getIdentifier())) @@ -70,7 +75,7 @@ } public AppAttributes getAppAttributes(AppID key) { - synchronized (this) { + synchronized (appTableLock) { if (appTable != null) for (int i = 0; i < size(); i++) if (key.equals(appTable[i].getIdentifier())) @@ -80,7 +85,7 @@ } public AppProxy getAppProxy(AppID key) { - synchronized (this) { + synchronized (appTableLock) { if ((appTable != null) && (appProxys != null)) for (int i = 0; i < size(); i++) if (key.equals(appTable[i].getIdentifier())) @@ -94,7 +99,7 @@ } protected void newDatabase(Bdjo bdjo, BDJAppProxy[] appProxys) { - synchronized (this) { + synchronized (appTableLock) { this.bdjo = bdjo; this.appProxys = appProxys; this.appTable = (bdjo != null) ? bdjo.getAppTable() : null; @@ -106,5 +111,5 @@ private BDJAppProxy[] appProxys = null; private AppEntry[] appTable = null; - protected static BDJAppsDatabase instance = null; + private static BDJAppsDatabase instance = null; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJClassFileTransformer.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJClassFileTransformer.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJClassFileTransformer.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJClassFileTransformer.java 2017-06-23 13:34:56.000000000 +0000 @@ -0,0 +1,91 @@ +/* + * This file is part of libbluray + * Copyright (C) 2015 Petri Hintukainen <phintuka@users.sourceforge.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package org.videolan; + +/** + * This is a class which is called by BDJClassLoader + * when ClassFormatError is thrown inside defineClass(). + * + * Some discs have invalid debug info in class files (broken by + * malfunctioning obfuscater ?). + * We strip debug info from the class and try to load it again. + * + * Penguins of MAdagascar: + * java.lang.ClassFormatError: Invalid index 0 in LocalVariableTable' + * in class file com/tcs/blr/bluray/pal/fox/controller/d + */ + +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; +import org.objectweb.asm.Attribute; + +class BDJClassFileTransformer +{ + public byte[] transform(byte[] b, int off, int len) + throws ClassFormatError + { + logger.info("Trying to transform broken class file (" + len + " bytes)"); + + byte[] r = new byte[len]; + for (int i = 0; i < len; i++) + r[i] = b[i+off]; + + try { + ClassReader cr = new ClassReader(r); + ClassWriter cw = new ClassWriter(cr, 0/*ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS*/); + ClassVisitor cv = new MyClassVisitor(cw); + cr.accept(cv, ClassReader.SKIP_DEBUG); + return cw.toByteArray(); + } catch (Exception e) { + logger.error("Failed transforming class: " + e); + } + + return r; + } + + private static class MyClassVisitor extends ClassVisitor { + public MyClassVisitor(ClassVisitor cv) { + super(Opcodes.ASM4, cv); + } + + public MethodVisitor visitMethod(int access, String name, String desc, + String signature, String[] exceptions) { + MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions); + //System.err.println("visit method: " + name); + return new MyMethodVisitor(mv); + } + } + + private static class MyMethodVisitor extends MethodVisitor { + public MyMethodVisitor(MethodVisitor mv) { + super(Opcodes.ASM4, mv); + } + + public void visitAttribute(Attribute attr) { + //System.err.println(" attribute: " + attr.type); + super.visitAttribute(attr); + } + } + + private static final Logger logger = Logger.getLogger(BDJClassFileTransformer.class.getName()); +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJClassLoader.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJClassLoader.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJClassLoader.java 2015-02-28 16:45:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJClassLoader.java 2017-06-23 13:34:55.000000000 +0000 @@ -21,6 +21,7 @@ import java.net.MalformedURLException; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.InputStream; import java.io.IOException; @@ -126,7 +127,87 @@ } return c; } - return super.loadClass(name); + + try { + return super.loadClass(name); + } catch (ClassNotFoundException e0) { + logger.error("ClassNotFoundException: " + name); + throw e0; + } catch (Error err) { + logger.error("FATAL: " + err); + throw err; + } + } + + private byte[] loadClassCode(String name) throws ClassNotFoundException { + String path = name.replace('.', '/').concat(".class"); + + URL res = super.findResource(path); + if (res == null) { + logger.error("loadClassCode(): resource for class " + name + "not found"); + throw new ClassNotFoundException(name); + } + + InputStream is = null; + ByteArrayOutputStream os = null; + try { + is = res.openStream(); + os = new ByteArrayOutputStream(); + byte[] buffer = new byte[0xffff]; + while (true) { + int r = is.read(buffer); + if (r == -1) break; + os.write(buffer, 0, r); + } + + return os.toByteArray(); + + } catch (Exception e) { + logger.error("loadClassCode(" + name + ") failed: " + e); + throw new ClassNotFoundException(name); + + } finally { + try { + if (is != null) + is.close(); + } catch (IOException ioe) { + } + try { + if (os != null) + os.close(); + } catch (IOException ioe) { + } + } + } + + protected Class findClass(String name) throws ClassNotFoundException { + try { + return super.findClass(name); + + } catch (ClassFormatError ce) { + + /* try to "fix" broken class file */ + /* if we got ClassFormatError, package was already created. */ + byte[] b = loadClassCode(name); + if (b == null) { + logger.error("loadClassCode(" + name + ") failed"); + /* this usually kills Xlet ... */ + throw ce; + } + try { + b = new BDJClassFileTransformer().transform(b, 0, b.length); + return defineClass(b, 0, b.length); + } catch (ThreadDeath td) { + throw td; + } catch (Throwable t) { + logger.error("Class rewriting failed: " + t); + throw new ClassNotFoundException(name); + } + + } catch (Error er) { + logger.error("Unexpected error: " + er + " " + Logger.dumpStack(er)); + throw er; + } } public URL getResource(String name) { @@ -157,4 +238,6 @@ } private String xletClass; + + private static final Logger logger = Logger.getLogger(BDJClassLoader.class.getName()); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJListeners.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJListeners.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJListeners.java 2015-04-06 16:25:09.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJListeners.java 2017-06-23 13:34:56.000000000 +0000 @@ -56,6 +56,8 @@ import org.dvb.media.SubtitleNotAvailableEvent; import org.dvb.media.SubtitleNotSelectedEvent; import org.dvb.media.SubtitleSelectedEvent; +import org.dvb.media.VideoFormatListener; +import org.dvb.media.VideoFormatEvent; public class BDJListeners { private LinkedList listeners = new LinkedList(); @@ -139,7 +141,7 @@ } } - private class PSR102Status { + private static class PSR102Status { private PSR102Status(int value) { this.value = value; } @@ -220,6 +222,9 @@ event instanceof SubtitleNotSelectedEvent || event instanceof SubtitleSelectedEvent) { ((SubtitleListener)listener).subtitleStatusChanged((EventObject)event); + } else if (event instanceof VideoFormatEvent) { + ((VideoFormatListener)listener).receiveVideoFormatEvent((VideoFormatEvent)event); + } else if (event instanceof PSR102Status) { ((StatusListener)listener).receive(((PSR102Status)event).value); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJLoader.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJLoader.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJLoader.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJLoader.java 2017-06-23 13:34:56.000000000 +0000 @@ -44,8 +44,60 @@ public class BDJLoader { + private static class FontCacheAction extends BDJAction { + public FontCacheAction(InputStream is) { + this.fontPath = null; + this.is = is; + } + public FontCacheAction(String fontPath) { + this.fontPath = fontPath; + this.is = null; + } + + protected void doAction() { + try { + if (this.is != null) { + this.cacheFile = addFontImpl(is); + } else { + this.cacheFile = addFontImpl(fontPath); + } + } catch (RuntimeException e) { + this.exception = e; + } + } + + public File execute() { + BDJActionManager.getInstance().putCommand(this); + waitEnd(); + if (exception != null) { + throw exception; + } + return cacheFile; + } + + private final String fontPath; + private final InputStream is; + private File cacheFile = null; + private RuntimeException exception = null; + } + /* called by org.dvb.ui.FontFactory */ public static File addFont(InputStream is) { + if (BDJXletContext.getCurrentContext() == null) + return addFontImpl(is); + /* dispatch cache request to privileged thread */ + return new FontCacheAction(is).execute(); + } + + /* called by org.dvb.ui.FontFactory */ + public static File addFont(String fontFile) { + if (BDJXletContext.getCurrentContext() == null) + return addFontImpl(fontFile); + /* dispatch cache request to privileged thread */ + return new FontCacheAction(fontFile).execute(); + } + + private static File addFontImpl(InputStream is) { VFSCache localCache = vfsCache; if (localCache != null) { return localCache.addFont(is); @@ -53,8 +105,7 @@ return null; } - /* called by org.dvb.ui.FontFactory */ - public static File addFont(String fontFile) { + private static File addFontImpl(String fontFile) { VFSCache localCache = vfsCache; if (localCache != null) { return localCache.addFont(fontFile); @@ -85,7 +136,7 @@ return false; synchronized (BDJLoader.class) { if (queue == null) - queue = new BDJActionQueue(null, "BDJLoader"); + queue = BDJActionQueue.create("BDJLoader"); } queue.put(new BDJLoaderAction(title, restart, callback)); return true; @@ -96,7 +147,7 @@ synchronized (BDJLoader.class) { if (queue == null) - queue = new BDJActionQueue(null, "BDJLoader"); + queue = BDJActionQueue.create("BDJLoader"); } queue.put(new BDJLoaderAction(null, false, callback)); return true; @@ -134,11 +185,6 @@ throw new InvalidObjectException("bdjo not loaded"); AppEntry[] appTable = bdjo.getAppTable(); - // initialize AppCaches - if (vfsCache != null) { - vfsCache.add(bdjo.getAppCaches()); - } - // reuse appProxys BDJAppProxy[] proxys = new BDJAppProxy[appTable.length]; AppsDatabase db = AppsDatabase.getAppsDatabase(); @@ -147,6 +193,15 @@ AppID id = (AppID)ids.nextElement(); BDJAppProxy proxy = (BDJAppProxy)db.getAppProxy(id); AppEntry entry = (AppEntry)db.getAppAttributes(id); + if (proxy == null) { + logger.error("AppsDatabase corrupted!"); + continue; + } + if (entry == null) { + logger.error("AppsDatabase corrupted!"); + proxy.release(); + continue; + } for (int i = 0; i < appTable.length; i++) { if (id.equals(appTable[i].getIdentifier()) && entry.getInitialClass().equals(appTable[i].getInitialClass())) { @@ -155,7 +210,6 @@ proxy.stop(true); } else { logger.info("Keeping xlet " + appTable[i].getInitialClass()); - proxy.getXletContext().update(appTable[i], bdjo.getAppCaches()); proxys[i] = proxy; proxy = null; } @@ -163,7 +217,7 @@ } } if (proxy != null) { - logger.info("Terminating xlet " + (entry == null ? "?" : entry.getInitialClass())); + logger.info("Terminating xlet " + entry.getInitialClass()); proxy.release(); } } @@ -180,6 +234,11 @@ Libbluray.setUOMask(terminfo.getMenuCallMask(), terminfo.getTitleSearchMask()); Libbluray.setKeyInterest(bdjo.getKeyInterestTable()); + // initialize AppCaches + if (vfsCache != null) { + vfsCache.add(bdjo.getAppCaches()); + } + // initialize appProxys for (int i = 0; i < appTable.length; i++) { if (proxys[i] == null) { @@ -196,6 +255,7 @@ } logger.info("Loaded class: " + appTable[i].getInitialClass() + p + " from " + appTable[i].getBasePath() + ".jar"); } else { + proxys[i].getXletContext().update(appTable[i], bdjo.getAppCaches()); logger.info("Reused class: " + appTable[i].getInitialClass() + " from " + appTable[i].getBasePath() + ".jar"); } } @@ -206,6 +266,19 @@ // notify AppsDatabase ((BDJAppsDatabase)BDJAppsDatabase.getAppsDatabase()).newDatabase(bdjo, proxys); + // auto start playlist + try { + PlayListTable plt = bdjo.getAccessiblePlaylists(); + if ((plt != null) && (plt.isAutostartFirst())) { + logger.info("Auto-starting playlist"); + String[] pl = plt.getPlayLists(); + if (pl.length > 0) + Manager.createPlayer(new MediaLocator(new BDLocator("bd://PLAYLIST:" + pl[0]))).start(); + } + } catch (Exception e) { + logger.error("loadN(): autoplaylist failed: " + e + "\n" + Logger.dumpStack(e)); + } + // now run all the xlets for (int i = 0; i < appTable.length; i++) { int code = appTable[i].getControlCode(); @@ -222,15 +295,6 @@ logger.info("Finished initializing and starting xlets."); - // auto start playlist - PlayListTable plt = bdjo.getAccessiblePlaylists(); - if ((plt != null) && (plt.isAutostartFirst())) { - logger.info("Auto-starting playlist"); - String[] pl = plt.getPlayLists(); - if (pl.length > 0) - Manager.createPlayer(new MediaLocator(new BDLocator("bd://PLAYLIST:" + pl[0]))).start(); - } - return true; } catch (Throwable e) { @@ -254,14 +318,18 @@ while (ids.hasMoreElements()) { AppID id = (AppID)ids.nextElement(); BDJAppProxy proxy = (BDJAppProxy)db.getAppProxy(id); - proxy.stop(true); + if (proxy != null) { + proxy.stop(true); + } } ids = db.getAppIDs(new CurrentServiceFilter()); while (ids.hasMoreElements()) { AppID id = (AppID)ids.nextElement(); BDJAppProxy proxy = (BDJAppProxy)db.getAppProxy(id); - proxy.release(); + if (proxy != null) { + proxy.release(); + } } ((BDJAppsDatabase)db).newDatabase(null, null); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/bdjo/AppEntry.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/bdjo/AppEntry.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/bdjo/AppEntry.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/bdjo/AppEntry.java 2017-06-23 13:34:55.000000000 +0000 @@ -140,7 +140,8 @@ } public boolean isVisible() { - return ((visibility & VISIBLE_TO_USERS) != 0); + // Annex S + return false; } public boolean isDiscBound() { @@ -159,7 +160,7 @@ this.profiles = profiles; this.priority = priority; this.binding = binding; - this.visibility = visibility; + //this.visibility = visibility; this.names = names; if ((iconLocator != null) && (iconLocator.length() > 0)) { try { @@ -216,7 +217,7 @@ private AppProfile[] profiles; private short priority; private int binding; - private int visibility; + //private int visibility; private String[][] names; private AppIcon icon; private String basePath; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJSecurityManager.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJSecurityManager.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJSecurityManager.java 2015-04-15 08:30:17.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJSecurityManager.java 2017-06-23 13:34:56.000000000 +0000 @@ -35,6 +35,15 @@ private String persistentRoot; private boolean usingUdf = false; + private static Class urlPermission = null; + static { + try { + /* Java 8 */ + urlPermission = Class.forName("java.net.URLPermission"); + } catch (Exception e) { + } + } + BDJSecurityManager(String discRoot, String persistentRoot, String budaRoot) { this.discRoot = discRoot; this.cacheRoot = null; @@ -68,6 +77,12 @@ public void checkPermission(Permission perm) { if (perm instanceof RuntimePermission) { if (perm.implies(new RuntimePermission("createSecurityManager"))) { + + // allow initializing of javax.crypto.JceSecurityManager + if (classDepth("javax.crypto.JceSecurityManager") < 3) { + return; + } + deny(perm); } if (perm.implies(new RuntimePermission("setSecurityManager"))) { @@ -76,6 +91,14 @@ } deny(perm); } + + // work around bug in openjdk 7 / 8 + // sun.awt.AWTAutoShutdown.notifyThreadBusy is missing doPrivileged() + // (fixed in jdk9 / http://hg.openjdk.java.net/jdk9/client/jdk/rev/5b613a3c04be ) + if (classDepth("sun.awt.AWTAutoShutdown") > 0) { + return; + } + if (perm.implies(new RuntimePermission("modifyThreadGroup"))) { /* do check here (no need to log failures) */ super.checkPermission(perm); @@ -119,6 +142,10 @@ return; } } + if (perm.getActions().contains("write")) { + /* write permissions are handled in checkWrite() */ + deny(perm); + } } /* Networking */ @@ -127,6 +154,11 @@ return; } } + else if (urlPermission != null && + urlPermission.isInstance(perm)) { + logger.info("grant " + perm); + return; + } /* Java TV */ else if (perm instanceof javax.tv.service.ReadPermission) { @@ -180,6 +212,10 @@ throw new SecurityException("exit denied"); } + public void checkSystemClipboardAccess() { + throw new SecurityException("clipboard access denied"); + } + /* * file read access */ diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJThreadGroup.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJThreadGroup.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJThreadGroup.java 2015-02-28 19:23:41.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJThreadGroup.java 2017-06-23 13:34:56.000000000 +0000 @@ -20,9 +20,9 @@ package org.videolan; -public class BDJThreadGroup extends ThreadGroup { +class BDJThreadGroup extends ThreadGroup { - public BDJThreadGroup(String name, BDJXletContext context) { + protected BDJThreadGroup(String name, BDJXletContext context) { super(name); this.context = context; } @@ -31,29 +31,21 @@ String stack = ""; if (e != null) { - StackTraceElement elems[] = e.getStackTrace(); - if (elems != null) { - for (int i = 0; i < elems.length; i++) - stack += "\n\t" + elems[i].toString(); - } + stack = Logger.dumpStack(e); } if (e instanceof ThreadDeath) { - logger.error("Thread " + t + " killed" + stack); + logger.error("Thread " + t + " killed" /*+ stack*/); } else { logger.error("Unhandled exception in thread " + t + ": " + e + stack); } } - public BDJXletContext getContext() { + protected BDJXletContext getContext() { return context; } - public void setContext(BDJXletContext context) { - this.context = context; - } - - public boolean waitForShutdown(int timeout, int maxThreads) { + protected boolean waitForShutdown(int timeout, int maxThreads) { if (parentOf(Thread.currentThread().getThreadGroup()) && maxThreads < 1) { logger.error("Current Thread is contained within ThreadGroup to be disposed."); @@ -89,13 +81,14 @@ waitForShutdown(500, 0); } + if (destroyed) return; + try { destroy(); + destroyed = true; } catch (IllegalThreadStateException e) { logger.error("ThreadGroup destroy failed: " + e); } - - context = null; } public void dumpThreads() { @@ -115,6 +108,7 @@ } } - private BDJXletContext context; + private boolean destroyed = false; + private final BDJXletContext context; private static final Logger logger = Logger.getLogger(BDJThreadGroup.class.getName()); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJUtil.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJUtil.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJUtil.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJUtil.java 2017-06-23 13:34:56.000000000 +0000 @@ -25,20 +25,31 @@ /** * Make a five digit zero padded string based on an integer * Ex. integer 1 -> string "00001" - * + * * @param id * @return */ - public static String makeFiveDigitStr(int id) + public static String makeFiveDigitStr(int id) { + if (id < 0 || id > 99999) { + System.err.println("Invalid ID: " + id); + throw new IllegalArgumentException("Invalid ID " + id); + } + String s = "" + id; + while (s.length() < 5) { + s = "0" + s; + } + return s; + /* DecimalFormat fmt = new DecimalFormat(); fmt.setMaximumIntegerDigits(5); fmt.setMinimumIntegerDigits(5); fmt.setGroupingUsed(false); - + return fmt.format(id); + */ } - + /** * Make a path based on the disc root to an absolute path based on the filesystem of the computer * Ex. /BDMV/JAR/00000.jar -> /bluray/disc/mount/point/BDMV/JAR/00000.jar @@ -47,6 +58,11 @@ */ public static String discRootToFilesystem(String path) { - return System.getProperty("bluray.vfs.root") + path; + String vfsRoot = System.getProperty("bluray.vfs.root"); + if (vfsRoot == null) { + System.err.println("discRootToFilesystem(): disc root not set !"); + return path; + } + return vfsRoot + path; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJXletContext.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJXletContext.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/BDJXletContext.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/BDJXletContext.java 2017-06-23 13:34:55.000000000 +0000 @@ -54,9 +54,9 @@ entry.getInitialClass(), this); - callbackQueue = new BDJActionQueue(this.threadGroup, "CallbackQueue"); - mediaQueue = new BDJActionQueue(this.threadGroup, "MediaQueue"); - userEventQueue = new BDJActionQueue(this.threadGroup, "UserEventQueue"); + callbackQueue = BDJActionQueue.create(this.threadGroup, "CallbackQueue"); + mediaQueue = BDJActionQueue.create(this.threadGroup, "MediaQueue"); + userEventQueue = BDJActionQueue.create(this.threadGroup, "UserEventQueue"); mountHomeDir(entry); } @@ -70,7 +70,12 @@ try { int homeJarID = Integer.parseInt(home); long time = System.currentTimeMillis(); - homeMountPoint = MountManager.mount(homeJarID, false) + java.io.File.separator; + homeMountPoint = MountManager.mount(homeJarID, false); + if (homeMountPoint == null) { + logger.error("Failed mounting " + home + ".jar"); + } else { + homeMountPoint = homeMountPoint + java.io.File.separator; + } time = System.currentTimeMillis() - time; logger.info("Mounted Xlet home directory from " + home + ".jar " + "to " + homeMountPoint + "(" + time + "ms)"); @@ -80,6 +85,8 @@ } public String getXletHome() { + if (homeMountPoint == null) + logger.error("Home directory not mounted!"); return homeMountPoint; } @@ -102,6 +109,8 @@ return Integer.toHexString(appid.getAID()); else if (key.equals("org.dvb.application.appid")) return appid; + + logger.error("unhandled getXletProperty(" + key + ")"); return null; } @@ -190,6 +199,8 @@ * Event queues */ + private final Object cbLock = new Object(); + protected void setEventQueue(EventQueue eq) { eventQueue = eq; } @@ -215,21 +226,21 @@ protected boolean putCallback(BDJAction cb) { - synchronized (this) { + synchronized (cbLock) { return putCallbackImpl(cb, callbackQueue); } } protected boolean putMediaCallback(BDJAction cb) { - synchronized (this) { + synchronized (cbLock) { return putCallbackImpl(cb, mediaQueue); } } public boolean putUserEvent(BDJAction cb) { - synchronized (this) { + synchronized (cbLock) { return putCallbackImpl(cb, userEventQueue); } } @@ -435,23 +446,33 @@ entry.getInitialClass()); } - protected void release() { + protected void exitXlet() { + // Called from AppProxy when destroyXlet() has been called. + // Release as much resources as possible while running in Xlet context. + + org.dvb.io.ixc.IxcRegistry.unbindAll(this); closeSockets(); removeAllFAA(); stopIxcThreads(); - defaultLooks.clear(); - org.dvb.io.ixc.IxcRegistry.unbindAll(this); + defaultLooks.clear(); if (sceneFactory != null) { sceneFactory.dispose(); sceneFactory = null; } + } + + protected void release() { - callbackQueue.shutdown(); - userEventQueue.shutdown(); - mediaQueue.shutdown(); + exitXlet(); + + synchronized (cbLock) { + callbackQueue.shutdown(); + userEventQueue.shutdown(); + mediaQueue.shutdown(); + } EventQueue eq = eventQueue; eventQueue = null; @@ -471,13 +492,15 @@ } catch (InvocationTargetException e) { } + synchronized (cbLock) { + callbackQueue = null; + userEventQueue = null; + mediaQueue = null; + } synchronized (this) { threadGroup = null; loader = null; container = null; - callbackQueue = null; - userEventQueue = null; - mediaQueue = null; defaultLooks = null; released = true; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/CacheDir.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/CacheDir.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/CacheDir.java 2015-03-20 10:51:10.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/CacheDir.java 2017-06-23 13:34:56.000000000 +0000 @@ -30,7 +30,7 @@ return LockFile.create(path + File.separator + "lock"); } - private static void InitializeBaseDir() throws IOException { + private static synchronized void InitializeBaseDir() throws IOException { if (baseDir == null) { try { File tmpDir = new File(System.getProperty("java.io.tmpdir"), "libbluray-bdj-cache"); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/GUIManager.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/GUIManager.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/GUIManager.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/GUIManager.java 2017-06-23 13:34:56.000000000 +0000 @@ -30,22 +30,28 @@ private GUIManager() { } - public static synchronized GUIManager createInstance() { - if (instance == null) { - instance = new GUIManager(); - } else { - instance.clearOverlay(); - instance.setDefaultFont(null); + private static final Object instanceLock = new Object(); + + public static GUIManager createInstance() { + synchronized (instanceLock) { + if (instance == null) { + instance = new GUIManager(); + } else { + instance.clearOverlay(); + instance.setDefaultFont(null); + } + return instance; } - return instance; } - public static synchronized GUIManager getInstance() { - if (instance == null) { - Logger.getLogger("GUIManager").error("getInstance(): no instance !"); - throw new Error("no GUIManager instance"); + public static GUIManager getInstance() { + synchronized (instanceLock) { + if (instance == null) { + Logger.getLogger("GUIManager").error("getInstance(): no instance !"); + throw new Error("no GUIManager instance"); + } + return instance; } - return instance; } public BufferedImage createBufferedImage(int width, int height) @@ -69,7 +75,7 @@ } protected static void shutdown() throws Throwable { - synchronized (GUIManager.class) { + synchronized (instanceLock) { if (instance != null) { instance.setVisible(false); instance.removeAll(); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/IxcRegistryImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/IxcRegistryImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/IxcRegistryImpl.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/IxcRegistryImpl.java 2017-06-23 13:35:00.000000000 +0000 @@ -260,7 +260,7 @@ return result; } - public class RemoteMethod implements Runnable + private class RemoteMethod implements Runnable { final BDJXletContext calleeContext; final BDJXletContext callerContext; @@ -276,9 +276,11 @@ callerContext = BDJXletContext.getCurrentContext(); if (callerContext == null) { logger.error("caller context is null"); + throw new RemoteException("no caller context"); } if (context == null) { logger.error("callee context is null"); + throw new RemoteException("no callee context"); } calleeContext = context; @@ -357,7 +359,7 @@ * store */ - private class WrappedRemoteObj + private static class WrappedRemoteObj { final Remote object; final BDJXletContext context; @@ -426,6 +428,18 @@ throw new IllegalArgumentException("xc not current BDJXletContext"); } + if ("/7fff7669/4050/Messenger".equals(path)) { + /* known discs: + - Terminator Salvation + */ + try { + logger.error("Enabling Ixc delay hack for " + path); + Thread.sleep(200L); + } catch (InterruptedException ie) { + ie.printStackTrace(); + } + } + WrappedRemoteObj wrappedObj = null; synchronized (remoteObjects) { if (!remoteObjects.containsKey(path)) { @@ -438,7 +452,7 @@ } Object remoteObj = wrapOrCopy(wrappedObj, wrappedObj.context, (BDJXletContext)xc); - Debug("IxcRegistry.lookup(" + path + ") => " + remoteObj); + Debug("IxcRegistry.lookup(" + path + ") => OK"); return (Remote)remoteObj; } @@ -496,8 +510,8 @@ } public void unbindAll(XletContext xc) { - - if (null != BDJXletContext.getCurrentContext()) { + XletContext requestor = BDJXletContext.getCurrentContext(); + if (requestor != null && requestor != xc) { logger.error("unbindAll(ctx) from wrong thread: " + Logger.dumpStack()); return; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/Libbluray.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/Libbluray.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/Libbluray.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/Libbluray.java 2017-06-23 13:34:56.000000000 +0000 @@ -24,6 +24,8 @@ import java.awt.BDToolkit; import java.awt.event.KeyEvent; import java.io.File; +import java.util.HashMap; +import java.util.Map; import java.util.Vector; import javax.media.PackageManager; @@ -50,14 +52,7 @@ /* hook system properties: make "user.dir" point to current Xlet home directory */ - private static boolean propertiesHooked = false; - private static void hookProperties() { - if (propertiesHooked) { - return; - } - propertiesHooked = true; - java.util.Properties p = new java.util.Properties(System.getProperties()) { public String getProperty(String key) { if (key.equals("user.dir")) { @@ -65,6 +60,7 @@ if (ctx != null) { return ctx.getXletHome(); } + System.err.println("getProperty(user.dir): no context ! " + Logger.dumpStack()); } return super.getProperty(key); } @@ -72,6 +68,28 @@ System.setProperties(p); } + private static boolean initOnce = false; + private static void initOnce() { + if (initOnce) { + return; + } + initOnce = true; + + /* hook system properties (provide Xlet-specific user.dir) */ + try { + hookProperties(); + } catch (Throwable t) { + System.err.println("hookProperties() failed: " + t); + } + + /* hook sockets (limit network connections) */ + try { + BDJSocketFactory.init(); + } catch (Throwable t) { + System.err.println("Hooking socket factory failed: " + t + "\n" + Logger.dumpStack(t)); + } + } + private static String canonicalize(String path, boolean create) { try { File dir = new File(path); @@ -89,11 +107,29 @@ private static void init(long nativePointer, String discID, String discRoot, String persistentRoot, String budaRoot) { - hookProperties(); + initOnce(); /* set up directories */ - persistentRoot = canonicalize(persistentRoot, true); - budaRoot = canonicalize(budaRoot, true); + + try { + if (persistentRoot == null) { + /* no persistent storage */ + persistentRoot = CacheDir.create("dvb.persistent.root").getPath() + File.separator; + } + if (budaRoot == null) { + /* no persistent storage for BUDA */ + budaRoot = CacheDir.create("bluray.bindingunit.root").getPath() + File.separator; + } + } catch (java.io.IOException e) { + System.err.println("Cache creation failed: " + e); + /* not fatal with most discs */ + } + if (persistentRoot != null) { + persistentRoot = canonicalize(persistentRoot, true); + } + if (budaRoot != null) { + budaRoot = canonicalize(budaRoot, true); + } System.setProperty("dvb.persistent.root", persistentRoot); System.setProperty("bluray.bindingunit.root", budaRoot); @@ -105,6 +141,8 @@ System.getProperties().remove("bluray.vfs.root"); } + /* */ + Libbluray.nativePointer = nativePointer; DiscManager.getDiscManager().setCurrentDisc(discID); @@ -117,7 +155,9 @@ PackageManager.commitContentPrefixList(); PackageManager.commitProtocolPrefixList(); - BDFontMetrics.init(); + try { + BDFontMetrics.init(); + } catch (Throwable t) {} System.setProperty("mhp.profile.enhanced_broadcast", "YES"); System.setProperty("mhp.profile.interactive_broadcast", "YES"); @@ -139,16 +179,28 @@ System.setProperty("dvb.returnchannel.timeout", "30"); + /* get profile from PSR */ + int psr31 = readPSR(PSR_PROFILE_VERSION); + int profile = psr31 >> 16; + boolean p11 = (profile & 0x01) != 0; + boolean p2 = (profile & 0x02) != 0; + boolean p5 = (profile & 0x10) != 0; + System.setProperty("bluray.profile.1", "YES"); System.setProperty("bluray.p1.version.major", "1"); - System.setProperty("bluray.p1.version.minor", "1"); + System.setProperty("bluray.p1.version.minor", p11 ? "1" : "0"); System.setProperty("bluray.p1.version.micro", "0"); - System.setProperty("bluray.profile.2", "YES"); + System.setProperty("bluray.profile.2", p2 ? "YES" : "NO"); System.setProperty("bluray.p2.version.major", "1"); System.setProperty("bluray.p2.version.minor", "0"); System.setProperty("bluray.p2.version.micro", "0"); + System.setProperty("bluray.profile.5", p5 ? "YES" : "NO"); + System.setProperty("bluray.p5.version.major", "1"); + System.setProperty("bluray.p5.version.minor", "0"); + System.setProperty("bluray.p5.version.micro", "0"); + System.setProperty("bluray.disc.avplayback.readcapability", "NO"); System.setProperty("bluray.video.fullscreenSD", "YES"); @@ -185,8 +237,6 @@ System.setProperty("bluray.network.connected", "YES"); - BDJSocketFactory.init(); - try { System.setSecurityManager(new BDJSecurityManager(discRoot, persistentRoot, budaRoot)); } catch (Exception ex) { @@ -227,7 +277,12 @@ System.err.println("shutdown() failed: " + e + "\n" + Logger.dumpStack(e)); } nativePointer = 0; - titleInfos = null; + synchronized (titleInfosLock) { + titleInfos = null; + } + synchronized (bdjoFilesLock) { + bdjoFiles = null; + } } /* @@ -261,6 +316,7 @@ /* used by javax/tv/service/SIManagerImpl */ public static int numTitles() { + synchronized (titleInfosLock) { if (titleInfos == null) { titleInfos = getTitleInfosN(nativePointer); if (titleInfos == null) { @@ -268,10 +324,12 @@ } } return titleInfos.length - 2; + } } /* used by org/bluray/ti/TitleImpl */ public static TitleInfo getTitleInfo(int titleNum) { + synchronized (titleInfosLock) { int numTitles = numTitles(); if (numTitles < 0) return null; @@ -284,6 +342,7 @@ throw new IllegalArgumentException(); return titleInfos[titleNum]; + } } /* used by org/bluray/ti/PlayListImpl */ @@ -296,6 +355,10 @@ * Disc data */ + /* cache parsed .bdjo files */ + private static Map bdjoFiles = null; + private static Object bdjoFilesLock = new Object(); + public static byte[] getAacsData(int type) { return getAacsDataN(nativePointer, type); } @@ -305,7 +368,23 @@ } public static Bdjo getBdjo(String name) { - return getBdjoN(nativePointer, name + ".bdjo"); + Bdjo bdjo; + synchronized (bdjoFilesLock) { + if (bdjoFiles == null) { + bdjoFiles = new HashMap(); + } else { + bdjo = (Bdjo)bdjoFiles.get(name); + if (bdjo != null) { + return bdjo; + } + } + + bdjo = getBdjoN(nativePointer, name + ".bdjo"); + if (bdjo != null) { + bdjoFiles.put(name, bdjo); + } + return bdjo; + } } public static String[] listBdFiles(String path, boolean onlyBdRom) { @@ -446,6 +525,10 @@ try { BDLocator locator = new BDLocator(null, titleNumber, -1); TitleImpl title = (TitleImpl)SIManager.createInstance().getService(locator); + if (title == null) { + System.err.println("startTitle() failed: title " + titleNumber + " not found"); + return false; + } titleContext = (TitleContext)ServiceContextFactory.getInstance().getServiceContext(null); titleContext.start(title, true); @@ -496,14 +579,9 @@ case BDJ_EVENT_END_OF_PLAYLIST: case BDJ_EVENT_PTS: case BDJ_EVENT_UO_MASKED: - PlayerManager.getInstance().onEvent(event, param); - break; + case BDJ_EVENT_SEEK: case BDJ_EVENT_RATE: - float rate = (float)param / 90000.0f; - if (rate < 0.0f) rate = -rate; - if (rate < 0.01f) rate = 0.0f; - if (rate > 0.99f && rate < 1.01f) rate = 1.0f; - PlayerManager.getInstance().onRateChange(rate); + result = PlayerManager.getInstance().onEvent(event, param); break; case BDJ_EVENT_PSR102: @@ -532,6 +610,10 @@ case 404: key = HRcEvent.VK_COLORED_KEY_1; break; case 405: key = HRcEvent.VK_COLORED_KEY_2; break; case 406: key = HRcEvent.VK_COLORED_KEY_3; break; + case 17: + result = java.awt.BDJHelper.postMouseEvent(0); + key = -1; + break; default: key = -1; result = false; @@ -544,6 +626,9 @@ result = r1 || r2 || r3; } break; + case BDJ_EVENT_MOUSE: + result = java.awt.BDJHelper.postMouseEvent(param >> 16, param & 0xffff); + break; default: System.err.println("Unknown event " + event + "." + param); result = false; @@ -561,24 +646,28 @@ } } - public static final int BDJ_EVENT_CHAPTER = 1; - public static final int BDJ_EVENT_PLAYITEM = 2; - public static final int BDJ_EVENT_ANGLE = 3; - public static final int BDJ_EVENT_SUBTITLE = 4; - public static final int BDJ_EVENT_END_OF_PLAYLIST = 5; - public static final int BDJ_EVENT_PTS = 6; - private static final int BDJ_EVENT_VK_KEY = 7; - public static final int BDJ_EVENT_MARK = 8; - private static final int BDJ_EVENT_PSR102 = 9; - public static final int BDJ_EVENT_PLAYLIST = 10; - - private static final int BDJ_EVENT_START = 11; - private static final int BDJ_EVENT_STOP = 12; - - public static final int BDJ_EVENT_RATE = 13; - public static final int BDJ_EVENT_AUDIO_STREAM = 14; + private static final int BDJ_EVENT_START = 1; + private static final int BDJ_EVENT_STOP = 2; + private static final int BDJ_EVENT_PSR102 = 3; + + public static final int BDJ_EVENT_PLAYLIST = 4; + public static final int BDJ_EVENT_PLAYITEM = 5; + public static final int BDJ_EVENT_CHAPTER = 6; + public static final int BDJ_EVENT_MARK = 7; + public static final int BDJ_EVENT_PTS = 8; + public static final int BDJ_EVENT_END_OF_PLAYLIST = 9; + + public static final int BDJ_EVENT_SEEK = 10; + public static final int BDJ_EVENT_RATE = 11; + + public static final int BDJ_EVENT_ANGLE = 12; + public static final int BDJ_EVENT_AUDIO_STREAM = 13; + public static final int BDJ_EVENT_SUBTITLE = 14; public static final int BDJ_EVENT_SECONDARY_STREAM = 15; - public static final int BDJ_EVENT_UO_MASKED = 16; + + private static final int BDJ_EVENT_VK_KEY = 16; + public static final int BDJ_EVENT_UO_MASKED = 17; + private static final int BDJ_EVENT_MOUSE = 18; /* TODO: use org/bluray/system/RegisterAccess instead */ public static final int PSR_IG_STREAM_ID = 0; @@ -619,6 +708,9 @@ public static final int AACS_MEDIA_PMSN = 3; public static final int AACS_DEVICE_BINDING_ID = 4; public static final int AACS_DEVICE_NONCE = 5; + public static final int AACS_MEDIA_KEY = 6; + public static final int AACS_CONTENT_CERT_ID = 7; + public static final int AACS_BDJ_ROOT_CERT_HASH= 8; private static native byte[] getAacsDataN(long np, int type); private static native TitleInfo[] getTitleInfosN(long np); @@ -645,5 +737,6 @@ int x0, int y0, int x1, int y1); private static long nativePointer = 0; + private static Object titleInfosLock = new Object(); private static TitleInfo[] titleInfos = null; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/audio/Handler.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/audio/Handler.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/audio/Handler.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/audio/Handler.java 2017-06-23 13:34:59.000000000 +0000 @@ -26,9 +26,9 @@ import javax.media.Time; import javax.media.protocol.DataSource; - -import org.videolan.media.content.playlist.OverallGainControlImpl; -import org.videolan.media.content.playlist.PanningControlImpl; +import org.videolan.media.content.control.MediaTimePositionControlImpl; +import org.videolan.media.content.control.OverallGainControlImpl; +import org.videolan.media.content.control.PanningControlImpl; import org.videolan.media.content.BDHandler; @@ -70,10 +70,11 @@ return super.doStart(at); } - protected ControllerErrorEvent doStop() { - return super.doStop(); + /* + protected ControllerErrorEvent doStop(boolean eof) { + return super.doStop(eof); } - + */ /* protected BDLocator getLocator() { return locator; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/audio/MediaTimePositionControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/audio/MediaTimePositionControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/audio/MediaTimePositionControlImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/audio/MediaTimePositionControlImpl.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2010 William Hahne - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -package org.videolan.media.content.audio; - -import java.awt.Component; - -import javax.media.Time; - -import org.davic.media.MediaTimePositionControl; - -public class MediaTimePositionControlImpl implements MediaTimePositionControl { - protected MediaTimePositionControlImpl(Handler player) { - this.player = player; - } - - public Component getControlComponent() { - return null; - } - - public Time setMediaTimePosition(Time mediaTime) { - player.setMediaTime(mediaTime); - return player.getMediaTime(); - } - - public Time getMediaTimePosition() { - return player.getMediaTime(); - } - - private Handler player; -} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/BDHandler.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/BDHandler.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/BDHandler.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/BDHandler.java 2017-06-23 13:34:59.000000000 +0000 @@ -44,6 +44,7 @@ import javax.media.ResourceUnavailableEvent; import javax.media.StartEvent; import javax.media.StopByRequestEvent; +import javax.media.StopTimeChangeEvent; import javax.media.Time; import javax.media.TimeBase; import javax.media.TransitionEvent; @@ -52,8 +53,9 @@ import javax.tv.locator.Locator; import javax.tv.service.selection.ServiceContentHandler; +import org.davic.media.MediaTimePositionChangedEvent; + import org.bluray.media.OverallGainControl; -import org.bluray.net.BDLocator; import org.videolan.BDJAction; import org.videolan.BDJActionManager; @@ -67,14 +69,17 @@ public BDHandler() { ownerContext = BDJXletContext.getCurrentContext(); - - PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_INIT, null); - BDJActionManager.getInstance().putCommand(action); - action.waitEnd(); + if (ownerContext == null) { + doInitAction(); + } else { + PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_INIT, null); + BDJActionManager.getInstance().putCommand(action); + action.waitEnd(); + } } private void doInitAction() { - commandQueue = new BDJActionQueue("MediaPlayer"); + commandQueue = BDJActionQueue.create("MediaPlayer"); PlayerManager.getInstance().registerPlayer(this); } @@ -99,6 +104,7 @@ } public int getTargetState() { + Logger.unimplemented("BDHandler", "getTargetState()"); synchronized (this) { return targetState; } @@ -181,6 +187,8 @@ checkUnrealized(); // TODO: actually stopping when stop time is hit needs to be implemented this.stopTime = stopTime; + + postStopTimeChangeEvent(); } public Time getMediaTime() { @@ -215,6 +223,11 @@ action.waitEnd(); } + public void setMediaTimePosition(Time mediaTime) { + setMediaTime(mediaTime); + postMediaTimePositionChangedEvent(); + } + public Time mapToTimeBase(Time t) throws ClockStoppedException { if (state != Started) throw new ClockStoppedException(); @@ -254,11 +267,7 @@ } public Locator[] getServiceContentLocators() { - if (locator == null) - return new Locator[0]; - Locator[] locators = new Locator[1]; - locators[0] = locator; - return locators; + return new Locator[0]; } public void realize() { @@ -304,8 +313,6 @@ public void deallocate() { if (isClosed) return; - if (state == Started) { - } PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_DEALLOCATE, null); commandQueue.put(action); action.waitEnd(); @@ -331,15 +338,10 @@ * notifications from app */ - protected void statusEvent(int event, int param) { - if (isClosed) return; + protected boolean statusEvent(int event, int param) { + if (isClosed) return false; commandQueue.put(new PlayerAction(this, PlayerAction.ACTION_STATUS, new Integer(event), param)); - } - - protected void rateChanged(float rate) { - if (isClosed) return; - PlayerAction action = new PlayerAction(this, PlayerAction.ACTION_RATE_CHANGED, new Float(rate)); - commandQueue.put(action); + return true; } /* @@ -363,7 +365,7 @@ protected void doEndOfMediaReached(int playlist) { if (state == Started) { - ControllerErrorEvent error = doStop(); + ControllerErrorEvent error = doStop(true); if (error == null) { state = Prefetched; notifyListeners(new EndOfMediaEvent(this, Started, Prefetched, Prefetched, getMediaTime())); @@ -373,6 +375,9 @@ } } + protected void doSeekNotify(long tick) { + updateTime(new Time(tick * TO_SECONDS)); + } protected void doPlaylistStarted(int playlist) {}; protected void doChapterReached(int chapter) {}; @@ -403,8 +408,9 @@ return null; } - protected ControllerErrorEvent doStop() { + protected ControllerErrorEvent doStop(boolean eof) { baseMediaTime = getMediaNanoseconds(); + rate = 1.0f; return null; } @@ -431,6 +437,14 @@ * */ + private void postStopTimeChangeEvent() { + notifyListeners(new StopTimeChangeEvent(this, getStopTime())); + } + + protected void postMediaTimePositionChangedEvent() { + notifyListeners(new MediaTimePositionChangedEvent(this, getState(), getState(), getState(), getMediaTime())); + } + private void notifyListeners(ControllerEvent event) { listeners.putCallback(event); } @@ -440,6 +454,7 @@ case Unrealized: state = Realizing; notifyListeners(new TransitionEvent(this, Unrealized, Realizing, Realized)); + /* fall thru */ case Realizing: ControllerErrorEvent error = doRealize(); if (error == null) { @@ -463,9 +478,11 @@ case Realizing: if (!doRealizeAction()) return false; + /* fall thru */ case Realized: state = Prefetching; notifyListeners(new TransitionEvent(this, Realized, Prefetching, Prefetched)); + /* fall thru */ case Prefetching: if (!PlayerManager.getInstance().allocateResource(this)) { @@ -494,10 +511,12 @@ case Realizing: if (!doRealizeAction()) return false; + /* fall thru */ case Realized: case Prefetching: if (!doPrefetchAction()) return false; + /* fall thru */ case Prefetched: ControllerErrorEvent error = doStart(at); if (error == null) { @@ -518,7 +537,7 @@ private boolean doStopAction() { switch (state) { case Started: - ControllerErrorEvent error = doStop(); + ControllerErrorEvent error = doStop(false); if (error == null) { state = Prefetched; notifyListeners(new StopByRequestEvent(this, Started, Prefetched, Prefetched, getMediaTime())); @@ -572,7 +591,7 @@ PlayerManager.getInstance().unregisterPlayer(this); } - private class PlayerAction extends BDJAction { + private static class PlayerAction extends BDJAction { private PlayerAction(BDHandler player, int action, Object param) { this(player, action, param, -1); } @@ -614,9 +633,6 @@ player.doSetRate((Float)param); break; - case ACTION_RATE_CHANGED: - player.doRateChanged(((Float)param).floatValue()); - break; case ACTION_STATUS: switch (((Integer)param).intValue()) { case Libbluray.BDJ_EVENT_CHAPTER: @@ -652,6 +668,16 @@ case Libbluray.BDJ_EVENT_UO_MASKED: player.doUOMasked(param2); break; + case Libbluray.BDJ_EVENT_SEEK: + player.doSeekNotify(param2 * 2 /* 45kHz -> 90kHz */); + break; + case Libbluray.BDJ_EVENT_RATE: + float rate = (float)param2 / 90000.0f; + if (rate < 0.0f) rate = -rate; + if (rate < 0.01f) rate = 0.0f; + if (rate > 0.99f && rate < 1.01f) rate = 1.0f; + player.doRateChanged(rate); + break; default: System.err.println("Unknown ACTION_STATUS: id " + param + ", value " + param2); break; @@ -680,7 +706,6 @@ public static final int ACTION_SET_RATE = 9; public static final int ACTION_STATUS = 10; - public static final int ACTION_RATE_CHANGED = 11; } protected int state = Unrealized; @@ -690,7 +715,6 @@ protected long baseTime; protected float rate = 1.0f; protected Control[] controls = null; - protected BDLocator locator = null; private BDJListeners listeners = new BDJListeners(); private BDJXletContext ownerContext; boolean isClosed = false; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/control/GainControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/control/GainControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/control/GainControlImpl.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/control/GainControlImpl.java 2017-06-23 13:34:59.000000000 +0000 @@ -0,0 +1,90 @@ +/* + * This file is part of libbluray + * Copyright (C) 2015 Petri Hintukainen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package org.videolan.media.content.control; + +import java.awt.Component; +import javax.media.GainControl; + +import javax.media.GainChangeEvent; +import javax.media.GainChangeListener; + +/* +http://docs.oracle.com/cd/E17802_01/j2se/javase/technologies/desktop/media/jmf/2.1.1/apidocs/javax/media/GainControl.html +*/ + +import org.videolan.BDJListeners; + +abstract class GainControlImpl { + + public void setMute(boolean mute) { + this.mute = mute; + setGain(this.mute, this.level); + } + + public boolean getMute() { + return this.mute; + } + + public float setDB(float gain) { + this.level = Math.max(1.0f, Math.min(0.0f, (float)Math.pow(10.0f, gain / 10.0f))); + this.gain = gain; + setGain(this.mute, this.level); + return this.gain; + } + + public float getDB() { + return gain; + } + + public float setLevel(float level) { + this.level = Math.max(1.0f, Math.min(0.0f, level)); + this.gain = 10.0f * (float)(Math.log(this.level) / Math.log(10.0f)); + + setGain(this.mute, this.level); + return this.level; + } + + public float getLevel() { + return level; + } + + public void addGainChangeListener(GainChangeListener listener) { + listeners.add(listener); + } + + public void removeGainChangeListener(GainChangeListener listener) { + listeners.remove(listener); + } + + protected abstract void setGain(boolean mute, float level); + + protected void valueChanged() { + listeners.putCallback(new GainChangeEvent((GainControl)this, mute, gain, level)); + } + + public Component getControlComponent() { + return null; + } + + private boolean mute = false; + private float gain = 0.0f; + private float level = 1.0f; + private BDJListeners listeners = new BDJListeners(); +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/control/MediaTimePositionControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/control/MediaTimePositionControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/control/MediaTimePositionControlImpl.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/control/MediaTimePositionControlImpl.java 2017-06-23 13:34:59.000000000 +0000 @@ -0,0 +1,49 @@ +/* + * This file is part of libbluray + * Copyright (C) 2010 William Hahne + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package org.videolan.media.content.control; + +import java.awt.Component; + +import javax.media.Time; + +import org.davic.media.MediaTimePositionControl; + +import org.videolan.media.content.BDHandler; + +public class MediaTimePositionControlImpl implements MediaTimePositionControl { + public MediaTimePositionControlImpl(BDHandler player) { + this.player = player; + } + + public Component getControlComponent() { + return null; + } + + public Time setMediaTimePosition(Time mediaTime) { + player.setMediaTimePosition(mediaTime); + return player.getMediaTime(); + } + + public Time getMediaTimePosition() { + return player.getMediaTime(); + } + + private BDHandler player; +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/control/OverallGainControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/control/OverallGainControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/control/OverallGainControlImpl.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/control/OverallGainControlImpl.java 2017-06-23 13:34:59.000000000 +0000 @@ -0,0 +1,39 @@ +/* + * This file is part of libbluray + * Copyright (C) 2010 William Hahne + * Copyright (C) 2015 Petri Hintukainen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package org.videolan.media.content.control; + +import java.awt.Component; +import org.bluray.media.OverallGainControl; + +import org.videolan.media.content.BDHandler; + +public class OverallGainControlImpl extends GainControlImpl implements OverallGainControl { + public OverallGainControlImpl(BDHandler player) { + this.player = player; + } + + protected void setGain(boolean mute, float level) { + player.setGain(BDHandler.GAIN_OVERALL, mute, level); + super.valueChanged(); + } + + private BDHandler player; +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/control/PanningControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/control/PanningControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/control/PanningControlImpl.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/control/PanningControlImpl.java 2017-06-23 13:34:59.000000000 +0000 @@ -0,0 +1,87 @@ +/* + * This file is part of libbluray + * Copyright (C) 2010 William Hahne + * Copyright (C) 2015 Petri Hintukainen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package org.videolan.media.content.control; + +import java.awt.Component; + +import org.bluray.media.PanningChangeEvent; +import org.bluray.media.PanningChangeListener; +import org.bluray.media.PanningControl; + +import org.videolan.BDJListeners; +import org.videolan.media.content.BDHandler; + +/* + set audio source location in 2D space +*/ +public class PanningControlImpl implements PanningControl { + public PanningControlImpl(BDHandler player) { + this.player = player; + } + + public Component getControlComponent() { + return null; + } + + public void addPanningChangeListener(PanningChangeListener listener) { + listeners.add(listener); + } + + public void removePanningChangeListener(PanningChangeListener listener) { + listeners.remove(listener); + } + + public float getLeftRight() { + return balance; + } + + public float getFrontRear() { + return fading; + } + + public void setLeftRight(float balance) { + setPosition(balance, this.fading); + } + + public void setFrontRear(float panning) { + setPosition(this.balance, panning); + } + + public void setPosition(float x, float y) { + this.balance = clip(x); + this.fading = clip(y); + + player.setPanning(balance, fading); + + listeners.putCallback(new PanningChangeEvent(this, this.balance, this.fading)); + } + + private float clip(float val) { + if (val != val) /* NaN */ + return 0.0f; + return Math.min(-1.0f, Math.max(1.0f, val)); + } + + private BDHandler player; + private BDJListeners listeners = new BDJListeners(); + private float fading = 0.0f; + private float balance = 0.0f; +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/control/PrimaryGainControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/control/PrimaryGainControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/control/PrimaryGainControlImpl.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/control/PrimaryGainControlImpl.java 2017-06-23 13:34:59.000000000 +0000 @@ -0,0 +1,39 @@ +/* + * This file is part of libbluray + * Copyright (C) 2010 William Hahne + * Copyright (C) 2015 Petri Hintukainen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package org.videolan.media.content.control; + +import java.awt.Component; +import org.bluray.media.PrimaryGainControl; + +import org.videolan.media.content.BDHandler; + +public class PrimaryGainControlImpl extends GainControlImpl implements PrimaryGainControl { + public PrimaryGainControlImpl(BDHandler player) { + this.player = player; + } + + protected void setGain(boolean mute, float level) { + player.setGain(BDHandler.GAIN_PRIMARY, mute, level); + super.valueChanged(); + } + + private BDHandler player; +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/control/SecondaryGainControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/control/SecondaryGainControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/control/SecondaryGainControlImpl.java 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/control/SecondaryGainControlImpl.java 2017-06-23 13:34:59.000000000 +0000 @@ -0,0 +1,39 @@ +/* + * This file is part of libbluray + * Copyright (C) 2010 William Hahne + * Copyright (C) 2015 Petri Hintukainen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +package org.videolan.media.content.control; + +import java.awt.Component; +import org.bluray.media.SecondaryGainControl; + +import org.videolan.media.content.BDHandler; + +public class SecondaryGainControlImpl extends GainControlImpl implements SecondaryGainControl { + public SecondaryGainControlImpl(BDHandler player) { + this.player = player; + } + + protected void setGain(boolean mute, float level) { + player.setGain(BDHandler.GAIN_SECONDARY, mute, level); + super.valueChanged(); + } + + BDHandler player; +} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/PlayerManager.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/PlayerManager.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/PlayerManager.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/PlayerManager.java 2017-06-23 13:35:00.000000000 +0000 @@ -19,6 +19,7 @@ package org.videolan.media.content; import java.util.ArrayList; +import org.videolan.Logger; public class PlayerManager { @@ -35,11 +36,11 @@ private ArrayList registeredPlayers = new ArrayList(1); private BDHandler playlistPlayer = null; - private BDHandler videoDripPlayer = null; + //private BDHandler videoDripPlayer = null; //private ArrayList audioPlayerList = new ArrayList(8); private Object playlistPlayerLock = new Object(); - private Object videoDripPlayerLock = new Object(); + //private Object videoDripPlayerLock = new Object(); //private Object audioPlayerLock = new Object(); private Object stoppingLock = new Object(); private boolean stopping = false; @@ -81,7 +82,7 @@ return; } - System.err.println("unknown player type: " + player.getClass().getName()); + logger.error("unknown player type: " + player.getClass().getName()); } protected boolean allocateResource(BDHandler player) { @@ -91,6 +92,9 @@ } synchronized (playlistPlayerLock) { if (playlistPlayer != null && player != playlistPlayer) { + + logger.info("allocateResource(): Stopping old playlist player"); + playlistPlayer.stop(); playlistPlayer.deallocate(); } @@ -108,7 +112,7 @@ return true; } - System.err.println("unknown player type: " + player.getClass().getName()); + logger.error("allocateResource(): unknown player type: " + player.getClass().getName()); return false; } @@ -134,23 +138,16 @@ * */ - public void onEvent(int event, int param) { + public boolean onEvent(int event, int param) { synchronized (stoppingLock) { - if (stopping) return; + if (stopping) return false; synchronized (playlistPlayerLock) { if (playlistPlayer != null) - playlistPlayer.statusEvent(event, param); + return playlistPlayer.statusEvent(event, param); } } + return false; } - public void onRateChange(float rate) { - synchronized (stoppingLock) { - if (stopping) return; - synchronized (playlistPlayerLock) { - if (playlistPlayer != null) - playlistPlayer.rateChanged(rate); - } - } - } + private static final Logger logger = Logger.getLogger(PlayerManager.class.getName()); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/BackgroundVideoPresentationControlImpl.java 2017-06-23 13:34:57.000000000 +0000 @@ -35,7 +35,8 @@ public class BackgroundVideoPresentationControlImpl extends VideoControl implements BackgroundVideoPresentationControl, AWTVideoSizeControl { protected BackgroundVideoPresentationControlImpl(Handler player) { - super(player, 0); + super(0); + this.player = player; } protected StreamInfo[] getStreams() { @@ -53,6 +54,8 @@ } public boolean setVideoTransformation(VideoTransformation transform) { + if (transform == null) + return false; setClipRegion(transform.getClipRegion()); HScreenPoint pos = transform.getVideoPosition(); float[] scales = transform.getScalingFactors(); @@ -99,40 +102,42 @@ return new AWTVideoSize( new Rectangle(vd.width, vd.height), new Rectangle(sd.width, sd.height)); - } + } - public Dimension getSourceVideoSize() { - return getVideoSize(); - } + public Dimension getSourceVideoSize() { + return getVideoSize(); + } - public boolean setSize(AWTVideoSize size) { - setClipRegion(size.getSource()); - setVideoArea(getNormalizedRectangle(getScreenSize(), size.getDestination())); - return true; - } + public boolean setSize(AWTVideoSize size) { + setClipRegion(size.getSource()); + setVideoArea(getNormalizedRectangle(getScreenSize(), size.getDestination())); + return true; + } - public AWTVideoSize checkSize(AWTVideoSize size) { - Dimension vd = getInputVideoSize(); - Rectangle sr = size.getSource(); - if (sr.x < 0) + public AWTVideoSize checkSize(AWTVideoSize size) { + Dimension vd = getInputVideoSize(); + Rectangle sr = size.getSource(); + if (sr.x < 0) + sr.x = 0; + if ((sr.x + sr.width) > vd.width) { + sr.width = vd.width - sr.x; + if (sr.width <= 0) { sr.x = 0; - if ((sr.x + sr.width) > vd.width) { - sr.width = vd.width - sr.x; - if (sr.width <= 0) { - sr.x = 0; - sr.width = 0; - } + sr.width = 0; } - if (sr.y < 0) + } + if (sr.y < 0) + sr.y = 0; + if ((sr.y + sr.height) > vd.height) { + sr.height = vd.height - sr.y; + if (sr.height <= 0) { sr.y = 0; - if ((sr.y + sr.height) > vd.height) { - sr.height = vd.height - sr.y; - if (sr.height <= 0) { - sr.y = 0; - sr.height = 0; - } + sr.height = 0; } - Rectangle dr = size.getDestination(); - return new AWTVideoSize(sr, dr); } + Rectangle dr = size.getDestination(); + return new AWTVideoSize(sr, dr); + } + + private Handler player; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/DVBMediaSelectControlImpl.java 2017-06-23 13:34:57.000000000 +0000 @@ -158,7 +158,7 @@ } public Locator[] getCurrentSelection() { - BDLocator locator = player.getLocator(); + BDLocator locator = player.getCurrentLocator(); if (locator == null) return new Locator[0]; String[] tags = locator.getComponentTags(); diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/GainControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/GainControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/GainControlImpl.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/GainControlImpl.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2015 Petri Hintukainen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -package org.videolan.media.content.playlist; - -import java.awt.Component; -import javax.media.GainControl; - -import javax.media.GainChangeEvent; -import javax.media.GainChangeListener; - -/* -http://docs.oracle.com/cd/E17802_01/j2se/javase/technologies/desktop/media/jmf/2.1.1/apidocs/javax/media/GainControl.html -*/ - -import org.videolan.BDJListeners; - -abstract class GainControlImpl { - - public void setMute(boolean mute) { - this.mute = mute; - setGain(this.mute, this.level); - } - - public boolean getMute() { - return this.mute; - } - - public float setDB(float gain) { - this.level = Math.max(1.0f, Math.min(0.0f, (float)Math.pow(10.0f, gain / 10.0f))); - this.gain = gain; - setGain(this.mute, this.level); - return this.gain; - } - - public float getDB() { - return gain; - } - - public float setLevel(float level) { - this.level = Math.max(1.0f, Math.min(0.0f, level)); - this.gain = 10.0f * (float)(Math.log(this.level) / Math.log(10.0f)); - - setGain(this.mute, this.level); - return this.level; - } - - public float getLevel() { - return level; - } - - public void addGainChangeListener(GainChangeListener listener) { - listeners.add(listener); - } - - public void removeGainChangeListener(GainChangeListener listener) { - listeners.remove(listener); - } - - protected abstract void setGain(boolean mute, float level); - - protected void valueChanged() { - listeners.putCallback(new GainChangeEvent((GainControl)this, mute, gain, level)); - } - - public Component getControlComponent() { - return null; - } - - private boolean mute = false; - private float gain = 0.0f; - private float level = 1.0f; - private BDJListeners listeners = new BDJListeners(); -} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/Handler.java 2017-06-23 13:34:57.000000000 +0000 @@ -37,14 +37,20 @@ import org.bluray.net.BDLocator; import org.bluray.system.RegisterAccess; import org.bluray.ti.selection.TitleContextImpl; + import org.videolan.BDJAction; -import org.videolan.BDJActionManager; import org.videolan.Libbluray; import org.videolan.Logger; import org.videolan.PlaylistInfo; import org.videolan.TIClip; import org.videolan.media.content.BDHandler; +import org.videolan.media.content.control.MediaTimePositionControlImpl; +import org.videolan.media.content.control.OverallGainControlImpl; +import org.videolan.media.content.control.PanningControlImpl; +import org.videolan.media.content.control.PrimaryGainControlImpl; +import org.videolan.media.content.control.SecondaryGainControlImpl; + public class Handler extends BDHandler { public Handler() { controls = new Control[18]; @@ -69,66 +75,101 @@ } public void setSource(DataSource source) throws IOException, IncompatibleSourceException { + + /* validate source */ + BDLocator newLocator; + try { + newLocator = new BDLocator(source.getLocator().toExternalForm()); + } catch (org.davic.net.InvalidLocatorException e) { + logger.error("incompatible source: " + source); + throw new IncompatibleSourceException(); + } catch (Exception e) { + logger.error("unexpected expection: " + e); + throw new IncompatibleSourceException(); + } + + if (!newLocator.isPlayListItem()) { + logger.error("not playlist: " + newLocator); + throw new IncompatibleSourceException(); + } + + /* get playlist info */ + PlaylistInfo newPi = Libbluray.getPlaylistInfo(newLocator.getPlayListId()); + if (newPi == null) { + logger.error("getPlaylistInfo failed for " + newLocator); + throw new IOException(); + } + + /* commit changes and prefetch */ synchronized (this) { - try { - locator = new BDLocator(source.getLocator().toExternalForm()); - } catch (org.davic.net.InvalidLocatorException e) { - throw new IncompatibleSourceException(); - } - if (!locator.isPlayListItem()) - throw new IncompatibleSourceException(); - pi = Libbluray.getPlaylistInfo(locator.getPlayListId()); - if (pi == null) - throw new IOException(); + + sourceLocator = newLocator; + currentLocator = null; + pi = newPi; + baseMediaTime = 0; if (state == Prefetched) doPrefetch(); } } + public Locator[] getServiceContentLocators() { + if (sourceLocator == null) + return new Locator[0]; + Locator[] locators = new Locator[1]; + if (currentLocator != null && getState() >= Prefetched) + locators[0] = currentLocator; + else + locators[0] = sourceLocator; + return locators; + } + public Time getDuration() { - long duration = pi.getDuration() ; - return new Time(duration * TO_SECONDS); + if (pi != null) { + long duration = pi.getDuration(); + return new Time(duration * TO_SECONDS); + } + return DURATION_UNKNOWN; } protected ControllerErrorEvent doPrefetch() { synchronized (this) { try { int stream; - stream = locator.getPrimaryAudioStreamNumber(); + stream = sourceLocator.getPrimaryAudioStreamNumber(); if (stream > 0) Libbluray.writePSR(Libbluray.PSR_PRIMARY_AUDIO_ID, stream); - stream = locator.getPGTextStreamNumber(); + stream = sourceLocator.getPGTextStreamNumber(); if (stream > 0) { Libbluray.writePSR(Libbluray.PSR_PG_STREAM, stream, 0x00000fff); } - stream = locator.getSecondaryVideoStreamNumber(); + stream = sourceLocator.getSecondaryVideoStreamNumber(); if (stream > 0) { Libbluray.writePSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO, stream << 8, 0x0000ff00); } - stream = locator.getSecondaryAudioStreamNumber(); + stream = sourceLocator.getSecondaryAudioStreamNumber(); if (stream > 0) { Libbluray.writePSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO, stream, 0x000000ff); } - int pl = locator.getPlayListId(); + int plId = sourceLocator.getPlayListId(); long time = -1; - int pi = -1, mark = -1; + int piId = -1, mark = -1; if (baseMediaTime != 0) { time = (long)(baseMediaTime * FROM_NAROSECONDS); - } /*else*/ if (locator.getMarkId() > 0) { - mark = locator.getMarkId(); - } /*else*/ if (locator.getPlayItemId() > 0) { - pi = locator.getPlayItemId(); + } /*else*/ if (sourceLocator.getMarkId() > 0) { + mark = sourceLocator.getMarkId(); + } /*else*/ if (sourceLocator.getPlayItemId() > 0) { + piId = sourceLocator.getPlayItemId(); } - if (!Libbluray.selectPlaylist(pl, pi, mark, time)) { + if (!Libbluray.selectPlaylist(plId, piId, mark, time)) { return new ConnectionErrorEvent(this); } updateTime(new Time(Libbluray.tellTime() * TO_SECONDS)); - currentLocator = new BDLocator(locator.toExternalForm()); + currentLocator = new BDLocator(sourceLocator.toExternalForm()); } catch (Exception e) { return new ConnectionErrorEvent(this); } @@ -157,9 +198,12 @@ } } - protected ControllerErrorEvent doStop() { + protected ControllerErrorEvent doStop(boolean eof) { Libbluray.selectRate(0.0f, false); - return super.doStop(); + if (!eof) { + Libbluray.stopPlaylist(); + } + return super.doStop(eof); } protected void doSeekTime(Time at) { @@ -266,14 +310,14 @@ protected void doAudioStreamChanged(int param) { if (currentLocator != null) { - locator.setPrimaryAudioStreamNumber(param); + currentLocator.setPrimaryAudioStreamNumber(param); postMediaSelectSucceeded(currentLocator); } } private void doSecondaryVideoChanged(int stream, boolean enable) { if (currentLocator != null) { - locator.setSecondaryVideoStreamNumber(stream); + currentLocator.setSecondaryVideoStreamNumber(stream); postMediaSelectSucceeded(currentLocator); } @@ -282,7 +326,7 @@ private void doSecondaryAudioChanged(int stream, boolean enable) { if (currentLocator != null) { - locator.setSecondaryAudioStreamNumber(stream); + currentLocator.setSecondaryAudioStreamNumber(stream); postMediaSelectSucceeded(currentLocator); } } @@ -294,8 +338,12 @@ protected void doEndOfMediaReached(int playlist) { synchronized (this) { - if (locator == null || locator.getPlayListId() != playlist) { - System.err.println("endOfMedia ignored: playlist does not match (" + playlist + " != " + locator.getPlayListId()); + if (currentLocator == null) { + logger.error("endOfMedia(" + playlist + ") ignored: no current locator"); + return; + } + if (currentLocator.getPlayListId() != playlist) { + logger.error("endOfMedia ignored: playlist does not match (" + playlist + " != " + currentLocator.getPlayListId()); return; } } @@ -303,8 +351,15 @@ super.doEndOfMediaReached(playlist); } - protected BDLocator getLocator() { - return locator; + protected void doSeekNotify(long tick) { + super.doSeekNotify(Libbluray.tellTime()); + } + + /* used by DVBMediaSelectControlImpl */ + protected BDLocator getCurrentLocator() { + if (currentLocator != null) + return currentLocator; + return sourceLocator; } protected PlaylistInfo getPlaylistInfo() { @@ -327,15 +382,32 @@ protected void selectPlayList(BDLocator locator) throws InvalidPlayListException, InvalidLocatorException, ClockStartedError { + + if (locator == null) { + logger.error("null locator"); + throw new NullPointerException(); + } + if (!locator.isPlayListItem()) { + logger.error("not playlist: " + locator); + throw new InvalidLocatorException(locator); + } + + PlaylistInfo newPi = Libbluray.getPlaylistInfo(locator.getPlayListId()); + if (newPi == null) { + logger.error("invalid playlist"); + throw new InvalidPlayListException(); + } + synchronized (this) { - if (getState() == Started) + if (getState() == Started) { + logger.error("throw ClockStartedError"); throw new ClockStartedError(); - if (!locator.isPlayListItem()) - throw new InvalidLocatorException(locator); - pi = Libbluray.getPlaylistInfo(locator.getPlayListId()); - if (pi == null) - throw new InvalidPlayListException(); - this.locator = locator; + } + + this.pi = newPi; + this.sourceLocator = locator; + this.currentLocator = null; + baseMediaTime = 0; if (state == Prefetched) doPrefetch(); @@ -360,7 +432,7 @@ action.waitEnd(); } - private class PlaylistPlayerAction extends BDJAction { + private static class PlaylistPlayerAction extends BDJAction { private PlaylistPlayerAction(Handler player, int action, int param) { this.player = player; this.action = action; @@ -373,18 +445,18 @@ if ((player.getState() == Prefetched) || (player.getState() == Started)) { Libbluray.seekMark(param); player.updateTime(new Time(Libbluray.tellTime() * TO_SECONDS)); - } else if (player.locator != null) { - player.locator.setMarkId(param); - player.locator.setPlayItemId(-1); + } else if (player.sourceLocator != null) { + player.sourceLocator.setMarkId(param); + player.sourceLocator.setPlayItemId(-1); } break; case ACTION_SEEK_PLAYITEM: if ((player.getState() == Prefetched) || (player.getState() == Started)) { Libbluray.seekPlayItem(param); player.updateTime(new Time(Libbluray.tellTime() * TO_SECONDS)); - } else if (player.locator != null) { - player.locator.setMarkId(-1); - player.locator.setPlayItemId(param); + } else if (player.sourceLocator != null) { + player.sourceLocator.setMarkId(-1); + player.sourceLocator.setPlayItemId(param); } break; } @@ -400,4 +472,7 @@ private PlaylistInfo pi = null; private BDLocator currentLocator = null; + private BDLocator sourceLocator = null; + + private static final Logger logger = Logger.getLogger(Handler.class.getName()); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/MediaTimePositionControlImpl.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2010 William Hahne - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -package org.videolan.media.content.playlist; - -import java.awt.Component; - -import javax.media.Time; - -import org.davic.media.MediaTimePositionControl; - -public class MediaTimePositionControlImpl implements MediaTimePositionControl { - protected MediaTimePositionControlImpl(Handler player) { - this.player = player; - } - - public Component getControlComponent() { - return null; - } - - public Time setMediaTimePosition(Time mediaTime) { - player.setMediaTime(mediaTime); - return player.getMediaTime(); - } - - public Time getMediaTimePosition() { - return player.getMediaTime(); - } - - private Handler player; -} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/OverallGainControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/OverallGainControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/OverallGainControlImpl.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/OverallGainControlImpl.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2010 William Hahne - * Copyright (C) 2015 Petri Hintukainen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -package org.videolan.media.content.playlist; - -import java.awt.Component; -import org.bluray.media.OverallGainControl; - -import org.videolan.media.content.BDHandler; - -public class OverallGainControlImpl extends GainControlImpl implements OverallGainControl { - public OverallGainControlImpl(BDHandler player) { - this.player = player; - } - - protected void setGain(boolean mute, float level) { - player.setGain(BDHandler.GAIN_OVERALL, mute, level); - super.valueChanged(); - } - - private BDHandler player; -} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PanningControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PanningControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PanningControlImpl.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PanningControlImpl.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2010 William Hahne - * Copyright (C) 2015 Petri Hintukainen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -package org.videolan.media.content.playlist; - -import java.awt.Component; - -import org.bluray.media.PanningChangeEvent; -import org.bluray.media.PanningChangeListener; -import org.bluray.media.PanningControl; - -import org.videolan.BDJListeners; -import org.videolan.media.content.BDHandler; - -/* - set audio source location in 2D space -*/ -public class PanningControlImpl implements PanningControl { - public PanningControlImpl(BDHandler player) { - this.player = player; - } - - public Component getControlComponent() { - return null; - } - - public void addPanningChangeListener(PanningChangeListener listener) { - listeners.add(listener); - } - - public void removePanningChangeListener(PanningChangeListener listener) { - listeners.remove(listener); - } - - public float getLeftRight() { - return balance; - } - - public float getFrontRear() { - return fading; - } - - public void setLeftRight(float balance) { - setPosition(balance, this.fading); - } - - public void setFrontRear(float panning) { - setPosition(this.balance, panning); - } - - public void setPosition(float x, float y) { - this.balance = clip(x); - this.fading = clip(y); - - player.setPanning(balance, fading); - - listeners.putCallback(new PanningChangeEvent(this, this.balance, this.fading)); - } - - private float clip(float val) { - if (val != val) /* NaN */ - return 0.0f; - return Math.min(-1.0f, Math.max(1.0f, val)); - } - - private BDHandler player; - private BDJListeners listeners = new BDJListeners(); - private float fading = 0.0f; - private float balance = 0.0f; -} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PiPControlImpl.java 2017-06-23 13:34:57.000000000 +0000 @@ -37,7 +37,8 @@ public class PiPControlImpl extends VideoControl implements PiPControl, AsynchronousPiPControl { protected PiPControlImpl(Handler player) { - super(player, 1); + super(1); + this.player = player; } protected StreamInfo[] getStreams() { @@ -117,5 +118,6 @@ return null; } + private Handler player; private BDJListeners listeners = new BDJListeners(); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryAudioControlImpl.java 2017-06-23 13:34:57.000000000 +0000 @@ -26,7 +26,7 @@ public class PrimaryAudioControlImpl extends StreamControl implements PrimaryAudioControl { protected PrimaryAudioControlImpl(Handler player) { - super(player); + this.player = player; } protected StreamInfo[] getStreams() { @@ -47,4 +47,6 @@ protected void setStreamNumber(int num) { Libbluray.writePSR(Libbluray.PSR_PRIMARY_AUDIO_ID, num); } + + private Handler player; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryGainControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryGainControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryGainControlImpl.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/PrimaryGainControlImpl.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2010 William Hahne - * Copyright (C) 2015 Petri Hintukainen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -package org.videolan.media.content.playlist; - -import java.awt.Component; -import org.bluray.media.PrimaryGainControl; - -import org.videolan.media.content.BDHandler; - -public class PrimaryGainControlImpl extends GainControlImpl implements PrimaryGainControl { - PrimaryGainControlImpl(BDHandler player) { - this.player = player; - } - - protected void setGain(boolean mute, float level) { - player.setGain(BDHandler.GAIN_PRIMARY, mute, level); - super.valueChanged(); - } - - private BDHandler player; -} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryAudioControlImpl.java 2017-06-23 13:34:57.000000000 +0000 @@ -26,7 +26,7 @@ public class SecondaryAudioControlImpl extends StreamControl implements SecondaryAudioControl { protected SecondaryAudioControlImpl(Handler player) { - super(player); + this.player = player; } protected StreamInfo[] getStreams() { @@ -47,4 +47,6 @@ protected void setStreamNumber(int num) { Libbluray.writePSR(Libbluray.PSR_SECONDARY_AUDIO_VIDEO, num, 0x000000ff); } + + private Handler player; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryGainControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryGainControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryGainControlImpl.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/SecondaryGainControlImpl.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2010 William Hahne - * Copyright (C) 2015 Petri Hintukainen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -package org.videolan.media.content.playlist; - -import java.awt.Component; -import org.bluray.media.SecondaryGainControl; - -import org.videolan.media.content.BDHandler; - -public class SecondaryGainControlImpl extends GainControlImpl implements SecondaryGainControl { - SecondaryGainControlImpl(BDHandler player) { - this.player = player; - } - - protected void setGain(boolean mute, float level) { - player.setGain(BDHandler.GAIN_SECONDARY, mute, level); - super.valueChanged(); - } - - BDHandler player; -} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/StreamControl.java 2017-06-23 13:34:57.000000000 +0000 @@ -29,8 +29,7 @@ import org.videolan.StreamInfo; public abstract class StreamControl implements Control { - protected StreamControl(Handler player) { - this.player = player; + protected StreamControl() { } protected abstract StreamInfo[] getStreams(); @@ -125,6 +124,4 @@ } throw new LanguageNotAvailableException(); } - - protected Handler player; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/SubtitlingControlImpl.java 2017-06-23 13:34:57.000000000 +0000 @@ -38,7 +38,7 @@ public class SubtitlingControlImpl extends StreamControl implements SubtitlingControl { protected SubtitlingControlImpl(Handler player) { - super(player); + this.player = player; } protected StreamInfo[] getStreams() { @@ -137,6 +137,6 @@ } } - + private Handler player; private BDJListeners listeners = new BDJListeners(); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/VideoControl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/VideoControl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/VideoControl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/playlist/VideoControl.java 2017-06-23 13:34:57.000000000 +0000 @@ -29,9 +29,8 @@ import org.videolan.StreamInfo; public abstract class VideoControl extends StreamControl implements VideoPresentationControl { - protected VideoControl(Handler player, int plane) { - super(player); - this.plane = plane; + protected VideoControl(int plane) { + //this.plane = plane; } protected HScreenRectangle getNormalizedRectangle(Dimension dimension, Rectangle rectangle) { @@ -119,7 +118,10 @@ Dimension vd = getInputVideoSize(); if ((vd.width == 0) || (vd.height == 0)) return new Rectangle(0, 0); - srcArea = getRectangleOnScreen(getNormalizedRectangle(vd, clipRect)); + if (clipRect != null) + srcArea = getRectangleOnScreen(getNormalizedRectangle(vd, clipRect)); + else + srcArea = new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f); //TODO org.videolan.Logger.unimplemented("VideoControl", "setClipRegion"); @@ -154,7 +156,7 @@ return null; } - private int plane = 0; + //private int plane = 0; private HScreenRectangle srcArea = new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f); private HScreenRectangle dstArea = new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/sound/Handler.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/sound/Handler.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/sound/Handler.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/sound/Handler.java 2017-06-23 13:34:59.000000000 +0000 @@ -37,9 +37,9 @@ import org.bluray.net.BDLocator; -//import org.videolan.media.content.playlist.MediaTimePositionControlImpl; -import org.videolan.media.content.playlist.OverallGainControlImpl; -import org.videolan.media.content.playlist.PanningControlImpl; +import org.videolan.media.content.control.MediaTimePositionControlImpl; +import org.videolan.media.content.control.OverallGainControlImpl; +import org.videolan.media.content.control.PanningControlImpl; import org.videolan.media.content.BDHandler; @@ -96,9 +96,11 @@ return null; } - protected ControllerErrorEvent doStop() { - return super.doStop(); + /* + protected ControllerErrorEvent doStop(boolean eof) { + return super.doStop(eof); } + */ protected BDLocator getLocator() { return locator; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/sound/MediaTimePositionControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/sound/MediaTimePositionControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/sound/MediaTimePositionControlImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/sound/MediaTimePositionControlImpl.java 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -/* - * This file is part of libbluray - * Copyright (C) 2010 William Hahne - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -package org.videolan.media.content.sound; - -import java.awt.Component; - -import javax.media.Time; - -import org.davic.media.MediaTimePositionControl; - -public class MediaTimePositionControlImpl implements MediaTimePositionControl { - protected MediaTimePositionControlImpl(Handler player) { - this.player = player; - } - - public Component getControlComponent() { - return null; - } - - public Time setMediaTimePosition(Time mediaTime) { - player.setMediaTime(mediaTime); - return player.getMediaTime(); - } - - public Time getMediaTimePosition() { - return player.getMediaTime(); - } - - private Handler player; -} diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/BackgroundVideoPresentationControlImpl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/BackgroundVideoPresentationControlImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/BackgroundVideoPresentationControlImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/BackgroundVideoPresentationControlImpl.java 2017-06-23 13:34:57.000000000 +0000 @@ -100,23 +100,23 @@ Rectangle sr = size.getSource(); if (sr.x < 0) sr.x = 0; - if ((sr.x + sr.width) > vd.width) { - sr.width = vd.width - sr.x; - if (sr.width <= 0) { - sr.x = 0; - sr.width = 0; - } + if ((sr.x + sr.width) > vd.width) { + sr.width = vd.width - sr.x; + if (sr.width <= 0) { + sr.x = 0; + sr.width = 0; } - if (sr.y < 0) + } + if (sr.y < 0) + sr.y = 0; + if ((sr.y + sr.height) > vd.height) { + sr.height = vd.height - sr.y; + if (sr.height <= 0) { sr.y = 0; - if ((sr.y + sr.height) > vd.height) { - sr.height = vd.height - sr.y; - if (sr.height <= 0) { - sr.y = 0; - sr.height = 0; - } + sr.height = 0; } - Rectangle dr = size.getDestination(); - return new AWTVideoSize(sr, dr); + } + Rectangle dr = size.getDestination(); + return new AWTVideoSize(sr, dr); } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/VideoControl.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/VideoControl.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/VideoControl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/content/video/dvb/mpeg/drip/VideoControl.java 2017-06-23 13:34:57.000000000 +0000 @@ -30,7 +30,7 @@ public class VideoControl implements VideoPresentationControl { protected VideoControl(Handler player) { - this.player = player; + //this.player = player; } protected HScreenRectangle getNormalizedRectangle(Dimension dimension, Rectangle rectangle) { @@ -114,9 +114,15 @@ Dimension vd = getInputVideoSize(); if ((vd.width == 0) || (vd.height == 0)) return new Rectangle(0, 0); - srcArea = getRectangleOnScreen(getNormalizedRectangle(vd, clipRect)); + if (clipRect != null) + srcArea = getRectangleOnScreen(getNormalizedRectangle(vd, clipRect)); + else + srcArea = new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f); + //TODO - return getRectangle(vd, srcArea); + org.videolan.Logger.unimplemented("VideoControl", "setClipRegion"); + + return getRectangle(vd, srcArea); } public float[] supportsArbitraryHorizontalScaling() { @@ -146,7 +152,7 @@ throw new Error("Not implemented"); // TODO implement } - private Handler player; + //private Handler player; private HScreenRectangle srcArea = new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f); private HScreenRectangle dstArea = new HScreenRectangle(0.0f, 0.0f, 1.0f, 1.0f); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/protocol/bd/DataSource.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/protocol/bd/DataSource.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/protocol/bd/DataSource.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/protocol/bd/DataSource.java 2017-06-23 13:35:00.000000000 +0000 @@ -34,7 +34,7 @@ public Time getDuration() { org.videolan.Logger.unimplemented(DataSource.class.getName(), "getDuration"); - return null; + return DURATION_UNKNOWN; } public String getContentType() { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/protocol/file/DataSource.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/protocol/file/DataSource.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/media/protocol/file/DataSource.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/media/protocol/file/DataSource.java 2017-06-23 13:35:00.000000000 +0000 @@ -33,7 +33,7 @@ public Time getDuration() { org.videolan.Logger.unimplemented(DataSource.class.getName(), "getDuration"); - return null; + return DURATION_UNKNOWN; } public String getContentType() { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/MountManager.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/MountManager.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/MountManager.java 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/MountManager.java 2017-06-23 13:35:00.000000000 +0000 @@ -185,6 +185,7 @@ new PrivilegedAction() { public Object run() { if (mountPoint.decRefCount() < 1) { + logger.error("Removing JAR " + id + " from mount cache"); mountPoints.remove(id); } return null; @@ -221,7 +222,7 @@ if (mountPoint != null) { return mountPoint.getMountPoint(); } else { - logger.info("JAR " + jarId + " not mounted"); + logger.error("JAR " + jarId + " not mounted"); } return null; } @@ -247,6 +248,7 @@ if (dir != null) { return dir.getAbsolutePath(); } + logger.error("getMountPoint(): already unmounted !"); return null; } @@ -274,8 +276,8 @@ return classFiles; } - public boolean setClassFiles() { - return classFiles == true; + public void setClassFiles() { + classFiles = true; } private File dir; diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/StrUtil.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/StrUtil.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/StrUtil.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/StrUtil.java 2017-06-23 13:34:55.000000000 +0000 @@ -23,14 +23,16 @@ public class StrUtil { public static String Join(String[] strings, String separator) { - String result = ""; - if (strings != null) { - result = strings[0]; + if (strings != null && strings.length > 0) { + StringBuffer buffer = new StringBuffer(); + buffer.append(strings[0]); for (int i = 1; i < strings.length; i++) { - result = result + separator + strings[i]; + buffer.append(separator); + buffer.append(strings[i]); } + return buffer.toString(); } - return result; + return ""; } public static String[] split(String str, char delimiter) { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/TitleInfo.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/TitleInfo.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/TitleInfo.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/TitleInfo.java 2017-06-23 13:34:56.000000000 +0000 @@ -24,7 +24,7 @@ this.objType = objType; this.playbackType = playbackType; if (objType == OBJ_TYPE_BDJ) - this.bdjoName = (new java.text.DecimalFormat("00000")).format(idRef); + this.bdjoName = (BDJUtil.makeFiveDigitStr(idRef)); else this.hdmvOID = idRef; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/VFSCache.java libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/VFSCache.java --- libbluray-0.8.1/src/libbluray/bdj/java/org/videolan/VFSCache.java 2015-04-06 16:13:40.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java/org/videolan/VFSCache.java 2017-06-23 13:35:00.000000000 +0000 @@ -222,8 +222,6 @@ protected synchronized File addFont(InputStream is) { - new File(fontRoot).mkdirs(); - // copy stream to tmp file in fontRoot. freetype can not read streams. File tmpFile = null; for (int i = 0; i < 100; i++) { @@ -270,16 +268,19 @@ accessFileSynced(absPath); } - protected synchronized void accessFileSynced(String absPath) { + private synchronized void accessFileSynced(String absPath) { if (inAccessFile) { /* avoid recursion from SecurityManager checks */ return; } - inAccessFile = true; - accessFileImp(absPath); - inAccessFile = false; + try { + inAccessFile = true; + accessFileImp(absPath); + } finally { + inAccessFile = false; + } } private void accessFileImp(String absPath) { @@ -292,12 +293,13 @@ String relPath = absPath.substring(vfsRootLength); String[] names = Libbluray.listBdFiles(relPath, true); if (names != null) { - /* this is directory */ + /* this is directory. Make sure it exists. */ + Libbluray.cacheBdRomFile(relPath + "/", cacheRoot + relPath + "/"); return; } /* do not cache .m2ts streams */ - if (relPath.startsWith("BDMV" + File.separator + "STREAM" + File.separator)) { + if (relPath.startsWith(streamDir)) { return; } @@ -352,6 +354,7 @@ private static final String jarDir = "BDMV" + File.separator + "JAR" + File.separator; private static final String fontDir = "BDMV" + File.separator + "AUXDATA" + File.separator; + private static final String streamDir = "BDMV" + File.separator + "STREAM" + File.separator; private static final Logger logger = Logger.getLogger(VFSCache.class.getName()); } diff -Nru libbluray-0.8.1/src/libbluray/bdj/java-j2me/org/dvb/ui/DVBGraphicsImpl.java libbluray-1.0.1/src/libbluray/bdj/java-j2me/org/dvb/ui/DVBGraphicsImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java-j2me/org/dvb/ui/DVBGraphicsImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java-j2me/org/dvb/ui/DVBGraphicsImpl.java 2017-06-23 13:35:13.000000000 +0000 @@ -36,9 +36,12 @@ import java.text.AttributedCharacterIterator; public class DVBGraphicsImpl extends DVBGraphics { + + private Graphics2D gfx; + protected DVBGraphicsImpl(Graphics2D gfx) { - super(gfx); + this.gfx = gfx; } /* diff -Nru libbluray-0.8.1/src/libbluray/bdj/java-j2se/java/awt/BDGraphics.java libbluray-1.0.1/src/libbluray/bdj/java-j2se/java/awt/BDGraphics.java --- libbluray-0.8.1/src/libbluray/bdj/java-j2se/java/awt/BDGraphics.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java-j2se/java/awt/BDGraphics.java 2017-06-23 13:35:12.000000000 +0000 @@ -53,6 +53,7 @@ public java.awt.font.FontRenderContext getFontRenderContext() { + logger.unimplemented("getFontRenderContext"); return null; } public void setPaint(Paint p) { diff -Nru libbluray-0.8.1/src/libbluray/bdj/java-j2se/org/dvb/ui/DVBGraphicsImpl.java libbluray-1.0.1/src/libbluray/bdj/java-j2se/org/dvb/ui/DVBGraphicsImpl.java --- libbluray-0.8.1/src/libbluray/bdj/java-j2se/org/dvb/ui/DVBGraphicsImpl.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java-j2se/org/dvb/ui/DVBGraphicsImpl.java 2017-06-23 13:35:12.000000000 +0000 @@ -46,9 +46,12 @@ import java.util.Map; public class DVBGraphicsImpl extends DVBGraphics { + + private Graphics2D gfx; + protected DVBGraphicsImpl(Graphics2D gfx) { - super(gfx); + this.gfx = gfx; } /* diff -Nru libbluray-0.8.1/src/libbluray/bdj/java-j2se/org/videolan/PortingHelper.java libbluray-1.0.1/src/libbluray/bdj/java-j2se/org/videolan/PortingHelper.java --- libbluray-0.8.1/src/libbluray/bdj/java-j2se/org/videolan/PortingHelper.java 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/java-j2se/org/videolan/PortingHelper.java 2017-06-23 13:35:12.000000000 +0000 @@ -30,12 +30,15 @@ } public static String dumpStack(Thread t) { - String dump = ""; StackTraceElement e[] = t.getStackTrace(); if (e != null) { - for (int i = 0; i < e.length; i++) - dump += "\n\t" + e[i].toString(); + StringBuffer dump = new StringBuffer(); + for (int i = 0; i < e.length; i++) { + dump.append("\n\t"); + dump.append(e[i].toString()); + } + return dump.toString(); } - return dump; + return ""; } } diff -Nru libbluray-0.8.1/src/libbluray/bdj/native/bdjo.c libbluray-1.0.1/src/libbluray/bdj/native/bdjo.c --- libbluray-0.8.1/src/libbluray/bdj/native/bdjo.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/native/bdjo.c 2017-06-23 13:34:47.000000000 +0000 @@ -17,6 +17,12 @@ * <http://www.gnu.org/licenses/>. */ +/* + * Note: + * This module should be called only from Java side. + * If it is called from native C thread, lot of references are leaked ! + */ + #if HAVE_CONFIG_H #include "config.h" #endif @@ -25,7 +31,7 @@ #include "util.h" -#include "libbluray/bdj/bdjo_data.h" +#include "bdj/bdjo_data.h" #include "util/logging.h" @@ -35,10 +41,16 @@ * https://hdcookbook.dev.java.net/ */ -#define JNICHK(a) if((*env)->ExceptionOccurred(env)) { \ - BD_DEBUG(DBG_BDJ, "Exception occured\n"); \ - (*env)->ExceptionDescribe(env); \ - } if (!a) return NULL; +#define JNICHK(a) \ + do { \ + if ((*env)->ExceptionOccurred(env)) { \ + BD_DEBUG(DBG_BDJ | DBG_CRIT, "Exception occurred\n"); \ + (*env)->ExceptionDescribe(env); \ + } \ + if (!(a)) { \ + return NULL; \ + } \ + } while (0) /* * @@ -49,7 +61,7 @@ jstring jdefault_font = (*env)->NewStringUTF(env, p->default_font); return bdj_make_object(env, "org/videolan/bdjo/TerminalInfo", "(Ljava/lang/String;IZZ)V", jdefault_font, (jint)p->initial_havi_config_id, - (jint)p->menu_call_mask, (jint)p->title_search_mask); + (jboolean)p->menu_call_mask, (jboolean)p->title_search_mask); } static jobject _make_app_cache_info(JNIEnv* env, const BDJO_APP_CACHE_INFO *p) diff -Nru libbluray-0.8.1/src/libbluray/bdj/native/bdjo.h libbluray-1.0.1/src/libbluray/bdj/native/bdjo.h --- libbluray-0.8.1/src/libbluray/bdj/native/bdjo.h 2015-02-18 09:08:30.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/native/bdjo.h 2017-06-23 13:34:46.000000000 +0000 @@ -26,6 +26,12 @@ struct bdjo_data; +/* + * Note: + * This function should be called only from Java side. + * If it is called from native C thread, lot of references are leaked ! + */ + BD_PRIVATE jobject bdjo_make_jobj(JNIEnv* env, const struct bdjo_data *bdjo); #endif /* BDJO_H_ */ diff -Nru libbluray-0.8.1/src/libbluray/bdj/native/java_awt_BDFontMetrics.c libbluray-1.0.1/src/libbluray/bdj/native/java_awt_BDFontMetrics.c --- libbluray-0.8.1/src/libbluray/bdj/native/java_awt_BDFontMetrics.c 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/native/java_awt_BDFontMetrics.c 2017-06-23 13:34:47.000000000 +0000 @@ -117,8 +117,12 @@ size_t len = WideCharToMultiByte(CP_UTF8, 0, wdata, -1, NULL, 0, NULL, NULL); if (len != 0) { data->filename = (char *)malloc(len); - WideCharToMultiByte(CP_UTF8, 0, wdata, -1, data->filename, len, NULL, NULL); - break; + if (data->filename) { + if (!WideCharToMultiByte(CP_UTF8, 0, wdata, -1, data->filename, len, NULL, NULL)) { + data->filename[0] = 0; + } + break; + } } } } @@ -135,7 +139,10 @@ memset(&lf, 0, sizeof(lf)); lf.lfCharSet = DEFAULT_CHARSET; - MultiByteToWideChar(CP_UTF8, 0, family, -1, lf.lfFaceName, sizeof(lf.lfFaceName)); + int length = MultiByteToWideChar(CP_UTF8, 0, family, -1, lf.lfFaceName, LF_FACESIZE); + if (!length) { + return NULL; + } hDC = GetDC(NULL); EnumFontFamiliesExW(hDC, &lf, (FONTENUMPROCW)&EnumFontCallbackW, (LPARAM)&data, 0); @@ -481,7 +488,7 @@ return 0; (*env)->GetCharArrayRegion(env, charArray, offset, length, chars); if ((*env)->ExceptionCheck(env)) { - free(chars); + X_FREE(chars); return 0; } @@ -491,7 +498,7 @@ } } - free(chars); + X_FREE(chars); return width; diff -Nru libbluray-0.8.1/src/libbluray/bdj/native/java_awt_BDGraphics.c libbluray-1.0.1/src/libbluray/bdj/native/java_awt_BDGraphics.c --- libbluray-0.8.1/src/libbluray/bdj/native/java_awt_BDGraphics.c 2015-02-18 09:08:30.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/native/java_awt_BDGraphics.c 2017-06-23 13:34:47.000000000 +0000 @@ -57,6 +57,9 @@ unsigned j, k; FT_Face face = (FT_Face)(intptr_t)ftFace; + if (!face) + return; + length = (*env)->GetStringLength(env, string); if (length <= 0) return; @@ -67,7 +70,7 @@ cls = (*env)->GetObjectClass(env, obj); mid = (*env)->GetMethodID(env, cls, "drawPoint", "(III)V"); - a = (rgb >> 24) & 0xff; + a = ((unsigned)rgb >> 24) & 0xff; c = rgb & 0xffffff; for (i = 0; i < length; i++) { @@ -76,7 +79,7 @@ for (k = 0; k < face->glyph->bitmap.width; k++) { jint pixel; pixel = face->glyph->bitmap.buffer[j*face->glyph->bitmap.pitch + k]; - pixel = ((a * pixel / 255) << 24) | c; + pixel = ((unsigned)(a * pixel / 255) << 24) | c; (*env)->CallVoidMethod(env, obj, mid, x + face->glyph->bitmap_left + k, y - face->glyph->bitmap_top + j, diff -Nru libbluray-0.8.1/src/libbluray/bdj/native/org_videolan_Libbluray.c libbluray-1.0.1/src/libbluray/bdj/native/org_videolan_Libbluray.c --- libbluray-0.8.1/src/libbluray/bdj/native/org_videolan_Libbluray.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/native/org_videolan_Libbluray.c 2017-06-23 13:34:46.000000000 +0000 @@ -25,12 +25,12 @@ #include "bdjo.h" #include "util.h" -#include "libbluray/bdj/bdjo_parse.h" +#include "bdj/bdjo_parse.h" -#include "libbluray/bluray.h" -#include "libbluray/bluray_internal.h" -#include "libbluray/decoders/overlay.h" -#include "libbluray/disc/disc.h" +#include "bluray.h" +#include "bluray_internal.h" +#include "decoders/overlay.h" +#include "disc/disc.h" #include "file/file.h" #include "util/logging.h" @@ -66,7 +66,7 @@ int playback_type = (!!title->interactive) + ((!!title->bdj) << 1); ti = bdj_make_object(env, "org/videolan/TitleInfo", "(IIII)V", - title_number, title_type, playback_type, title->id_ref); + (jint)title_number, (jint)title_type, (jint)playback_type, (jint)title->id_ref); } return ti; } @@ -74,13 +74,18 @@ static jobjectArray _make_title_infos(JNIEnv * env, const BLURAY_DISC_INFO *disc_info) { jobjectArray titleArr = bdj_make_array(env, "org/videolan/TitleInfo", disc_info->num_titles + 2); + jobject titleInfo; + + if (!titleArr) { + return NULL; + } for (unsigned i = 0; i <= disc_info->num_titles; i++) { - jobject titleInfo = _make_title_info(env, disc_info->titles[i], i); + titleInfo = _make_title_info(env, disc_info->titles[i], i); (*env)->SetObjectArrayElement(env, titleArr, i, titleInfo); } - jobject titleInfo = _make_title_info(env, disc_info->first_play, 65535); + titleInfo = _make_title_info(env, disc_info->first_play, 65535); (*env)->SetObjectArrayElement(env, titleArr, disc_info->num_titles + 1, titleInfo); return titleArr; @@ -94,12 +99,21 @@ { jobjectArray streamArr = bdj_make_array(env, "org/videolan/StreamInfo", count); + + if (!streamArr) { + return NULL; + } + for (int i = 0; i < count; i++) { BLURAY_STREAM_INFO s = streams[i]; jstring lang = (*env)->NewStringUTF(env, (char*)s.lang); - jobject streamObj = bdj_make_object(env, "org/videolan/StreamInfo", - "(BBBCLjava/lang/String;BB)V", s.coding_type, s.format, - s.rate, s.char_code, lang, s.aspect, s.subpath_id); + jobject streamObj = bdj_make_object(env, + "org/videolan/StreamInfo", + "(BBBCLjava/lang/String;BB)V", + (jbyte)s.coding_type, (jbyte)s.format, + (jbyte)s.rate, (jchar)s.char_code, + lang, + (jbyte)s.aspect, (jbyte)s.subpath_id); (*env)->SetObjectArrayElement(env, streamArr, i, streamObj); } @@ -111,16 +125,22 @@ jobjectArray marks = bdj_make_array(env, "org/videolan/TIMark", ti->mark_count); + if (marks) { for (uint32_t i = 0; i < ti->mark_count; i++) { BLURAY_TITLE_MARK m = ti->marks[i]; - jobject mark = bdj_make_object(env, "org/videolan/TIMark", - "(IIJJJI)V", m.idx, m.type, m.start, m.duration, m.offset, m.clip_ref); + jobject mark = bdj_make_object(env, + "org/videolan/TIMark", + "(IIJJJI)V", + (jint)m.idx, (jint)m.type, (jlong)m.start, (jlong)m.duration, + (jlong)m.offset, (jint)m.clip_ref); (*env)->SetObjectArrayElement(env, marks, i, mark); } + } jobjectArray clips = bdj_make_array(env, "org/videolan/TIClip", ti->clip_count); + if (clips) { for (uint32_t i = 0; i < ti->clip_count; i++) { BLURAY_CLIP_INFO info = ti->clips[i]; @@ -142,16 +162,20 @@ jobjectArray secAudioStreams = _make_stream_array(env, info.sec_audio_stream_count, info.sec_audio_streams); - jobject clip = bdj_make_object(env, "org/videolan/TIClip", + jobject clip = bdj_make_object(env, + "org/videolan/TIClip", "(I[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;[Lorg/videolan/StreamInfo;)V", - i, videoStreams, audioStreams, pgStreams, igStreams, secVideoStreams, secAudioStreams); + (jint)i, videoStreams, audioStreams, pgStreams, igStreams, secVideoStreams, secAudioStreams); (*env)->SetObjectArrayElement(env, clips, i, clip); } + } - return bdj_make_object(env, "org/videolan/PlaylistInfo", - "(IJI[Lorg/videolan/TIMark;[Lorg/videolan/TIClip;)V", - ti->playlist, ti->duration, ti->angle_count, marks, clips); + return bdj_make_object(env, + "org/videolan/PlaylistInfo", + "(IJI[Lorg/videolan/TIMark;[Lorg/videolan/TIClip;)V", + (jint)ti->playlist, (jlong)ti->duration, (jint)ti->angle_count, + marks, clips); } /* @@ -162,10 +186,12 @@ (JNIEnv * env, jclass cls, jlong np) { BLURAY* bd = (BLURAY*)(intptr_t)np; - const BLURAY_DISC_INFO *disc_info = bd_get_disc_info(bd); + const BLURAY_DISC_INFO *disc_info; BD_DEBUG(DBG_JNI, "getTitleInfosN()\n"); + disc_info = bd_get_disc_info(bd); + return _make_title_infos(env, disc_info); } @@ -193,14 +219,25 @@ { BLURAY* bd = (BLURAY*)(intptr_t)np; const uint8_t *data = bd_get_aacs_data(bd, type); + size_t data_size = 16; BD_DEBUG(DBG_JNI, "getAacsDataN(%d) -> %p\n", (int)type, (const void *)data); if (!data) { return NULL; } - jbyteArray array = (*env)->NewByteArray(env, 16); - (*env)->SetByteArrayRegion(env, array, 0, 16, (const jbyte *)data); + if (type == 1/*BD_AACS_DISC_ID*/) { + data_size = 20; + } + if (type == 7/*BD_AACS_CONTENT_CERT_ID*/) { + data_size = 6; + } + if (type == 8/*BD_AACS_BDJ_ROOT_CERT_HASH*/) { + data_size = 20; + } + + jbyteArray array = (*env)->NewByteArray(env, data_size); + (*env)->SetByteArrayRegion(env, array, 0, data_size, (const jbyte *)data); return array; } diff -Nru libbluray-0.8.1/src/libbluray/bdj/native/util.c libbluray-1.0.1/src/libbluray/bdj/native/util.c --- libbluray-0.8.1/src/libbluray/bdj/native/util.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdj/native/util.c 2017-06-23 13:34:46.000000000 +0000 @@ -30,24 +30,49 @@ jobject bdj_make_object(JNIEnv* env, const char* name, const char* sig, ...) { - jclass obj_class = (*env)->FindClass(env, name); - jmethodID obj_constructor = (*env)->GetMethodID(env, obj_class, "<init>", sig); + va_list ap; + jclass obj_class; + jmethodID obj_constructor; + jobject obj; + obj_class = (*env)->FindClass(env, name); if (!obj_class) { BD_DEBUG(DBG_BDJ | DBG_CRIT, "Class %s not found\n", name); return NULL; } - va_list ap; + obj_constructor = (*env)->GetMethodID(env, obj_class, "<init>", sig); + if (!obj_constructor) { + BD_DEBUG(DBG_BDJ | DBG_CRIT, "Class %s constructor %s not found\n", name, sig); + return NULL; + } + va_start(ap, sig); - jobject obj = (*env)->NewObjectV(env, obj_class, obj_constructor, ap); + obj = (*env)->NewObjectV(env, obj_class, obj_constructor, ap); va_end(ap); + if (!obj) { + BD_DEBUG(DBG_BDJ | DBG_CRIT, "Failed to create %s\n", name); + } + return obj; } jobjectArray bdj_make_array(JNIEnv* env, const char* name, int count) { - jclass arr_class = (*env)->FindClass(env, name); - return (*env)->NewObjectArray(env, count, arr_class, NULL); + jobjectArray arr; + jclass arr_class; + + arr_class = (*env)->FindClass(env, name); + if (!arr_class) { + BD_DEBUG(DBG_BDJ | DBG_CRIT, "Class %s not found\n", name); + return NULL; + } + + arr = (*env)->NewObjectArray(env, count, arr_class, NULL); + if (!arr) { + BD_DEBUG(DBG_BDJ | DBG_CRIT, "Failed to create %s\n", name); + } + + return arr; } diff -Nru libbluray-0.8.1/src/libbluray/bdnav/bdid_parse.c libbluray-1.0.1/src/libbluray/bdnav/bdid_parse.c --- libbluray-0.8.1/src/libbluray/bdnav/bdid_parse.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/bdid_parse.c 2017-06-23 13:34:45.000000000 +0000 @@ -41,7 +41,9 @@ { uint32_t sig1, sig2; - bs_seek_byte(bs, 0); + if (bs_seek_byte(bs, 0) < 0) { + return 0; + } sig1 = bs_read(bs, 32); sig2 = bs_read(bs, 32); @@ -67,16 +69,26 @@ uint32_t data_start, extension_data_start; uint8_t tmp[16]; - bs_init(&bs, fp); + if (bs_init(&bs, fp) < 0) { + BD_DEBUG(DBG_NAV, "id.bdmv: read error\n"); + return NULL; + } if (!_parse_header(&bs, &data_start, &extension_data_start)) { BD_DEBUG(DBG_NAV | DBG_CRIT, "id.bdmv: invalid header\n"); return NULL; } - bdid = calloc(1, sizeof(BDID_DATA)); + if (bs_seek_byte(&bs, 40) < 0) { + BD_DEBUG(DBG_NAV, "id.bdmv: read error\n"); + return NULL; + } - bs_seek_byte(&bs, 40); + bdid = calloc(1, sizeof(BDID_DATA)); + if (!bdid) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return NULL; + } bs_read_bytes(&bs, tmp, 4); str_print_hex(bdid->org_id, tmp, 4); diff -Nru libbluray-0.8.1/src/libbluray/bdnav/clpi_data.h libbluray-1.0.1/src/libbluray/bdnav/clpi_data.h --- libbluray-0.8.1/src/libbluray/bdnav/clpi_data.h 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/clpi_data.h 2017-06-23 13:34:45.000000000 +0000 @@ -77,10 +77,7 @@ CLPI_TS_TYPE ts_type_info; uint8_t atc_delta_count; CLPI_ATC_DELTA *atc_delta; - - /* breaks ABI if added here ... - CLPI_FONT_INFO font_info; - */ + CLPI_FONT_INFO font_info; /* Text subtitle stream font files */ } CLPI_CLIP_INFO; typedef struct @@ -169,9 +166,6 @@ CLPI_EXTENT_START extent_start; /* extent start points (.ssif interleaving) */ CLPI_PROG_INFO program_ss; CLPI_CPI cpi_ss; - - /* Text subtitle stream font files */ - CLPI_FONT_INFO font_info; } CLPI_CL; #endif // _CLPI_DATA_H_ diff -Nru libbluray-0.8.1/src/libbluray/bdnav/clpi_parse.c libbluray-1.0.1/src/libbluray/bdnav/clpi_parse.c --- libbluray-0.8.1/src/libbluray/bdnav/clpi_parse.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/clpi_parse.c 2017-06-23 13:34:45.000000000 +0000 @@ -117,14 +117,19 @@ ss->lang[3] = '\0'; // Skip over any padding - bs_seek_byte(bits, pos + len); + if (bs_seek_byte(bits, pos + len) < 0) { + return 0; + } return 1; } static int _parse_header(BITSTREAM *bits, CLPI_CL *cl) { - bs_seek_byte(bits, 0); + if (bs_seek_byte(bits, 0) < 0) { + return 0; + } + cl->type_indicator = bs_read(bits, 32); cl->type_indicator2 = bs_read(bits, 32); if (cl->type_indicator != CLPI_SIG1 || @@ -155,7 +160,10 @@ int len; int ii; - bs_seek_byte(bits, 40); + if (bs_seek_byte(bits, 40) < 0) { + return 0; + } + // ClipInfo len bs_skip(bits, 32); // reserved @@ -178,7 +186,9 @@ cl->clip.ts_type_info.validity = bs_read(bits, 8); bs_read_string(bits, cl->clip.ts_type_info.format_id, 4); // Seek past the stuff we don't know anything about - bs_seek_byte(bits, pos + len); + if (bs_seek_byte(bits, pos + len) < 0) { + return 0; + } } if (cl->clip.is_atc_delta) { // Skip reserved bytes @@ -186,6 +196,10 @@ cl->clip.atc_delta_count = bs_read(bits, 8); cl->clip.atc_delta = malloc(cl->clip.atc_delta_count * sizeof(CLPI_ATC_DELTA)); + if (cl->clip.atc_delta_count && !cl->clip.atc_delta) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } for (ii = 0; ii < cl->clip.atc_delta_count; ii++) { cl->clip.atc_delta[ii].delta = bs_read(bits, 32); bs_read_string(bits, cl->clip.atc_delta[ii].file_id, 5); @@ -196,12 +210,17 @@ // font info if (cl->clip.application_type == 6 /* Sub TS for a sub-path of Text subtitle */) { + CLPI_FONT_INFO *fi = &cl->clip.font_info; bs_skip(bits, 8); - cl->font_info.font_count = bs_read(bits, 8); - if (cl->font_info.font_count) { - cl->font_info.font = malloc(cl->font_info.font_count * sizeof(CLPI_FONT)); - for (ii = 0; ii < cl->font_info.font_count; ii++) { - bs_read_string(bits, cl->font_info.font[ii].file_id, 5); + fi->font_count = bs_read(bits, 8); + if (fi->font_count) { + fi->font = malloc(fi->font_count * sizeof(CLPI_FONT)); + if (!fi->font) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } + for (ii = 0; ii < fi->font_count; ii++) { + bs_read_string(bits, fi->font[ii].file_id, 5); bs_skip(bits, 8); } } @@ -215,7 +234,9 @@ { int ii, jj; - bs_seek_byte(bits, cl->sequence_info_start_addr); + if (bs_seek_byte(bits, cl->sequence_info_start_addr) < 0) { + return 0; + } // Skip the length field, and a reserved byte bs_skip(bits, 5 * 8); @@ -223,8 +244,12 @@ cl->sequence.num_atc_seq = bs_read(bits, 8); CLPI_ATC_SEQ *atc_seq; - atc_seq = malloc(cl->sequence.num_atc_seq * sizeof(CLPI_ATC_SEQ)); + atc_seq = calloc(cl->sequence.num_atc_seq, sizeof(CLPI_ATC_SEQ)); cl->sequence.atc_seq = atc_seq; + if (cl->sequence.num_atc_seq && !atc_seq) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } for (ii = 0; ii < cl->sequence.num_atc_seq; ii++) { atc_seq[ii].spn_atc_start = bs_read(bits, 32); atc_seq[ii].num_stc_seq = bs_read(bits, 8); @@ -232,6 +257,10 @@ CLPI_STC_SEQ *stc_seq; stc_seq = malloc(atc_seq[ii].num_stc_seq * sizeof(CLPI_STC_SEQ)); + if (atc_seq[ii].num_stc_seq && !stc_seq) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } atc_seq[ii].stc_seq = stc_seq; for (jj = 0; jj < atc_seq[ii].num_stc_seq; jj++) { stc_seq[jj].pcr_pid = bs_read(bits, 16); @@ -254,8 +283,12 @@ program->num_prog = bs_read(bits, 8); CLPI_PROG *progs; - progs = malloc(program->num_prog * sizeof(CLPI_PROG)); + progs = calloc(program->num_prog, sizeof(CLPI_PROG)); program->progs = progs; + if (program->num_prog && !progs) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } for (ii = 0; ii < program->num_prog; ii++) { progs[ii].spn_program_sequence_start = bs_read(bits, 32); progs[ii].program_map_pid = bs_read(bits, 16); @@ -263,7 +296,11 @@ progs[ii].num_groups = bs_read(bits, 8); CLPI_PROG_STREAM *ps; - ps = malloc(progs[ii].num_streams * sizeof(CLPI_PROG_STREAM)); + ps = calloc(progs[ii].num_streams, sizeof(CLPI_PROG_STREAM)); + if (progs[ii].num_streams && !ps) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } progs[ii].streams = ps; for (jj = 0; jj < progs[ii].num_streams; jj++) { ps[jj].pid = bs_read(bits, 16); @@ -278,7 +315,9 @@ static int _parse_program_info(BITSTREAM *bits, CLPI_CL *cl) { - bs_seek_byte(bits, cl->program_info_start_addr); + if (bs_seek_byte(bits, cl->program_info_start_addr) < 0) { + return 0; + } return _parse_program(bits, &cl->program); } @@ -291,26 +330,38 @@ CLPI_EP_COARSE * coarse; CLPI_EP_FINE * fine; - bs_seek_byte(bits, ee->ep_map_stream_start_addr); + if (bs_seek_byte(bits, ee->ep_map_stream_start_addr) < 0) { + return 0; + } fine_start = bs_read(bits, 32); coarse = malloc(ee->num_ep_coarse * sizeof(CLPI_EP_COARSE)); ee->coarse = coarse; + if (ee->num_ep_coarse && !coarse) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } for (ii = 0; ii < ee->num_ep_coarse; ii++) { coarse[ii].ref_ep_fine_id = bs_read(bits, 18); coarse[ii].pts_ep = bs_read(bits, 14); coarse[ii].spn_ep = bs_read(bits, 32); } - bs_seek_byte(bits, ee->ep_map_stream_start_addr+fine_start); + if (bs_seek_byte(bits, ee->ep_map_stream_start_addr+fine_start) < 0) { + return 0; + } fine = malloc(ee->num_ep_fine * sizeof(CLPI_EP_FINE)); ee->fine = fine; + if (ee->num_ep_fine && !fine) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } for (ii = 0; ii < ee->num_ep_fine; ii++) { fine[ii].is_angle_change_point = bs_read(bits, 1); fine[ii].i_end_position_offset = bs_read(bits, 3); - fine[ii].pts_ep = bs_read(bits, 11); - fine[ii].spn_ep = bs_read(bits, 17); + fine[ii].pts_ep = bs_read(bits, 11); + fine[ii].spn_ep = bs_read(bits, 17); } return 1; } @@ -335,8 +386,12 @@ cpi->num_stream_pid = bs_read(bits, 8); CLPI_EP_MAP_ENTRY *entry; - entry = malloc(cpi->num_stream_pid * sizeof(CLPI_EP_MAP_ENTRY)); + entry = calloc(cpi->num_stream_pid, sizeof(CLPI_EP_MAP_ENTRY)); cpi->entry = entry; + if (cpi->num_stream_pid && !entry) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } for (ii = 0; ii < cpi->num_stream_pid; ii++) { entry[ii].pid = bs_read(bits, 16); bs_skip(bits, 10); @@ -346,7 +401,9 @@ entry[ii].ep_map_stream_start_addr = bs_read(bits, 32) + ep_map_pos; } for (ii = 0; ii < cpi->num_stream_pid; ii++) { - _parse_ep_map_stream(bits, &cpi->entry[ii]); + if (!_parse_ep_map_stream(bits, &cpi->entry[ii])) { + return 0; + } } return 1; } @@ -354,13 +411,15 @@ static int _parse_cpi_info(BITSTREAM *bits, CLPI_CL *cl) { - bs_seek_byte(bits, cl->cpi_start_addr); + if (bs_seek_byte(bits, cl->cpi_start_addr) < 0) { + return 0; + } return _parse_cpi(bits, &cl->cpi); } -static uint32_t -_find_stc_spn(const CLPI_CL *cl, uint8_t stc_id) +uint32_t +clpi_find_stc_spn(const CLPI_CL *cl, uint8_t stc_id) { int ii; CLPI_ATC_SEQ *atc; @@ -401,7 +460,7 @@ // Use sequence info to find spn_stc_start before doing // PTS search. The spn_stc_start defines the point in // the EP map to start searching. - stc_spn = _find_stc_spn(cl, stc_id); + stc_spn = clpi_find_stc_spn(cl, stc_id); for (ii = 0; ii < entry->num_ep_coarse; ii++) { ref = entry->coarse[ii].ref_ep_fine_id; if (entry->coarse[ii].spn_ep >= stc_spn) { @@ -577,8 +636,12 @@ bs_skip(bits, 32); // length es->num_point = bs_read(bits, 32); - es->point = malloc(es->num_point * sizeof(uint32_t)); - + es->point = calloc(es->num_point, sizeof(uint32_t)); + if (es->num_point && !es->point) { + es->num_point = 0; + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } for (ii = 0; ii < es->num_point; ii++) { es->point[ii] = bs_read(bits, 32); } @@ -622,12 +685,12 @@ { int ii; - for (ii = 0; ii < p->num_prog; ii++) { - if (p->progs[ii].streams != NULL) { + if (p && p->progs) { + for (ii = 0; ii < p->num_prog; ii++) { X_FREE(p->progs[ii].streams); } + X_FREE(p->progs); } - X_FREE(p->progs); } static void @@ -635,34 +698,28 @@ { int ii; - for (ii = 0; ii < cpi->num_stream_pid; ii++) { - if (cpi->entry[ii].coarse != NULL) { + if (cpi && cpi->entry) { + for (ii = 0; ii < cpi->num_stream_pid; ii++) { X_FREE(cpi->entry[ii].coarse); - } - if (cpi->entry[ii].fine != NULL) { X_FREE(cpi->entry[ii].fine); } + X_FREE(cpi->entry); } - X_FREE(cpi->entry); } -void -clpi_free(CLPI_CL *cl) +static void +_clpi_free(CLPI_CL *cl) { int ii; - if (cl == NULL) { - return; - } - if (cl->clip.atc_delta != NULL) { - X_FREE(cl->clip.atc_delta); - } - for (ii = 0; ii < cl->sequence.num_atc_seq; ii++) { - if (cl->sequence.atc_seq[ii].stc_seq != NULL) { + X_FREE(cl->clip.atc_delta); + X_FREE(cl->clip.font_info.font); + + if (cl->sequence.atc_seq) { + for (ii = 0; ii < cl->sequence.num_atc_seq; ii++) { X_FREE(cl->sequence.atc_seq[ii].stc_seq); } - } - if (cl->sequence.atc_seq != NULL) { + X_FREE(cl->sequence.atc_seq); } @@ -674,26 +731,37 @@ _clean_program(&cl->program_ss); _clean_cpi(&cl->cpi_ss); - X_FREE(cl->font_info.font); - X_FREE(cl); } +void +clpi_free(CLPI_CL **cl) +{ + if (*cl) { + _clpi_free(*cl); + *cl = NULL; + } +} + static CLPI_CL* _clpi_parse(BD_FILE_H *fp) { BITSTREAM bits; CLPI_CL *cl; + if (bs_init(&bits, fp) < 0) { + BD_DEBUG(DBG_NAV, "?????.clpi: read error\n"); + return NULL; + } + cl = calloc(1, sizeof(CLPI_CL)); if (cl == NULL) { BD_DEBUG(DBG_CRIT, "out of memory\n"); return NULL; } - bs_init(&bits, fp); if (!_parse_header(&bits, cl)) { - clpi_free(cl); + _clpi_free(cl); return NULL; } @@ -705,19 +773,19 @@ } if (!_parse_clipinfo(&bits, cl)) { - clpi_free(cl); + _clpi_free(cl); return NULL; } if (!_parse_sequence(&bits, cl)) { - clpi_free(cl); + _clpi_free(cl); return NULL; } if (!_parse_program_info(&bits, cl)) { - clpi_free(cl); + _clpi_free(cl); return NULL; } if (!_parse_cpi_info(&bits, cl)) { - clpi_free(cl); + _clpi_free(cl); return NULL; } @@ -780,6 +848,9 @@ if (src_cl) { dest_cl = (CLPI_CL*) calloc(1, sizeof(CLPI_CL)); + if (!dest_cl) { + goto fail; + } dest_cl->clip.clip_stream_type = src_cl->clip.clip_stream_type; dest_cl->clip.application_type = src_cl->clip.application_type; dest_cl->clip.is_atc_delta = src_cl->clip.is_atc_delta; @@ -789,6 +860,9 @@ dest_cl->clip.ts_type_info.validity = src_cl->clip.ts_type_info.validity; memcpy(dest_cl->clip.ts_type_info.format_id, src_cl->clip.ts_type_info.format_id, 5); dest_cl->clip.atc_delta = malloc(src_cl->clip.atc_delta_count * sizeof(CLPI_ATC_DELTA)); + if (src_cl->clip.atc_delta_count && !dest_cl->clip.atc_delta) { + goto fail; + } for (ii = 0; ii < src_cl->clip.atc_delta_count; ii++) { dest_cl->clip.atc_delta[ii].delta = src_cl->clip.atc_delta[ii].delta; memcpy(dest_cl->clip.atc_delta[ii].file_id, src_cl->clip.atc_delta[ii].file_id, 6); @@ -796,12 +870,18 @@ } dest_cl->sequence.num_atc_seq = src_cl->sequence.num_atc_seq; - dest_cl->sequence.atc_seq = malloc(src_cl->sequence.num_atc_seq * sizeof(CLPI_ATC_SEQ)); + dest_cl->sequence.atc_seq = calloc(src_cl->sequence.num_atc_seq, sizeof(CLPI_ATC_SEQ)); + if (dest_cl->sequence.num_atc_seq && !dest_cl->sequence.atc_seq) { + goto fail; + } for (ii = 0; ii < src_cl->sequence.num_atc_seq; ii++) { dest_cl->sequence.atc_seq[ii].spn_atc_start = src_cl->sequence.atc_seq[ii].spn_atc_start; dest_cl->sequence.atc_seq[ii].offset_stc_id = src_cl->sequence.atc_seq[ii].offset_stc_id; dest_cl->sequence.atc_seq[ii].num_stc_seq = src_cl->sequence.atc_seq[ii].num_stc_seq; dest_cl->sequence.atc_seq[ii].stc_seq = malloc(src_cl->sequence.atc_seq[ii].num_stc_seq * sizeof(CLPI_STC_SEQ)); + if (dest_cl->sequence.atc_seq[ii].num_stc_seq && !dest_cl->sequence.atc_seq[ii].stc_seq) { + goto fail; + } for (jj = 0; jj < src_cl->sequence.atc_seq[ii].num_stc_seq; jj++) { dest_cl->sequence.atc_seq[ii].stc_seq[jj].spn_stc_start = src_cl->sequence.atc_seq[ii].stc_seq[jj].spn_stc_start; dest_cl->sequence.atc_seq[ii].stc_seq[jj].pcr_pid = src_cl->sequence.atc_seq[ii].stc_seq[jj].pcr_pid; @@ -811,13 +891,19 @@ } dest_cl->program.num_prog = src_cl->program.num_prog; - dest_cl->program.progs = malloc(src_cl->program.num_prog * sizeof(CLPI_PROG)); + dest_cl->program.progs = calloc(src_cl->program.num_prog, sizeof(CLPI_PROG)); + if (dest_cl->program.num_prog && !dest_cl->program.progs) { + goto fail; + } for (ii = 0; ii < src_cl->program.num_prog; ii++) { dest_cl->program.progs[ii].spn_program_sequence_start = src_cl->program.progs[ii].spn_program_sequence_start; dest_cl->program.progs[ii].program_map_pid = src_cl->program.progs[ii].program_map_pid; dest_cl->program.progs[ii].num_streams = src_cl->program.progs[ii].num_streams; dest_cl->program.progs[ii].num_groups = src_cl->program.progs[ii].num_groups; dest_cl->program.progs[ii].streams = malloc(src_cl->program.progs[ii].num_streams * sizeof(CLPI_PROG_STREAM)); + if (src_cl->program.progs[ii].num_streams && !dest_cl->program.progs[ii].streams) { + goto fail; + } for (jj = 0; jj < src_cl->program.progs[ii].num_streams; jj++) { dest_cl->program.progs[ii].streams[jj].coding_type = src_cl->program.progs[ii].streams[jj].coding_type; dest_cl->program.progs[ii].streams[jj].pid = src_cl->program.progs[ii].streams[jj].pid; @@ -831,7 +917,10 @@ } dest_cl->cpi.num_stream_pid = src_cl->cpi.num_stream_pid; - dest_cl->cpi.entry = malloc(src_cl->cpi.num_stream_pid * sizeof(CLPI_EP_MAP_ENTRY)); + dest_cl->cpi.entry = calloc(src_cl->cpi.num_stream_pid, sizeof(CLPI_EP_MAP_ENTRY)); + if (dest_cl->cpi.num_stream_pid && !dest_cl->cpi.entry) { + goto fail; + } for (ii = 0; ii < dest_cl->cpi.num_stream_pid; ii++) { dest_cl->cpi.entry[ii].pid = src_cl->cpi.entry[ii].pid; dest_cl->cpi.entry[ii].ep_stream_type = src_cl->cpi.entry[ii].ep_stream_type; @@ -839,12 +928,18 @@ dest_cl->cpi.entry[ii].num_ep_fine = src_cl->cpi.entry[ii].num_ep_fine; dest_cl->cpi.entry[ii].ep_map_stream_start_addr = src_cl->cpi.entry[ii].ep_map_stream_start_addr; dest_cl->cpi.entry[ii].coarse = malloc(src_cl->cpi.entry[ii].num_ep_coarse * sizeof(CLPI_EP_COARSE)); + if (dest_cl->cpi.entry[ii].num_ep_coarse && !dest_cl->cpi.entry[ii].coarse) { + goto fail; + } for (jj = 0; jj < src_cl->cpi.entry[ii].num_ep_coarse; jj++) { dest_cl->cpi.entry[ii].coarse[jj].ref_ep_fine_id = src_cl->cpi.entry[ii].coarse[jj].ref_ep_fine_id; dest_cl->cpi.entry[ii].coarse[jj].pts_ep = src_cl->cpi.entry[ii].coarse[jj].pts_ep; dest_cl->cpi.entry[ii].coarse[jj].spn_ep = src_cl->cpi.entry[ii].coarse[jj].spn_ep; } dest_cl->cpi.entry[ii].fine = malloc(src_cl->cpi.entry[ii].num_ep_fine * sizeof(CLPI_EP_FINE)); + if (dest_cl->cpi.entry[ii].num_ep_fine && !dest_cl->cpi.entry[ii].fine) { + goto fail; + } for (jj = 0; jj < src_cl->cpi.entry[ii].num_ep_fine; jj++) { dest_cl->cpi.entry[ii].fine[jj].is_angle_change_point = src_cl->cpi.entry[ii].fine[jj].is_angle_change_point; dest_cl->cpi.entry[ii].fine[jj].i_end_position_offset = src_cl->cpi.entry[ii].fine[jj].i_end_position_offset; @@ -853,12 +948,20 @@ } } - dest_cl->font_info.font_count = src_cl->font_info.font_count; - if (dest_cl->font_info.font_count) { - dest_cl->font_info.font = malloc(dest_cl->font_info.font_count * sizeof(CLPI_FONT)); - memcpy(dest_cl->font_info.font, src_cl->font_info.font, dest_cl->font_info.font_count * sizeof(CLPI_FONT)); + dest_cl->clip.font_info.font_count = src_cl->clip.font_info.font_count; + if (dest_cl->clip.font_info.font_count) { + dest_cl->clip.font_info.font = malloc(dest_cl->clip.font_info.font_count * sizeof(CLPI_FONT)); + if (!dest_cl->clip.font_info.font) { + goto fail; + } + memcpy(dest_cl->clip.font_info.font, src_cl->clip.font_info.font, dest_cl->clip.font_info.font_count * sizeof(CLPI_FONT)); } } return dest_cl; + + fail: + BD_DEBUG(DBG_CRIT, "out of memory\n"); + clpi_free(&dest_cl); + return NULL; } diff -Nru libbluray-0.8.1/src/libbluray/bdnav/clpi_parse.h libbluray-1.0.1/src/libbluray/bdnav/clpi_parse.h --- libbluray-0.8.1/src/libbluray/bdnav/clpi_parse.h 2015-02-12 09:56:04.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/clpi_parse.h 2017-06-23 13:34:45.000000000 +0000 @@ -27,11 +27,12 @@ struct bd_disc; +BD_PRIVATE uint32_t clpi_find_stc_spn(const CLPI_CL *cl, uint8_t stc_id); BD_PRIVATE uint32_t clpi_lookup_spn(const CLPI_CL *cl, uint32_t timestamp, int before, uint8_t stc_id); BD_PRIVATE uint32_t clpi_access_point(const CLPI_CL *cl, uint32_t pkt, int next, int angle_change, uint32_t *time); BD_PRIVATE CLPI_CL* clpi_parse(const char *path) BD_ATTR_MALLOC; BD_PRIVATE CLPI_CL* clpi_get(struct bd_disc *disc, const char *file); BD_PRIVATE CLPI_CL* clpi_copy(const CLPI_CL* src_cl); -BD_PRIVATE void clpi_free(CLPI_CL *cl); +BD_PRIVATE void clpi_free(CLPI_CL **cl); #endif // _CLPI_PARSE_H_ diff -Nru libbluray-0.8.1/src/libbluray/bdnav/extdata_parse.c libbluray-1.0.1/src/libbluray/bdnav/extdata_parse.c --- libbluray-0.8.1/src/libbluray/bdnav/extdata_parse.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/extdata_parse.c 2017-06-23 13:34:45.000000000 +0000 @@ -37,7 +37,9 @@ if (start_address < 1) return 0; if (start_address > bits->end - 12) return 0; - bs_seek_byte(bits, start_address); + if (bs_seek_byte(bits, start_address) < 0) { + return 0; + } length = bs_read(bits, 32); /* length of extension data block */ if (length < 1) return 0; @@ -57,11 +59,13 @@ if (ext_start + start_address + ext_len > bits->end) return 0; - bs_seek_byte(bits, start_address + ext_start); - - (handler)(bits, id1, id2, handle); - - bs_seek_byte(bits, saved_pos); + if (bs_seek_byte(bits, start_address + ext_start) >= 0) { + (handler)(bits, id1, id2, handle); + } + + if (bs_seek_byte(bits, saved_pos) < 0) { + return 0; + } } return 1; diff -Nru libbluray-0.8.1/src/libbluray/bdnav/index_parse.c libbluray-1.0.1/src/libbluray/bdnav/index_parse.c --- libbluray-0.8.1/src/libbluray/bdnav/index_parse.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/index_parse.c 2017-06-23 13:34:45.000000000 +0000 @@ -103,8 +103,16 @@ } index->num_titles = bs_read(bs, 16); + if (!index->num_titles) { + BD_DEBUG(DBG_CRIT, "empty index\n"); + return 0; + } index->titles = calloc(index->num_titles, sizeof(INDX_TITLE)); + if (!index->titles) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } for (i = 0; i < index->num_titles; i++) { @@ -136,7 +144,9 @@ { uint32_t len; - bs_seek_byte(bs, 40); + if (bs_seek_byte(bs, 40) < 0) { + return 0; + } len = bs_read(bs, 32); @@ -165,7 +175,9 @@ { uint32_t sig1, sig2; - bs_seek_byte(bs, 0); + if (bs_seek_byte(bs, 0) < 0) { + return 0; + } sig1 = bs_read(bs, 32); sig2 = bs_read(bs, 32); @@ -186,16 +198,20 @@ static INDX_ROOT *_indx_parse(BD_FILE_H *fp) { BITSTREAM bs; - INDX_ROOT *index = calloc(1, sizeof(INDX_ROOT)); + INDX_ROOT *index; int indexes_start, extension_data_start; + if (bs_init(&bs, fp) < 0) { + BD_DEBUG(DBG_NAV, "index.bdmv: read error\n"); + return NULL; + } + + index = calloc(1, sizeof(INDX_ROOT)); if (!index) { BD_DEBUG(DBG_CRIT, "out of memory\n"); return NULL; } - bs_init(&bs, fp); - if (!_parse_header(&bs, &indexes_start, &extension_data_start) || !_parse_app_info(&bs, &index->app_info)) { @@ -203,7 +219,11 @@ return NULL; } - bs_seek_byte(&bs, indexes_start); + if (bs_seek_byte(&bs, indexes_start) < 0) { + indx_free(&index); + return NULL; + } + if (!_parse_index(&bs, index)) { indx_free(&index); return NULL; diff -Nru libbluray-0.8.1/src/libbluray/bdnav/meta_parse.c libbluray-1.0.1/src/libbluray/bdnav/meta_parse.c --- libbluray-0.8.1/src/libbluray/bdnav/meta_parse.c 2015-02-18 09:08:30.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/meta_parse.c 2017-06-23 13:34:45.000000000 +0000 @@ -81,29 +81,35 @@ } else if (xmlStrEqual(cur_node->parent->name, BAD_CAST_CONST "tableOfContents")) { if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "titleName") && (tmp = xmlGetProp(cur_node, BAD_CAST_CONST "titleNumber"))) { - int i = disclib->toc_count; - disclib->toc_count++; - disclib->toc_entries = realloc(disclib->toc_entries, (disclib->toc_count*sizeof(META_TITLE))); - disclib->toc_entries[i].title_number = atoi((const char*)tmp); - disclib->toc_entries[i].title_name = (char*)xmlNodeGetContent(cur_node); + META_TITLE *new_entries = realloc(disclib->toc_entries, ((disclib->toc_count + 1)*sizeof(META_TITLE))); + if (new_entries) { + int i = disclib->toc_count; + disclib->toc_count++; + disclib->toc_entries = new_entries; + disclib->toc_entries[i].title_number = atoi((const char*)tmp); + disclib->toc_entries[i].title_name = (char*)xmlNodeGetContent(cur_node); + } XML_FREE(tmp); } } else if (xmlStrEqual(cur_node->parent->name, BAD_CAST_CONST "description")) { if (xmlStrEqual(cur_node->name, BAD_CAST_CONST "thumbnail") && (tmp = xmlGetProp(cur_node, BAD_CAST_CONST "href"))) { - uint8_t i = disclib->thumb_count; - disclib->thumb_count++; - disclib->thumbnails = realloc(disclib->thumbnails, (disclib->thumb_count*sizeof(META_THUMBNAIL))); - disclib->thumbnails[i].path = (char *)tmp; - if ((tmp = xmlGetProp(cur_node, BAD_CAST_CONST "size"))) { - int x = 0, y = 0; - sscanf((const char*)tmp, "%ix%i", &x, &y); - disclib->thumbnails[i].xres = x; - disclib->thumbnails[i].yres = y; - XML_FREE(tmp); - } - else { - disclib->thumbnails[i].xres = disclib->thumbnails[i].yres = -1; + META_THUMBNAIL *new_thumbnails = realloc(disclib->thumbnails, ((disclib->thumb_count + 1)*sizeof(META_THUMBNAIL))); + if (new_thumbnails) { + uint8_t i = disclib->thumb_count; + disclib->thumb_count++; + disclib->thumbnails = new_thumbnails; + disclib->thumbnails[i].path = (char *)tmp; + if ((tmp = xmlGetProp(cur_node, BAD_CAST_CONST "size"))) { + int x = 0, y = 0; + sscanf((const char*)tmp, "%ix%i", &x, &y); + disclib->thumbnails[i].xres = x; + disclib->thumbnails[i].yres = y; + XML_FREE(tmp); + } + else { + disclib->thumbnails[i].xres = disclib->thumbnails[i].yres = -1; + } } } } @@ -126,15 +132,18 @@ if (ent.d_name[0] == '.') continue; else if (strncasecmp(ent.d_name, "bdmt_", 5) == 0) { - uint8_t i = meta->dl_count; - meta->dl_count++; - meta->dl_entries = realloc(meta->dl_entries, (meta->dl_count*sizeof(META_DL))); - memset(&meta->dl_entries[i], 0, sizeof(meta->dl_entries[i])); + META_DL *new_dl_entries = realloc(meta->dl_entries, ((meta->dl_count + 1)*sizeof(META_DL))); + if (new_dl_entries) { + uint8_t i = meta->dl_count; + meta->dl_count++; + meta->dl_entries = new_dl_entries; + memset(&meta->dl_entries[i], 0, sizeof(meta->dl_entries[i])); - meta->dl_entries[i].filename = str_dup(ent.d_name); - strncpy(meta->dl_entries[i].language_code, ent.d_name+5,3); - meta->dl_entries[i].language_code[3] = '\0'; - str_tolower(meta->dl_entries[i].language_code); + meta->dl_entries[i].filename = str_dup(ent.d_name); + strncpy(meta->dl_entries[i].language_code, ent.d_name+5,3); + meta->dl_entries[i].language_code[3] = '\0'; + str_tolower(meta->dl_entries[i].language_code); + } } } dir_close(dir); @@ -145,6 +154,10 @@ { #ifdef HAVE_LIBXML2 META_ROOT *root = calloc(1, sizeof(META_ROOT)); + if (!root) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return NULL; + } root->dl_count = 0; xmlDocPtr doc; @@ -172,7 +185,7 @@ root->dl_entries[i].toc_entries = NULL; root->dl_entries[i].thumbnails = NULL; _parseManifestNode(root_element, &root->dl_entries[i]); - XML_FREE(doc); + xmlFreeDoc(doc); } X_FREE(data); } diff -Nru libbluray-0.8.1/src/libbluray/bdnav/mpls_data.h libbluray-1.0.1/src/libbluray/bdnav/mpls_data.h --- libbluray-0.8.1/src/libbluray/bdnav/mpls_data.h 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/mpls_data.h 2017-06-23 13:34:45.000000000 +0000 @@ -0,0 +1,200 @@ +/* + * This file is part of libbluray + * Copyright (C) 2009-2010 John Stebbins + * Copyright (C) 2012-2016 Petri Hintukainen <phintuka@users.sourceforge.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#if !defined(BLURAY_MPLS_DATA_H_) +#define BLURAY_MPLS_DATA_H_ + +#include "uo_mask_table.h" + +#include <stdint.h> + +#define BD_MARK_ENTRY 0x01 +#define BD_MARK_LINK 0x02 + +typedef struct +{ + uint8_t stream_type; + uint8_t coding_type; + uint16_t pid; + uint8_t subpath_id; + uint8_t subclip_id; + uint8_t format; + uint8_t rate; + uint8_t char_code; + char lang[4]; + // Secondary audio specific fields + uint8_t sa_num_primary_audio_ref; + uint8_t *sa_primary_audio_ref; + // Secondary video specific fields + uint8_t sv_num_secondary_audio_ref; + uint8_t sv_num_pip_pg_ref; + uint8_t *sv_secondary_audio_ref; + uint8_t *sv_pip_pg_ref; +} MPLS_STREAM; + +typedef struct +{ + uint8_t num_video; + uint8_t num_audio; + uint8_t num_pg; + uint8_t num_ig; + uint8_t num_secondary_audio; + uint8_t num_secondary_video; + uint8_t num_pip_pg; + MPLS_STREAM *video; + MPLS_STREAM *audio; + MPLS_STREAM *pg; + MPLS_STREAM *ig; + MPLS_STREAM *secondary_audio; + MPLS_STREAM *secondary_video; +} MPLS_STN; + +typedef struct +{ + char clip_id[6]; + char codec_id[5]; + uint8_t stc_id; +} MPLS_CLIP; + +typedef struct +{ + uint8_t is_multi_angle; + uint8_t connection_condition; + uint32_t in_time; + uint32_t out_time; + BD_UO_MASK uo_mask; + uint8_t random_access_flag; + uint8_t still_mode; + uint16_t still_time; + uint8_t angle_count; + uint8_t is_different_audio; + uint8_t is_seamless_angle; + MPLS_CLIP *clip; + MPLS_STN stn; +} MPLS_PI; + +typedef struct +{ + uint8_t mark_type; + uint16_t play_item_ref; + uint32_t time; + uint16_t entry_es_pid; + uint32_t duration; +} MPLS_PLM; + +typedef struct +{ + uint8_t playback_type; + uint16_t playback_count; + BD_UO_MASK uo_mask; + uint8_t random_access_flag; + uint8_t audio_mix_flag; + uint8_t lossless_bypass_flag; +} MPLS_AI; + +typedef struct +{ + uint8_t connection_condition; + uint8_t is_multi_clip; + uint32_t in_time; + uint32_t out_time; + uint16_t sync_play_item_id; + uint32_t sync_pts; + uint8_t clip_count; + MPLS_CLIP *clip; +} MPLS_SUB_PI; + +typedef enum { + //mpls_sub_path_ = 2, /* Primary audio of the Browsable slideshow */ + mpls_sub_path_ig_menu = 3, /* Interactive Graphics presentation menu */ + mpls_sub_path_textst = 4, /* Text Subtitle */ + //mpls_sub_path_ = 5, /* Out-of-mux Synchronous elementary streams */ + mpls_sub_path_async_pip = 6, /* Out-of-mux Asynchronous Picture-in-Picture presentation */ + mpls_sub_path_sync_pip = 7, /* In-mux Synchronous Picture-in-Picture presentation */ + mpls_sub_path_ss_viseo = 8, /* SS Video */ +} mpls_sub_path_type; + +typedef struct +{ + uint8_t type; /* enum mpls_sub_path_type */ + uint8_t is_repeat; + uint8_t sub_playitem_count; + MPLS_SUB_PI *sub_play_item; +} MPLS_SUB; + +typedef enum { + pip_scaling_none = 1, /* unscaled */ + pip_scaling_half = 2, /* 1:2 */ + pip_scaling_quarter = 3, /* 1:4 */ + pip_scaling_one_half = 4, /* 3:2 */ + pip_scaling_fullscreen = 5, /* scale to main video size */ +} mpls_pip_scaling; + +typedef struct { + uint32_t time; /* start timestamp (clip time) when the block is valid */ + uint16_t xpos; + uint16_t ypos; + uint8_t scale_factor; /* mpls_pip_scaling. Note: PSR14 may override this ! */ +} MPLS_PIP_DATA; + +typedef enum { + pip_timeline_sync_mainpath = 1, /* timeline refers to main path */ + pip_timeline_async_subpath = 2, /* timeline refers to sub-path time */ + pip_timeline_async_mainpath = 3, /* timeline refers to main path */ +} mpls_pip_timeline; + +typedef struct { + uint16_t clip_ref; /* clip id for secondary_video_ref (STN) */ + uint8_t secondary_video_ref; /* secondary video stream id (STN) */ + uint8_t timeline_type; /* mpls_pip_timeline */ + uint8_t luma_key_flag; /* use luma keying */ + uint8_t upper_limit_luma_key; /* luma key (secondary video pixels with Y <= this value are transparent) */ + uint8_t trick_play_flag; /* show synchronous PiP when playing trick speed */ + + uint16_t data_count; + MPLS_PIP_DATA *data; +} MPLS_PIP_METADATA; + +typedef struct mpls_pl +{ + uint32_t type_indicator; + uint32_t type_indicator2; + uint32_t list_pos; + uint32_t mark_pos; + uint32_t ext_pos; + MPLS_AI app_info; + uint16_t list_count; + uint16_t sub_count; + uint16_t mark_count; + MPLS_PI *play_item; + MPLS_SUB *sub_path; + MPLS_PLM *play_mark; + + // extension data (profile 5, version 2.4) + uint16_t ext_sub_count; + MPLS_SUB *ext_sub_path; // sub path entries extension + + // extension data (Picture-In-Picture metadata) + uint16_t ext_pip_data_count; + MPLS_PIP_METADATA *ext_pip_data; // pip metadata extension + +} MPLS_PL; + +#endif // BLURAY_MPLS_DATA_H_ diff -Nru libbluray-0.8.1/src/libbluray/bdnav/mpls_parse.c libbluray-1.0.1/src/libbluray/bdnav/mpls_parse.c --- libbluray-0.8.1/src/libbluray/bdnav/mpls_parse.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/mpls_parse.c 2017-06-23 13:34:45.000000000 +0000 @@ -25,6 +25,7 @@ #include "mpls_parse.h" #include "extdata_parse.h" +#include "uo_mask.h" #include "disc/disc.h" @@ -54,69 +55,23 @@ sig[8] = 0; } -int -mpls_parse_uo(uint8_t *buf, BD_UO_MASK *uo) -{ - BITBUFFER bb; - bb_init(&bb, buf, 8); - - memset(uo, 0, sizeof(BD_UO_MASK)); - - uo->menu_call = bb_read(&bb, 1); - uo->title_search = bb_read(&bb, 1); - uo->chapter_search = bb_read(&bb, 1); - uo->time_search = bb_read(&bb, 1); - uo->skip_to_next_point = bb_read(&bb, 1); - uo->skip_to_prev_point = bb_read(&bb, 1); - uo->play_firstplay = bb_read(&bb, 1); - uo->stop = bb_read(&bb, 1); - uo->pause_on = bb_read(&bb, 1); - uo->pause_off = bb_read(&bb, 1); - uo->still_off = bb_read(&bb, 1); - uo->forward = bb_read(&bb, 1); - uo->backward = bb_read(&bb, 1); - uo->resume = bb_read(&bb, 1); - uo->move_up = bb_read(&bb, 1); - uo->move_down = bb_read(&bb, 1); - uo->move_left = bb_read(&bb, 1); - uo->move_right = bb_read(&bb, 1); - uo->select = bb_read(&bb, 1); - uo->activate = bb_read(&bb, 1); - uo->select_and_activate = bb_read(&bb, 1); - uo->primary_audio_change = bb_read(&bb, 1); - bb_skip(&bb, 1); - uo->angle_change = bb_read(&bb, 1); - uo->popup_on = bb_read(&bb, 1); - uo->popup_off = bb_read(&bb, 1); - uo->pg_enable_disable = bb_read(&bb, 1); - uo->pg_change = bb_read(&bb, 1); - uo->secondary_video_enable_disable = bb_read(&bb, 1); - uo->secondary_video_change = bb_read(&bb, 1); - uo->secondary_audio_enable_disable = bb_read(&bb, 1); - uo->secondary_audio_change = bb_read(&bb, 1); - bb_skip(&bb, 1); - uo->pip_pg_change = bb_read(&bb, 1); - bb_skip(&bb, 30); - return 1; -} - static int _parse_uo(BITSTREAM *bits, BD_UO_MASK *uo) { uint8_t buf[8]; bs_read_bytes(bits, buf, 8); - return mpls_parse_uo(buf, uo); + return uo_mask_parse(buf, uo); } static int _parse_appinfo(BITSTREAM *bits, MPLS_AI *ai) { - int64_t pos, len; + int64_t /*pos,*/ len; if (!bs_is_align(bits, 0x07)) { BD_DEBUG(DBG_NAV | DBG_CRIT, "_parse_appinfo: alignment error\n"); } - pos = bs_pos(bits) >> 3; + //pos = bs_pos(bits) >> 3; len = bs_read(bits, 32); if (bs_avail(bits) < len * 8) { @@ -137,9 +92,11 @@ ai->random_access_flag = bs_read(bits, 1); ai->audio_mix_flag = bs_read(bits, 1); ai->lossless_bypass_flag = bs_read(bits, 1); +#if 0 // Reserved bs_skip(bits, 13); bs_seek_byte(bits, pos + len); +#endif return 1; } @@ -212,7 +169,9 @@ break; }; - bs_seek_byte(bits, pos + len); + if (bs_seek_byte(bits, pos + len) < 0) { + return 0; + } len = bs_read(bits, 8); pos = bs_pos(bits) >> 3; @@ -260,7 +219,10 @@ }; s->lang[3] = '\0'; - bs_seek_byte(bits, pos + len); + if (bs_seek_byte(bits, pos + len) < 0) { + return 0; + } + return 1; } @@ -414,7 +376,10 @@ } stn->secondary_video = ss; - bs_seek_byte(bits, pos + len); + if (bs_seek_byte(bits, pos + len) < 0) { + return 0; + } + return 1; } @@ -515,8 +480,12 @@ if (!_parse_stn(bits, &pi->stn)) { return 0; } + // Seek past any unused items - bs_seek_byte(bits, pos + len); + if (bs_seek_byte(bits, pos + len) < 0) { + return 0; + } + return 1; } @@ -592,7 +561,10 @@ // Seek to end of subpath - bs_seek_byte(bits, pos + len); + if (bs_seek_byte(bits, pos + len) < 0) { + return 0; + } + return 1; } @@ -635,7 +607,10 @@ sp->sub_play_item = spi; // Seek to end of subpath - bs_seek_byte(bits, pos + len); + if (bs_seek_byte(bits, pos + len) < 0) { + return 0; + } + return 1; } @@ -657,7 +632,10 @@ int ii; MPLS_PLM *plm = NULL; - bs_seek_byte(bits, pl->mark_pos); + if (bs_seek_byte(bits, pl->mark_pos) < 0) { + return 0; + } + // length field len = bs_read(bits, 32); @@ -670,8 +648,12 @@ pl->mark_count = bs_read(bits, 16); plm = calloc(pl->mark_count, sizeof(MPLS_PLM)); + if (pl->mark_count && !plm) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } for (ii = 0; ii < pl->mark_count; ii++) { - plm[ii].mark_id = bs_read(bits, 8); + bs_skip(bits, 8); /* reserved */ plm[ii].mark_type = bs_read(bits, 8); plm[ii].play_item_ref = bs_read(bits, 16); plm[ii].time = bs_read(bits, 32); @@ -690,7 +672,10 @@ MPLS_PI *pi = NULL; MPLS_SUB *sub_path = NULL; - bs_seek_byte(bits, pl->list_pos); + if (bs_seek_byte(bits, pl->list_pos) < 0) { + return 0; + } + // playlist length len = bs_read(bits, 32); @@ -730,14 +715,16 @@ return 1; } +static void _clean_pip_data(MPLS_PIP_METADATA *p) +{ + X_FREE(p->data); +} + static void _clean_playlist(MPLS_PL *pl) { int ii; - if (pl == NULL) { - return; - } if (pl->play_item != NULL) { for (ii = 0; ii < pl->list_count; ii++) { _clean_playitem(&pl->play_item[ii]); @@ -756,14 +743,24 @@ } X_FREE(pl->ext_sub_path); } + if (pl->ext_pip_data != NULL) { + for (ii = 0; ii < pl->ext_pip_data_count; ii++) { + _clean_pip_data(&pl->ext_pip_data[ii]); + } + X_FREE(pl->ext_pip_data); + } + X_FREE(pl->play_mark); X_FREE(pl); } void -mpls_free(MPLS_PL *pl) +mpls_free(MPLS_PL **pl) { - _clean_playlist(pl); + if (*pl) { + _clean_playlist(*pl); + *pl = NULL; + } } static int @@ -778,6 +775,11 @@ } data = calloc(entries, sizeof(MPLS_PIP_DATA)); + if (!data) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } + for (ii = 0; ii < entries; ii++) { data[ii].time = bs_read(bits, 32); @@ -818,9 +820,13 @@ data_address = bs_read(bits, 32); pos = bs_pos(bits) / 8; - bs_seek_byte(bits, start_address + data_address); + if (bs_seek_byte(bits, start_address + data_address) < 0) { + return 0; + } result = _parse_pip_data(bits, data); - bs_seek_byte(bits, pos); + if (bs_seek_byte(bits, pos) < 0) { + return 0; + } return result; } @@ -840,11 +846,14 @@ } data = calloc(entries, sizeof(MPLS_PIP_METADATA)); + if (!data) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } + for (ii = 0; ii < entries; ii++) { - if (!_parse_pip_metadata_block(bits, start_address, data)) { - X_FREE(data); - BD_DEBUG(DBG_NAV | DBG_CRIT, "error parsing pip metadata extension\n"); - return 0; + if (!_parse_pip_metadata_block(bits, start_address, &data[ii])) { + goto error; } } @@ -852,6 +861,15 @@ pl->ext_pip_data = data; return 1; + + error: + BD_DEBUG(DBG_NAV | DBG_CRIT, "error parsing pip metadata extension\n"); + for (ii = 0; ii < entries; ii++) { + _clean_pip_data(&data[ii]); + } + X_FREE(data); + return 0; + } static int @@ -868,17 +886,28 @@ } sub_path = calloc(sub_count, sizeof(MPLS_SUB)); + if (!sub_path) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } + for (ii = 0; ii < sub_count; ii++) { if (!_parse_subpath(bits, &sub_path[ii])) { - X_FREE(sub_path); - BD_DEBUG(DBG_NAV | DBG_CRIT, "error parsing extension subpath\n"); - return 0; + goto error; } } pl->ext_sub_path = sub_path; pl->ext_sub_count = sub_count; return 1; + + error: + BD_DEBUG(DBG_NAV | DBG_CRIT, "error parsing extension subpath\n"); + for (ii = 0; ii < sub_count; ii++) { + _clean_subpath(&sub_path[ii]); + } + X_FREE(sub_path); + return 0; } static int @@ -914,14 +943,17 @@ BITSTREAM bits; MPLS_PL *pl = NULL; + if (bs_init(&bits, fp) < 0) { + BD_DEBUG(DBG_NAV, "?????.mpls: read error\n"); + return NULL; + } + pl = calloc(1, sizeof(MPLS_PL)); if (pl == NULL) { BD_DEBUG(DBG_CRIT, "out of memory\n"); return NULL; } - bs_init(&bits, fp); - if (!_parse_header(&bits, pl)) { _clean_playlist(pl); return NULL; diff -Nru libbluray-0.8.1/src/libbluray/bdnav/mpls_parse.h libbluray-1.0.1/src/libbluray/bdnav/mpls_parse.h --- libbluray-0.8.1/src/libbluray/bdnav/mpls_parse.h 2015-02-12 09:56:04.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/mpls_parse.h 2017-06-23 13:34:45.000000000 +0000 @@ -1,7 +1,7 @@ /* * This file is part of libbluray * Copyright (C) 2009-2010 John Stebbins - * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net> + * Copyright (C) 2012-2016 Petri Hintukainen <phintuka@users.sourceforge.net> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,168 +21,17 @@ #if !defined(_MPLS_PARSE_H_) #define _MPLS_PARSE_H_ +#include "mpls_data.h" #include "uo_mask_table.h" #include "util/attributes.h" #include <stdint.h> -#define BD_MARK_ENTRY 0x01 -#define BD_MARK_LINK 0x02 - -typedef struct -{ - uint8_t stream_type; - uint8_t coding_type; - uint16_t pid; - uint8_t subpath_id; - uint8_t subclip_id; - uint8_t format; - uint8_t rate; - uint8_t char_code; - char lang[4]; - // Secondary audio specific fields - uint8_t sa_num_primary_audio_ref; - uint8_t *sa_primary_audio_ref; - // Secondary video specific fields - uint8_t sv_num_secondary_audio_ref; - uint8_t sv_num_pip_pg_ref; - uint8_t *sv_secondary_audio_ref; - uint8_t *sv_pip_pg_ref; -} MPLS_STREAM; - -typedef struct -{ - uint8_t num_video; - uint8_t num_audio; - uint8_t num_pg; - uint8_t num_ig; - uint8_t num_secondary_audio; - uint8_t num_secondary_video; - uint8_t num_pip_pg; - MPLS_STREAM *video; - MPLS_STREAM *audio; - MPLS_STREAM *pg; - MPLS_STREAM *ig; - MPLS_STREAM *secondary_audio; - MPLS_STREAM *secondary_video; -} MPLS_STN; - -typedef struct -{ - char clip_id[6]; - char codec_id[5]; - uint8_t stc_id; -} MPLS_CLIP; - -typedef struct -{ - uint8_t is_multi_angle; - uint8_t connection_condition; - uint32_t in_time; - uint32_t out_time; - BD_UO_MASK uo_mask; - uint8_t random_access_flag; - uint8_t still_mode; - uint16_t still_time; - uint8_t angle_count; - uint8_t is_different_audio; - uint8_t is_seamless_angle; - MPLS_CLIP *clip; - MPLS_STN stn; -} MPLS_PI; - -typedef struct -{ - uint8_t mark_id; - uint8_t mark_type; - uint16_t play_item_ref; - uint32_t time; - uint16_t entry_es_pid; - uint32_t duration; -} MPLS_PLM; - -typedef struct -{ - uint8_t playback_type; - uint16_t playback_count; - BD_UO_MASK uo_mask; - uint8_t random_access_flag; - uint8_t audio_mix_flag; - uint8_t lossless_bypass_flag; -} MPLS_AI; - -typedef struct -{ - uint8_t connection_condition; - uint8_t is_multi_clip; - uint32_t in_time; - uint32_t out_time; - uint16_t sync_play_item_id; - uint32_t sync_pts; - uint8_t clip_count; - MPLS_CLIP *clip; -} MPLS_SUB_PI; - -typedef struct -{ - uint8_t type; - uint8_t is_repeat; - uint8_t sub_playitem_count; - MPLS_SUB_PI *sub_play_item; -} MPLS_SUB; - -typedef struct { - uint32_t time; - uint16_t xpos; - uint16_t ypos; - uint8_t scale_factor; -} MPLS_PIP_DATA; - -typedef struct { - uint16_t clip_ref; - uint8_t secondary_video_ref; - uint8_t timeline_type; - uint8_t luma_key_flag; - uint8_t upper_limit_luma_key; - uint8_t trick_play_flag; - - uint16_t data_count; - MPLS_PIP_DATA *data; -} MPLS_PIP_METADATA; - -typedef struct mpls_pl -{ - uint32_t type_indicator; - uint32_t type_indicator2; - uint32_t list_pos; - uint32_t mark_pos; - uint32_t ext_pos; - MPLS_AI app_info; - uint16_t list_count; - uint16_t sub_count; - uint16_t mark_count; - MPLS_PI *play_item; - MPLS_SUB *sub_path; - MPLS_PLM *play_mark; - - // extension data (profile 5, version 2.4) - uint16_t ext_sub_count; - MPLS_SUB *ext_sub_path; // sub path entries extension - - // extension data (Picture-In-Picture metadata) - uint16_t ext_pip_data_count; - MPLS_PIP_METADATA *ext_pip_data; // pip metadata extension - -} MPLS_PL; - - struct bd_disc; BD_PRIVATE MPLS_PL* mpls_parse(const char *path) BD_ATTR_MALLOC; BD_PRIVATE MPLS_PL* mpls_get(struct bd_disc *disc, const char *file); -BD_PRIVATE void mpls_free(MPLS_PL *pl); - -BD_PRIVATE int mpls_parse_uo(uint8_t *buf, BD_UO_MASK *uo); +BD_PRIVATE void mpls_free(MPLS_PL **pl); #endif // _MPLS_PARSE_H_ diff -Nru libbluray-0.8.1/src/libbluray/bdnav/navigation.c libbluray-1.0.1/src/libbluray/bdnav/navigation.c --- libbluray-0.8.1/src/libbluray/bdnav/navigation.c 2015-02-12 09:56:04.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/navigation.c 2017-06-23 13:34:45.000000000 +0000 @@ -1,6 +1,7 @@ /* * This file is part of libbluray * Copyright (C) 2009-2010 John Stebbins + * Copyright (C) 2010-2016 Petri Hintukainen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,6 +26,7 @@ #include "clpi_parse.h" #include "mpls_parse.h" +#include "bdparse.h" #include "disc/disc.h" @@ -36,6 +38,43 @@ #include <stdlib.h> #include <string.h> +/* + * Utils + */ + +static uint32_t +_pl_duration(MPLS_PL *pl) +{ + unsigned ii; + uint32_t duration = 0; + MPLS_PI *pi; + + for (ii = 0; ii < pl->list_count; ii++) { + pi = &pl->play_item[ii]; + duration += pi->out_time - pi->in_time; + } + return duration; +} + +static uint32_t +_pl_chapter_count(MPLS_PL *pl) +{ + unsigned ii, chapters = 0; + + // Count the number of "entry" marks (skipping "link" marks) + // This is the the number of chapters + for (ii = 0; ii < pl->mark_count; ii++) { + if (pl->play_mark[ii].mark_type == BD_MARK_ENTRY) { + chapters++; + } + } + return chapters; +} + +/* + * Check if two playlists are the same + */ + static int _stream_cmp(MPLS_STREAM *a, MPLS_STREAM *b) { if (a->stream_type == b->stream_type && @@ -92,6 +131,19 @@ return 0; } +static int _pm_cmp(MPLS_PLM *pm1, MPLS_PLM *pm2) +{ + if (pm1->mark_type == pm2->mark_type && + pm1->play_item_ref == pm2->play_item_ref && + pm1->time == pm2->time && + pm1->entry_es_pid == pm2->entry_es_pid && + pm1->duration == pm2->duration ) { + return 0; + } + + return 1; +} + static int _pl_cmp(MPLS_PL *pl1, MPLS_PL *pl2) { unsigned ii; @@ -102,6 +154,18 @@ if (pl1->mark_count != pl2->mark_count) { return 1; } + if (pl1->sub_count != pl2->sub_count) { + return 1; + } + if (pl1->ext_sub_count != pl2->ext_sub_count) { + return 1; + } + + for (ii = 0; ii < pl1->mark_count; ii++) { + if (_pm_cmp(&pl1->play_mark[ii], &pl2->play_mark[ii])) { + return 1; + } + } for (ii = 0; ii < pl1->list_count; ii++) { if (_pi_cmp(&pl1->play_item[ii], &pl2->play_item[ii])) { return 1; @@ -111,6 +175,10 @@ return 0; } +/* + * Playlist filtering + */ + /* return 0 if duplicate playlist */ static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl) { @@ -154,26 +222,139 @@ pi = &pl->play_item[ii]; // Ignore titles with repeated segments if (_find_repeats(pl, pi->clip[0].clip_id, pi->in_time, pi->out_time) > repeats) { - return 0; + return 0; } } return 1; } -static uint32_t -_pl_duration(MPLS_PL *pl) +/* + * find main movie playlist + */ + +#define DBG_MAIN_PL DBG_NAV + +static void _video_props(MPLS_STN *s, int *full_hd, int *mpeg12) { unsigned ii; - uint32_t duration = 0; - MPLS_PI *pi; + *mpeg12 = 1; + *full_hd = 0; + for (ii = 0; ii < s->num_video; ii++) { + if (s->video[ii].coding_type > 4) { + *mpeg12 = 0; + } + if (s->video[ii].format == BD_VIDEO_FORMAT_1080I || s->video[ii].format == BD_VIDEO_FORMAT_1080P) { + *full_hd = 1; + } + } +} - for (ii = 0; ii < pl->list_count; ii++) { - pi = &pl->play_item[ii]; - duration += pi->out_time - pi->in_time; +static void _audio_props(MPLS_STN *s, int *hd_audio) +{ + unsigned ii; + *hd_audio = 0; + for (ii = 0; ii < s->num_audio; ii++) { + if (s->audio[ii].format == BD_STREAM_TYPE_AUDIO_LPCM || s->audio[ii].format >= BD_STREAM_TYPE_AUDIO_TRUHD) { + *hd_audio = 1; + } } - return duration; } +static int _cmp_video_props(const MPLS_PL *p1, const MPLS_PL *p2) +{ + MPLS_STN *s1 = &p1->play_item[0].stn; + MPLS_STN *s2 = &p2->play_item[0].stn; + int fhd1, fhd2, mp12_1, mp12_2; + + _video_props(s1, &fhd1, &mp12_1); + _video_props(s2, &fhd2, &mp12_2); + + /* prefer Full HD over HD/SD */ + if (fhd1 != fhd2) + return fhd2 - fhd1; + + /* prefer H.264/VC1 over MPEG1/2 */ + return mp12_2 - mp12_1; +} + +static int _cmp_audio_props(const MPLS_PL *p1, const MPLS_PL *p2) +{ + MPLS_STN *s1 = &p1->play_item[0].stn; + MPLS_STN *s2 = &p2->play_item[0].stn; + int hda1, hda2; + + _audio_props(s1, &hda1); + _audio_props(s2, &hda2); + + /* prefer HD audio formats */ + return hda2 - hda1; +} + +static int _pl_guess_main_title(MPLS_PL *p1, MPLS_PL *p2, + const char *mpls_id1, const char *mpls_id2, + const char *known_mpls_ids) +{ + uint32_t d1 = _pl_duration(p1); + uint32_t d2 = _pl_duration(p2); + + /* if both longer than 30 min */ + if (d1 > 30*60*45000 && d2 > 30*60*45000) { + + /* prefer many chapters over no chapters */ + int chap1 = _pl_chapter_count(p1); + int chap2 = _pl_chapter_count(p2); + int chap_diff = chap2 - chap1; + if ((chap1 < 2 || chap2 < 2) && (chap_diff < -5 || chap_diff > 5)) { + /* chapter count differs by more than 5 */ + BD_DEBUG(DBG_MAIN_PL, "main title (%s,%s): chapter count difference %d\n", + mpls_id1, mpls_id2, chap_diff); + return chap_diff; + } + + /* Check video: prefer HD over SD, H.264/VC1 over MPEG1/2 */ + int vid_diff = _cmp_video_props(p1, p2); + if (vid_diff) { + BD_DEBUG(DBG_MAIN_PL, "main title (%s,%s): video properties difference %d\n", + mpls_id1, mpls_id2, vid_diff); + return vid_diff; + } + + /* compare audio: prefer HD audio */ + int aud_diff = _cmp_audio_props(p1, p2); + if (aud_diff) { + BD_DEBUG(DBG_MAIN_PL, "main title (%s,%s): audio properties difference %d\n", + mpls_id1, mpls_id2, aud_diff); + return aud_diff; + } + + /* prefer "known good" playlists */ + if (known_mpls_ids) { + int known1 = !!str_strcasestr(known_mpls_ids, mpls_id1); + int known2 = !!str_strcasestr(known_mpls_ids, mpls_id2); + int known_diff = known2 - known1; + if (known_diff) { + BD_DEBUG(DBG_MAIN_PL, "main title (%s,%s): prefer \"known\" playlist %s\n", + mpls_id1, mpls_id2, known_diff < 0 ? mpls_id1 : mpls_id2); + return known_diff; + } + } + } + + /* compare playlist duration, select longer playlist */ + if (d1 < d2) { + return 1; + } + if (d1 > d2) { + return -1; + } + + return 0; +} + +/* + * title list + */ + NAV_TITLE_LIST* nav_get_title_list(BD_DISC *disc, uint32_t flags, uint32_t min_title_length) { BD_DIR_H *dir; @@ -182,8 +363,9 @@ MPLS_PL *pl = NULL; unsigned int ii, pl_list_size = 0; int res; - NAV_TITLE_LIST *title_list; + NAV_TITLE_LIST *title_list = NULL; unsigned int title_info_alloc = 100; + char *known_mpls_ids; dir = disc_open_dir(disc, "BDMV" DIR_SEP "PLAYLIST"); if (dir == NULL) { @@ -191,7 +373,21 @@ } title_list = calloc(1, sizeof(NAV_TITLE_LIST)); + if (!title_list) { + dir_close(dir); + return NULL; + } title_list->title_info = calloc(title_info_alloc, sizeof(NAV_TITLE_INFO)); + if (!title_list->title_info) { + X_FREE(title_list); + dir_close(dir); + return NULL; + } + + known_mpls_ids = disc_property_get(disc, DISC_PROPERTY_MAIN_FEATURE); + if (!known_mpls_ids) { + known_mpls_ids = disc_property_get(disc, DISC_PROPERTY_PLAYLISTS); + } ii = 0; for (res = dir_read(dir, &ent); !res; res = dir_read(dir, &ent)) { @@ -213,16 +409,16 @@ if (pl != NULL) { if ((flags & TITLES_FILTER_DUP_TITLE) && !_filter_dup(pl_list, ii, pl)) { - mpls_free(pl); + mpls_free(&pl); continue; } if ((flags & TITLES_FILTER_DUP_CLIP) && !_filter_repeats(pl, 2)) { - mpls_free(pl); + mpls_free(&pl); continue; } if (min_title_length > 0 && _pl_duration(pl) < min_title_length*45000) { - mpls_free(pl); + mpls_free(&pl); continue; } if (ii >= title_info_alloc) { @@ -241,7 +437,11 @@ /* main title guessing */ if (_filter_dup(pl_list, ii, pl) && _filter_repeats(pl, 2)) { - if (_pl_duration(pl_list[ii]) >= _pl_duration(pl_list[title_list->main_title_idx])) { + + if (_pl_guess_main_title(pl_list[ii], pl_list[title_list->main_title_idx], + ent.d_name, + title_list->title_info[title_list->main_title_idx].name, + known_mpls_ids) <= 0) { title_list->main_title_idx = ii; } } @@ -258,18 +458,25 @@ title_list->count = ii; for (ii = 0; ii < title_list->count; ii++) { - mpls_free(pl_list[ii]); + mpls_free(&pl_list[ii]); } + X_FREE(known_mpls_ids); X_FREE(pl_list); return title_list; } -void nav_free_title_list(NAV_TITLE_LIST *title_list) +void nav_free_title_list(NAV_TITLE_LIST **title_list) { - X_FREE(title_list->title_info); - X_FREE(title_list); + if (*title_list) { + X_FREE((*title_list)->title_info); + X_FREE((*title_list)); + } } +/* + * + */ + uint8_t nav_lookup_aspect(NAV_CLIP *clip, int pid) { CLPI_PROG *progs; @@ -302,7 +509,6 @@ plm = &pl->play_mark[entry]; - mark->plm = plm; mark->mark_type = plm->mark_type; mark->clip_ref = plm->play_item_ref; clip = &title->clip_list.clip[mark->clip_ref]; @@ -312,7 +518,7 @@ } else { mark->clip_pkt = clip->start_pkt; } - mark->title_pkt = clip->title_pkt + mark->clip_pkt; + mark->title_pkt = clip->title_pkt + mark->clip_pkt - clip->start_pkt; mark->clip_time = plm->time; // Calculate start of mark relative to beginning of playlist @@ -403,15 +609,19 @@ strncpy(&clip->name[5], ".m2ts", 6); clip->clip_id = atoi(mpls_clip[clip->angle].clip_id); + clpi_free(&clip->cl); + file = str_printf("%s.clpi", mpls_clip[clip->angle].clip_id); - clpi_free(clip->cl); - clip->cl = clpi_get(title->disc, file); - X_FREE(file); + if (file) { + clip->cl = clpi_get(title->disc, file); + X_FREE(file); + } if (clip->cl == NULL) { clip->start_pkt = 0; clip->end_pkt = 0; return; } + switch (connection_condition) { case 5: case 6: @@ -436,12 +646,14 @@ *pos += clip->end_pkt - clip->start_pkt; clip->title_time = *time; *time += clip->out_time - clip->in_time; + + clip->stc_spn = clpi_find_stc_spn(clip->cl, mpls_clip[clip->angle].stc_id); } NAV_TITLE* nav_title_open(BD_DISC *disc, const char *playlist, unsigned angle) { NAV_TITLE *title = NULL; - unsigned ii, ss, chapters = 0; + unsigned ii, ss; uint32_t pos = 0; uint32_t time = 0; @@ -501,15 +713,8 @@ } } - // Count the number of "entry" marks (skipping "link" marks) - // This is the the number of chapters - for (ii = 0; ii < title->pl->mark_count; ii++) { - if (title->pl->play_mark[ii].mark_type == BD_MARK_ENTRY) { - chapters++; - } - } - title->chap_list.count = chapters; - title->chap_list.mark = calloc(chapters, sizeof(NAV_MARK)); + title->chap_list.count = _pl_chapter_count(title->pl); + title->chap_list.mark = calloc(title->chap_list.count, sizeof(NAV_MARK)); title->mark_list.count = title->pl->mark_count; title->mark_list.mark = calloc(title->pl->mark_count, sizeof(NAV_MARK)); @@ -522,28 +727,44 @@ return title; } -void nav_title_close(NAV_TITLE *title) +static +void _nav_title_close(NAV_TITLE *title) { unsigned ii, ss; - for (ss = 0; ss < title->sub_path_count; ss++) { - for (ii = 0; ii < title->sub_path[ss].clip_list.count; ii++) { - clpi_free(title->sub_path[ss].clip_list.clip[ii].cl); + if (title->sub_path) { + for (ss = 0; ss < title->sub_path_count; ss++) { + if (title->sub_path[ss].clip_list.clip) { + for (ii = 0; ii < title->sub_path[ss].clip_list.count; ii++) { + clpi_free(&title->sub_path[ss].clip_list.clip[ii].cl); + } + X_FREE(title->sub_path[ss].clip_list.clip); + } } - X_FREE(title->sub_path[ss].clip_list.clip); + X_FREE(title->sub_path); } - X_FREE(title->sub_path); - for (ii = 0; ii < title->pl->list_count; ii++) { - clpi_free(title->clip_list.clip[ii].cl); + if (title->clip_list.clip) { + for (ii = 0; ii < title->clip_list.count; ii++) { + clpi_free(&title->clip_list.clip[ii].cl); + } + X_FREE(title->clip_list.clip); } - mpls_free(title->pl); - X_FREE(title->clip_list.clip); + + mpls_free(&title->pl); X_FREE(title->chap_list.mark); X_FREE(title->mark_list.mark); X_FREE(title); } +void nav_title_close(NAV_TITLE **title) +{ + if (*title) { + _nav_title_close(*title); + *title = NULL; + } +} + // Search for random access point closest to the requested packet // Packets are 192 byte TS packets NAV_CLIP* nav_chapter_search(NAV_TITLE *title, unsigned chapter, uint32_t *clip_pkt, uint32_t *out_pkt) @@ -562,32 +783,22 @@ return clip; } -uint32_t nav_chapter_get_current(NAV_CLIP *clip, uint32_t clip_pkt) +uint32_t nav_chapter_get_current(NAV_TITLE * title, uint32_t title_pkt) { NAV_MARK * mark; - NAV_TITLE *title; uint32_t ii; - // Clip can be null if we haven't started the first clip yet - if (clip == NULL) { + if (title == NULL) { return 0; } - title = clip->title; for (ii = 0; ii < title->chap_list.count; ii++) { mark = &title->chap_list.mark[ii]; - if (mark->clip_ref > clip->ref) - { - if (ii) - return ii-1; - else - return 0; - } - if (mark->clip_ref == clip->ref && mark->clip_pkt <= clip_pkt) { + if (mark->title_pkt <= title_pkt) { if ( ii == title->chap_list.count - 1 ) { return ii; } mark = &title->chap_list.mark[ii+1]; - if (mark->clip_ref != clip->ref || mark->clip_pkt > clip_pkt) { + if (mark->title_pkt > title_pkt) { return ii; } } @@ -613,6 +824,24 @@ return clip; } +void nav_clip_packet_search(NAV_CLIP *clip, uint32_t pkt, uint32_t *clip_pkt, uint32_t *clip_time) +{ + *clip_time = clip->in_time; + if (clip->cl != NULL) { + *clip_pkt = clpi_access_point(clip->cl, pkt, 0, 0, clip_time); + if (*clip_pkt < clip->start_pkt) { + *clip_pkt = clip->start_pkt; + } + if (*clip_time && *clip_time < clip->in_time) { + /* EP map does not store lowest 8 bits of timestamp */ + *clip_time = clip->in_time; + } + + } else { + *clip_pkt = clip->start_pkt; + } +} + // Search for random access point closest to the requested packet // Packets are 192 byte TS packets // pkt is relative to the beginning of the title @@ -638,14 +867,7 @@ *clip_pkt = clip->end_pkt; } else { clip = &title->clip_list.clip[ii]; - if (clip->cl != NULL) { - *clip_pkt = clpi_access_point(clip->cl, pkt - pos + clip->start_pkt, 0, 0, out_time); - if (*clip_pkt < clip->start_pkt) { - *clip_pkt = clip->start_pkt; - } - } else { - *clip_pkt = clip->start_pkt; - } + nav_clip_packet_search(clip, pkt - pos + clip->start_pkt, clip_pkt, out_time); } if(*out_time < clip->in_time) *out_time = 0; @@ -715,22 +937,14 @@ *clip_pkt = clip->end_pkt; } else { clip = &title->clip_list.clip[ii]; - if (clip->cl != NULL) { - *clip_pkt = clpi_lookup_spn(clip->cl, tick - pos + pi->in_time, 1, - title->pl->play_item[clip->ref].clip[clip->angle].stc_id); - if (*clip_pkt < clip->start_pkt) { - *clip_pkt = clip->start_pkt; - } - } else { - *clip_pkt = clip->start_pkt; - } + nav_clip_time_search(clip, tick - pos + pi->in_time, clip_pkt, out_pkt); } *out_pkt = clip->title_pkt + *clip_pkt - clip->start_pkt; return clip; } // Search for random access point closest to the requested time -// Time is in 45khz ticks relative to the beginning of a specific clip +// Time is in 45khz ticks, between clip in_time and out_time. void nav_clip_time_search(NAV_CLIP *clip, uint32_t tick, uint32_t *clip_pkt, uint32_t *out_pkt) { if (tick >= clip->out_time) { @@ -739,6 +953,10 @@ if (clip->cl != NULL) { *clip_pkt = clpi_lookup_spn(clip->cl, tick, 1, clip->title->pl->play_item[clip->ref].clip[clip->angle].stc_id); + if (*clip_pkt < clip->start_pkt) { + *clip_pkt = clip->start_pkt; + } + } else { *clip_pkt = clip->start_pkt; } diff -Nru libbluray-0.8.1/src/libbluray/bdnav/navigation.h libbluray-1.0.1/src/libbluray/bdnav/navigation.h --- libbluray-0.8.1/src/libbluray/bdnav/navigation.h 2015-02-12 09:56:04.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/navigation.h 2017-06-23 13:34:45.000000000 +0000 @@ -22,7 +22,7 @@ #include "util/attributes.h" -#include "mpls_parse.h" +#include "mpls_data.h" #include "clpi_data.h" struct bd_disc; @@ -50,11 +50,8 @@ uint32_t title_pkt; uint32_t title_time; uint32_t duration; - - MPLS_PLM *plm; }; - typedef struct nav_mark_list_s NAV_MARK_LIST; struct nav_mark_list_s { @@ -85,6 +82,8 @@ NAV_TITLE *title; CLPI_CL *cl; + + uint32_t stc_spn; /* start packet of clip STC sequence */ }; typedef struct nav_clip_list_s NAV_CLIP_LIST; @@ -139,19 +138,20 @@ BD_PRIVATE uint8_t nav_lookup_aspect(NAV_CLIP *clip, int pid); BD_PRIVATE NAV_TITLE* nav_title_open(struct bd_disc *disc, const char *playlist, unsigned angle) BD_ATTR_MALLOC; -BD_PRIVATE void nav_title_close(NAV_TITLE *title); +BD_PRIVATE void nav_title_close(NAV_TITLE **title); BD_PRIVATE NAV_CLIP* nav_next_clip(NAV_TITLE *title, NAV_CLIP *clip); BD_PRIVATE NAV_CLIP* nav_packet_search(NAV_TITLE *title, uint32_t pkt, uint32_t *clip_pkt, uint32_t *out_pkt, uint32_t *out_time); +BD_PRIVATE void nav_clip_packet_search(NAV_CLIP *clip, uint32_t pkt, uint32_t *clip_pkt, uint32_t *clip_time); BD_PRIVATE NAV_CLIP* nav_time_search(NAV_TITLE *title, uint32_t tick, uint32_t *clip_pkt, uint32_t *out_pkt); BD_PRIVATE void nav_clip_time_search(NAV_CLIP *clip, uint32_t tick, uint32_t *clip_pkt, uint32_t *out_pkt); BD_PRIVATE NAV_CLIP* nav_chapter_search(NAV_TITLE *title, unsigned chapter, uint32_t *clip_pkt, uint32_t *out_pkt); -BD_PRIVATE uint32_t nav_chapter_get_current(NAV_CLIP *clip, uint32_t clip_pkt); +BD_PRIVATE uint32_t nav_chapter_get_current(NAV_TITLE *title, uint32_t title_pkt); BD_PRIVATE NAV_CLIP* nav_mark_search(NAV_TITLE *title, unsigned mark, uint32_t *clip_pkt, uint32_t *out_pkt); BD_PRIVATE uint32_t nav_angle_change_search(NAV_CLIP *clip, uint32_t pkt, uint32_t *time); BD_PRIVATE NAV_CLIP* nav_set_angle(NAV_TITLE *title, NAV_CLIP *clip, unsigned angle); BD_PRIVATE NAV_TITLE_LIST* nav_get_title_list(struct bd_disc *disc, uint32_t flags, uint32_t min_title_length) BD_ATTR_MALLOC; -BD_PRIVATE void nav_free_title_list(NAV_TITLE_LIST *title_list); +BD_PRIVATE void nav_free_title_list(NAV_TITLE_LIST **title_list); #endif // _NAVIGATION_H_ diff -Nru libbluray-0.8.1/src/libbluray/bdnav/sound_parse.c libbluray-1.0.1/src/libbluray/bdnav/sound_parse.c --- libbluray-0.8.1/src/libbluray/bdnav/sound_parse.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/sound_parse.c 2017-06-23 13:34:45.000000000 +0000 @@ -41,7 +41,9 @@ { uint32_t sig1, sig2; - bs_seek_byte(bs, 0); + if (bs_seek_byte(bs, 0) < 0) { + return 0; + } sig1 = bs_read(bs, 32); sig2 = bs_read(bs, 32); @@ -65,6 +67,7 @@ switch (i = bs_read(bs, 4)) { default: BD_DEBUG(DBG_NAV, "unknown channel configuration code %d\n", i); + /* fall thru */ case 1: obj->num_channels = 1; break; case 3: obj->num_channels = 2; @@ -72,11 +75,13 @@ }; switch (i = bs_read(bs, 4)) { default: BD_DEBUG(DBG_NAV, "unknown sample rate code %d\n", i); + /* fall thru */ case 1: obj->sample_rate = 48000; break; }; switch (i = bs_read(bs, 2)) { default: BD_DEBUG(DBG_NAV, "unknown bits per sample code %d\n", i); + /* fall thru */ case 1: obj->bits_per_sample = 16; break; }; @@ -103,7 +108,15 @@ uint32_t n; uint32_t num_samples = obj->num_frames * obj->num_channels; + if (!num_samples) { + return 1; + } + obj->samples = calloc(num_samples, sizeof(uint16_t)); + if (!obj->samples) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + return 0; + } for (n = 0; n < num_samples; n++) { obj->samples[n] = bs_read(bs, 16); @@ -116,13 +129,14 @@ { if (p && *p) { - unsigned i; - for (i = 0 ; i < (*p)->num_sounds; i++) { - X_FREE((*p)->sounds[i].samples); - } - - X_FREE((*p)->sounds); + if ((*p)->sounds) { + unsigned i; + for (i = 0 ; i < (*p)->num_sounds; i++) { + X_FREE((*p)->sounds[i].samples); + } + X_FREE((*p)->sounds); + } X_FREE(*p); } } @@ -137,34 +151,47 @@ uint32_t data_start, extension_data_start; uint32_t *data_offsets = NULL; - bs_init(&bs, fp); + if (bs_init(&bs, fp) < 0) { + BD_DEBUG(DBG_NAV, "sound.bdmv: read error\n"); + goto error; + } if (!_bclk_parse_header(&bs, &data_start, &extension_data_start)) { BD_DEBUG(DBG_NAV | DBG_CRIT, "invalid header\n"); goto error; } - bs_seek_byte(&bs, 40); + if (bs_seek_byte(&bs, 40) < 0) { + goto error; + } data_len = bs_read(&bs, 32); bs_skip(&bs, 8); /* reserved */ num_sounds = bs_read(&bs, 8); - if (data_len < 1) { + if (data_len < 1 || num_sounds < 1) { BD_DEBUG(DBG_NAV | DBG_CRIT, "empty database\n"); goto error; } data_offsets = calloc(num_sounds, sizeof(uint32_t)); data = calloc(1, sizeof(SOUND_DATA)); + if (!data_offsets || !data) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + goto error; + } data->num_sounds = num_sounds; data->sounds = calloc(num_sounds, sizeof(SOUND_OBJECT)); + if (!data->sounds) { + BD_DEBUG(DBG_CRIT, "out of memory\n"); + goto error; + } /* parse headers */ for (i = 0; i < data->num_sounds; i++) { if (!_sound_parse_index(&bs, data_offsets + i, &data->sounds[i])) { - BD_DEBUG(DBG_NAV | DBG_CRIT, "error parsing sound %d attribues\n", i); + BD_DEBUG(DBG_NAV | DBG_CRIT, "error parsing sound %d attributes\n", i); goto error; } } @@ -173,7 +200,11 @@ for (i = 0; i < data->num_sounds; i++) { - bs_seek_byte(&bs, data_start + data_offsets[i]); + if (bs_seek_byte(&bs, data_start + data_offsets[i]) < 0) { + BD_DEBUG(DBG_NAV | DBG_CRIT, "error reading samples for sound %d\n", i); + data->sounds[i].num_frames = 0; + continue; + } if (!_sound_read_samples(&bs, &data->sounds[i])) { BD_DEBUG(DBG_NAV | DBG_CRIT, "error reading samples for sound %d\n", i); diff -Nru libbluray-0.8.1/src/libbluray/bdnav/uo_mask.c libbluray-1.0.1/src/libbluray/bdnav/uo_mask.c --- libbluray-0.8.1/src/libbluray/bdnav/uo_mask.c 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/uo_mask.c 2017-06-23 13:34:45.000000000 +0000 @@ -0,0 +1,77 @@ +/* + * This file is part of libbluray + * Copyright (C) 2009-2010 John Stebbins + * Copyright (C) 2012 Petri Hintukainen <phintuka@users.sourceforge.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include "uo_mask.h" +#include "uo_mask_table.h" + +#include "util/bits.h" + +#include <string.h> + +int +uo_mask_parse(const uint8_t *buf, BD_UO_MASK *uo) +{ + BITBUFFER bb; + bb_init(&bb, buf, 8); + + memset(uo, 0, sizeof(BD_UO_MASK)); + + uo->menu_call = bb_read(&bb, 1); + uo->title_search = bb_read(&bb, 1); + uo->chapter_search = bb_read(&bb, 1); + uo->time_search = bb_read(&bb, 1); + uo->skip_to_next_point = bb_read(&bb, 1); + uo->skip_to_prev_point = bb_read(&bb, 1); + uo->play_firstplay = bb_read(&bb, 1); + uo->stop = bb_read(&bb, 1); + uo->pause_on = bb_read(&bb, 1); + uo->pause_off = bb_read(&bb, 1); + uo->still_off = bb_read(&bb, 1); + uo->forward = bb_read(&bb, 1); + uo->backward = bb_read(&bb, 1); + uo->resume = bb_read(&bb, 1); + uo->move_up = bb_read(&bb, 1); + uo->move_down = bb_read(&bb, 1); + uo->move_left = bb_read(&bb, 1); + uo->move_right = bb_read(&bb, 1); + uo->select = bb_read(&bb, 1); + uo->activate = bb_read(&bb, 1); + uo->select_and_activate = bb_read(&bb, 1); + uo->primary_audio_change = bb_read(&bb, 1); + bb_skip(&bb, 1); + uo->angle_change = bb_read(&bb, 1); + uo->popup_on = bb_read(&bb, 1); + uo->popup_off = bb_read(&bb, 1); + uo->pg_enable_disable = bb_read(&bb, 1); + uo->pg_change = bb_read(&bb, 1); + uo->secondary_video_enable_disable = bb_read(&bb, 1); + uo->secondary_video_change = bb_read(&bb, 1); + uo->secondary_audio_enable_disable = bb_read(&bb, 1); + uo->secondary_audio_change = bb_read(&bb, 1); + bb_skip(&bb, 1); + uo->pip_pg_change = bb_read(&bb, 1); + bb_skip(&bb, 30); + return 1; +} + diff -Nru libbluray-0.8.1/src/libbluray/bdnav/uo_mask.h libbluray-1.0.1/src/libbluray/bdnav/uo_mask.h --- libbluray-0.8.1/src/libbluray/bdnav/uo_mask.h 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/uo_mask.h 2017-06-23 13:34:45.000000000 +0000 @@ -0,0 +1,57 @@ +/* + * This file is part of libbluray + * Copyright (C) 2010-2015 Petri Hintukainen <phintuka@users.sourceforge.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#if !defined(_BD_UO_MASK_H_) +#define _BD_UO_MASK_H_ + +#include "uo_mask_table.h" + +#include "util/attributes.h" + +#include <stdint.h> + +static inline BD_UO_MASK uo_mask_combine(BD_UO_MASK a, BD_UO_MASK b) +{ + union { + uint64_t u64; + BD_UO_MASK mask; + } mask_a = {0}, mask_b = {0}, result; + + mask_a.mask = a; + mask_b.mask = b; + result.u64 = mask_a.u64 | mask_b.u64; + + return result.mask; +} + +#define EMPTY_UO_MASK {0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0} + +static inline BD_UO_MASK uo_mask_get_empty(void) +{ + static const union { + const uint64_t u64; + const BD_UO_MASK mask; + } empty = {0}; + + return empty.mask; +} + +BD_PRIVATE int uo_mask_parse(const uint8_t *buf, BD_UO_MASK *uo); + +#endif // _BD_UO_MASK_H_ diff -Nru libbluray-0.8.1/src/libbluray/bdnav/uo_mask_table.h libbluray-1.0.1/src/libbluray/bdnav/uo_mask_table.h --- libbluray-0.8.1/src/libbluray/bdnav/uo_mask_table.h 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bdnav/uo_mask_table.h 2017-06-23 13:34:45.000000000 +0000 @@ -20,14 +20,12 @@ #if !defined(_BD_UO_MASK_TABLE_H_) #define _BD_UO_MASK_TABLE_H_ -#include <stdint.h> - enum { UO_MASK_MENU_CALL_INDEX = 0, UO_MASK_TITLE_SEARCH_INDEX = 1, }; -typedef struct bd_uo_mask_table_s +typedef struct bd_uo_mask_table { unsigned int menu_call : 1; unsigned int title_search : 1; @@ -65,30 +63,4 @@ unsigned int pip_pg_change : 1; } BD_UO_MASK; -static inline BD_UO_MASK bd_uo_mask_combine(BD_UO_MASK a, BD_UO_MASK b) -{ - union { - uint64_t u64; - BD_UO_MASK mask; - } mask_a = {0}, mask_b = {0}, result; - - mask_a.mask = a; - mask_b.mask = b; - result.u64 = mask_a.u64 | mask_b.u64; - - return result.mask; -} - -#define EMPTY_UO_MASK {0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0} - -static inline BD_UO_MASK bd_empty_uo_mask(void) -{ - static const union { - const uint64_t u64; - const BD_UO_MASK mask; - } empty = {0}; - - return empty.mask; -} - #endif // _BD_UO_MASK_TABLE_H_ diff -Nru libbluray-0.8.1/src/libbluray/bluray.c libbluray-1.0.1/src/libbluray/bluray.c --- libbluray-0.8.1/src/libbluray/bluray.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bluray.c 2017-06-23 13:34:46.000000000 +0000 @@ -26,8 +26,10 @@ #include "bluray-version.h" #include "bluray.h" #include "bluray_internal.h" +#include "keys.h" #include "register.h" #include "util/array.h" +#include "util/event_queue.h" #include "util/macro.h" #include "util/logging.h" #include "util/strutl.h" @@ -39,18 +41,18 @@ #include "bdnav/meta_data.h" #include "bdnav/clpi_parse.h" #include "bdnav/sound_parse.h" +#include "bdnav/uo_mask.h" #include "hdmv/hdmv_vm.h" #include "hdmv/mobj_parse.h" #include "decoders/graphics_controller.h" +#include "decoders/hdmv_pids.h" #include "decoders/m2ts_filter.h" #include "decoders/overlay.h" #include "disc/disc.h" #include "disc/enc_info.h" #include "file/file.h" -#ifdef USING_BDJAVA #include "bdj/bdj.h" #include "bdj/bdjo_parse.h" -#endif #include <stdio.h> // SEEK_ #include <stdlib.h> @@ -58,14 +60,6 @@ #include <string.h> -#define MAX_EVENTS 31 /* 2^n - 1 */ -typedef struct bd_event_queue_s { - BD_MUTEX mutex; - unsigned in; /* next free slot */ - unsigned out; /* next event */ - BD_EVENT ev[MAX_EVENTS+1]; -} BD_EVENT_QUEUE; - typedef enum { title_undef = 0, title_hdmv, @@ -93,6 +87,7 @@ /* */ uint8_t eof_hit; uint8_t encrypted_block_cnt; + uint8_t seek_flag; /* used to fine-tune first read after seek */ M2TS_FILTER *m2ts_filter; } BD_STREAM; @@ -148,17 +143,16 @@ * 1 - message pending. 3 - message sent. */ uint8_t end_of_playlist; /* 1 - reached. 3 - processed . */ + uint8_t app_scr; /* 1 if application provides presentation timetamps */ /* HDMV */ HDMV_VM *hdmv_vm; uint8_t hdmv_suspended; /* BD-J */ -#ifdef USING_BDJAVA BDJAVA *bdjava; BDJ_STORAGE bdjstorage; uint8_t bdj_wait_start; /* BD-J has selected playlist (prefetch) but not yet started playback */ -#endif /* HDMV graphics */ GRAPHICS_CONTROLLER *graphics_controller; @@ -172,12 +166,10 @@ uint64_t gc_wakeup_pos; /* stream position of gc_wakeup_time */ /* ARGB overlay output */ -#ifdef USING_BDJAVA void *argb_overlay_proc_handle; bd_argb_overlay_proc_f argb_overlay_proc; BD_ARGB_BUFFER *argb_buffer; BD_MUTEX argb_buffer_mutex; -#endif }; /* Stream Packet Number = byte offset / 192. Avoid 64-bit division. */ @@ -198,82 +190,76 @@ * Navigation mode event queue */ -static void _init_event_queue(BLURAY *bd) +static int _get_event(BLURAY *bd, BD_EVENT *ev) { - if (!bd->event_queue) { - bd->event_queue = calloc(1, sizeof(struct bd_event_queue_s)); - bd_mutex_init(&bd->event_queue->mutex); - } else { - bd_mutex_lock(&bd->event_queue->mutex); - bd->event_queue->in = 0; - bd->event_queue->out = 0; - memset(bd->event_queue->ev, 0, sizeof(bd->event_queue->ev)); - bd_mutex_unlock(&bd->event_queue->mutex); + int result = event_queue_get(bd->event_queue, ev); + if (!result) { + ev->event = BD_EVENT_NONE; } + return result; } -static void _free_event_queue(BLURAY *bd) +static int _queue_event(BLURAY *bd, uint32_t event, uint32_t param) { + int result = 0; if (bd->event_queue) { - bd_mutex_destroy(&bd->event_queue->mutex); - X_FREE(bd->event_queue); + BD_EVENT ev = { event, param }; + result = event_queue_put(bd->event_queue, &ev); + if (!result) { + BD_DEBUG(DBG_BLURAY|DBG_CRIT, "_queue_event(%d, %d): queue overflow !\n", event, param); + } } + return result; } -static int _get_event(BLURAY *bd, BD_EVENT *ev) -{ - struct bd_event_queue_s *eq = bd->event_queue; - - if (eq) { - bd_mutex_lock(&eq->mutex); - - if (eq->in != eq->out) { - - *ev = eq->ev[eq->out]; - eq->out = (eq->out + 1) & MAX_EVENTS; +/* + * PSR utils + */ - bd_mutex_unlock(&eq->mutex); - return 1; - } +static void _update_time_psr(BLURAY *bd, uint32_t time) +{ + /* + * Update PSR8: Presentation Time + * The PSR8 represents presentation time in the playing interval from IN_time until OUT_time of + * the current PlayItem, measured in units of a 45 kHz clock. + */ - bd_mutex_unlock(&eq->mutex); + if (!bd->title || !bd->st0.clip) { + return; + } + if (time < bd->st0.clip->in_time) { + BD_DEBUG(DBG_BLURAY | DBG_CRIT, "_update_time_psr(): timestamp before clip start\n"); + return; + } + if (time > bd->st0.clip->out_time) { + BD_DEBUG(DBG_BLURAY | DBG_CRIT, "_update_time_psr(): timestamp after clip end\n"); + return; } - ev->event = BD_EVENT_NONE; - - return 0; + bd_psr_write(bd->regs, PSR_TIME, time); } -static int _queue_event(BLURAY *bd, uint32_t event, uint32_t param) +static uint32_t _update_time_psr_from_stream(BLURAY *bd) { - struct bd_event_queue_s *eq = bd->event_queue; - - if (eq) { - bd_mutex_lock(&eq->mutex); - - unsigned new_in = (eq->in + 1) & MAX_EVENTS; + /* update PSR_TIME from stream. Not real presentation time (except when seeking), but near enough. */ + NAV_CLIP *clip = bd->st0.clip; - if (new_in != eq->out) { - eq->ev[eq->in].event = event; - eq->ev[eq->in].param = param; - eq->in = new_in; + if (bd->title && clip) { - bd_mutex_unlock(&eq->mutex); - return 1; + uint32_t clip_pkt, clip_time; + nav_clip_packet_search(bd->st0.clip, SPN(bd->st0.clip_pos), &clip_pkt, &clip_time); + if (clip_time >= clip->in_time && clip_time <= clip->out_time) { + _update_time_psr(bd, clip_time); + return clip_time; + } else { + BD_DEBUG(DBG_BLURAY|DBG_CRIT, "%s: no timestamp for SPN %u (got %u). clip %u-%u.\n", + clip->name, SPN(bd->st0.clip_pos), clip_time, clip->in_time, clip->out_time); } - - bd_mutex_unlock(&eq->mutex); - - BD_DEBUG(DBG_BLURAY|DBG_CRIT, "_queue_event(%d, %d): queue overflow !\n", event, param); } return 0; } -/* - * PSR utils - */ - static void _update_stream_psr_by_lang(BD_REGISTERS *regs, uint32_t psr_lang, uint32_t psr_stream, uint32_t enable_flag, @@ -409,7 +395,7 @@ static void _update_chapter_psr(BLURAY *bd) { - if (!_is_interactive_title(bd)) { + if (!_is_interactive_title(bd) && bd->title->chap_list.count > 0) { uint32_t current_chapter = bd_get_current_chapter(bd); bd_psr_write(bd->regs, PSR_CHAPTER, current_chapter + 1); } @@ -538,24 +524,14 @@ BD_UO_MASK old_mask = bd->uo_mask; BD_UO_MASK new_mask; - new_mask = bd_uo_mask_combine(bd->title_uo_mask, bd->st0.uo_mask); - new_mask = bd_uo_mask_combine(bd->gc_uo_mask, new_mask); + new_mask = uo_mask_combine(bd->title_uo_mask, bd->st0.uo_mask); + new_mask = uo_mask_combine(bd->gc_uo_mask, new_mask); if (_compressed_mask(old_mask) != _compressed_mask(new_mask)) { _queue_event(bd, BD_EVENT_UO_MASK_CHANGED, _compressed_mask(new_mask)); } bd->uo_mask = new_mask; } -#ifdef USING_BDJAVA -void bd_set_bdj_uo_mask(BLURAY *bd, unsigned mask) -{ - bd->title_uo_mask.title_search = !!(mask & BDJ_TITLE_SEARCH_MASK); - bd->title_uo_mask.menu_call = !!(mask & BDJ_MENU_CALL_MASK); - - _update_uo_mask(bd); -} -#endif - static void _update_hdmv_uo_mask(BLURAY *bd) { uint32_t mask = hdmv_vm_get_uo_mask(bd->hdmv_vm); @@ -584,6 +560,10 @@ { _close_m2ts(st); + if (!st->clip) { + return 0; + } + st->fp = disc_open_stream(bd->disc, st->clip->name); st->clip_size = 0; @@ -609,8 +589,8 @@ MPLS_PL *pl = st->clip->title->pl; MPLS_STN *stn = &pl->play_item[st->clip->ref].stn; - st->uo_mask = bd_uo_mask_combine(pl->app_info.uo_mask, - pl->play_item[st->clip->ref].uo_mask); + st->uo_mask = uo_mask_combine(pl->app_info.uo_mask, + pl->play_item[st->clip->ref].uo_mask); _update_uo_mask(bd); st->m2ts_filter = m2ts_filter_init((int64_t)st->clip->in_time << 1, @@ -794,7 +774,15 @@ /* allocate buffer */ p->clip_size = (size_t)st.clip_size; - p->buf = realloc(p->buf, p->clip_size); + uint8_t* tmp = (uint8_t*)realloc(p->buf, p->clip_size); + if (!tmp) { + BD_DEBUG(DBG_BLURAY | DBG_CRIT, "_preload_m2ts(): out of memory\n"); + _close_m2ts(&st); + _close_preload(p); + return 0; + } + + p->buf = tmp; /* read clip to buffer */ @@ -847,6 +835,7 @@ } st->int_buf_off = 6144; + st->seek_flag = 1; return st->clip_pos; } @@ -905,42 +894,42 @@ } /* - * meta open - */ - -static int _meta_open(BLURAY *bd) -{ - if (!bd->meta) { - bd->meta = meta_parse(bd->disc); - } - - return !!bd->meta; -} - -/* * disc info */ -const BLURAY_DISC_INFO *bd_get_disc_info(BLURAY *bd) +static void _check_bdj(BLURAY *bd) { - return &bd->disc_info; + if (!bd->disc_info.bdj_handled) { + if (!bd->disc || bd->disc_info.bdj_detected) { + + /* Check if jvm + jar can be loaded ? */ + switch (bdj_jvm_available(&bd->bdjstorage)) { + case 2: bd->disc_info.bdj_handled = 1; + case 1: bd->disc_info.libjvm_detected = 1; + default:; + } + } + } } static void _fill_disc_info(BLURAY *bd, BD_ENC_INFO *enc_info) { - bd->disc_info.aacs_detected = enc_info->aacs_detected; - bd->disc_info.libaacs_detected = enc_info->libaacs_detected; - bd->disc_info.aacs_error_code = enc_info->aacs_error_code; - bd->disc_info.aacs_handled = enc_info->aacs_handled; - bd->disc_info.aacs_mkbv = enc_info->aacs_mkbv; - memcpy(bd->disc_info.disc_id, enc_info->disc_id, 20); - bd->disc_info.bdplus_detected = enc_info->bdplus_detected; - bd->disc_info.libbdplus_detected = enc_info->libbdplus_detected; - bd->disc_info.bdplus_handled = enc_info->bdplus_handled; - bd->disc_info.bdplus_gen = enc_info->bdplus_gen; - bd->disc_info.bdplus_date = enc_info->bdplus_date; + INDX_ROOT *index = NULL; - bd->disc_info.udf_volume_id = disc_volume_id(bd->disc); + if (enc_info) { + bd->disc_info.aacs_detected = enc_info->aacs_detected; + bd->disc_info.libaacs_detected = enc_info->libaacs_detected; + bd->disc_info.aacs_error_code = enc_info->aacs_error_code; + bd->disc_info.aacs_handled = enc_info->aacs_handled; + bd->disc_info.aacs_mkbv = enc_info->aacs_mkbv; + memcpy(bd->disc_info.disc_id, enc_info->disc_id, 20); + bd->disc_info.bdplus_detected = enc_info->bdplus_detected; + bd->disc_info.libbdplus_detected = enc_info->libbdplus_detected; + bd->disc_info.bdplus_handled = enc_info->bdplus_handled; + bd->disc_info.bdplus_gen = enc_info->bdplus_gen; + bd->disc_info.bdplus_date = enc_info->bdplus_date; + bd->disc_info.no_menu_support = enc_info->no_menu_support; + } bd->disc_info.bluray_detected = 0; bd->disc_info.top_menu_supported = 0; @@ -950,9 +939,7 @@ bd->disc_info.num_unsupported_titles = 0; bd->disc_info.bdj_detected = 0; - bd->disc_info.bdj_supported = 0; - bd->disc_info.libjvm_detected = 0; - bd->disc_info.bdj_handled = 0; + bd->disc_info.bdj_supported = 1; bd->disc_info.num_titles = 0; bd->disc_info.titles = NULL; @@ -964,7 +951,11 @@ memset(bd->disc_info.bdj_org_id, 0, sizeof(bd->disc_info.bdj_org_id)); memset(bd->disc_info.bdj_disc_id, 0, sizeof(bd->disc_info.bdj_disc_id)); - INDX_ROOT *index = indx_get(bd->disc); + if (bd->disc) { + bd->disc_info.udf_volume_id = disc_volume_id(bd->disc); + index = indx_get(bd->disc); + } + if (index) { INDX_PLAY_ITEM *pi; unsigned ii; @@ -982,6 +973,7 @@ BLURAY_TITLE **titles = (BLURAY_TITLE**)array_alloc(index->num_titles + 2, sizeof(BLURAY_TITLE)); if (!titles) { BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Can't allocate memory\n"); + indx_free(&index); return; } bd->titles = titles; @@ -1032,22 +1024,10 @@ titles[0]->id_ref = pi->hdmv.id_ref; } - /* check for BD-J capability */ - -#ifdef USING_BDJAVA - if (bd->disc_info.bdj_detected) { - bd->disc_info.bdj_supported = 1; - /* BD-J titles found. Check if jvm + jar can be loaded ? */ - switch (bdj_jvm_available(&bd->bdjstorage)) { - case 2: bd->disc_info.bdj_handled = 1; - case 1: bd->disc_info.libjvm_detected = 1; - default:; - } - } -#endif /* USING_BDJAVA */ - /* mark supported titles */ + _check_bdj(bd); + if (bd->disc_info.bdj_detected && !bd->disc_info.bdj_handled) { bd->disc_info.num_unsupported_titles = bd->disc_info.num_bdj_titles; } @@ -1085,6 +1065,12 @@ indx_free(&index); } +#if 0 + if (!bd->disc_info.first_play_supported || !bd->disc_info.top_menu_supported) { + bd->disc_info.no_menu_support = 1; + } +#endif + if (bd->disc_info.bdj_detected) { BDID_DATA *bdid = bdid_get(bd->disc); /* parse id.bdmv */ if (bdid) { @@ -1093,20 +1079,37 @@ bdid_free(&bdid); } } + + _check_bdj(bd); +} + +const BLURAY_DISC_INFO *bd_get_disc_info(BLURAY *bd) +{ + if (!bd->disc) { + BD_ENC_INFO enc_info; + memset(&enc_info, 0, sizeof(enc_info)); + _fill_disc_info(bd, &enc_info); + } + return &bd->disc_info; } /* - * bdj + * bdj callbacks */ -#ifdef USING_BDJAVA +void bd_set_bdj_uo_mask(BLURAY *bd, unsigned mask) +{ + bd->title_uo_mask.title_search = !!(mask & BDJ_TITLE_SEARCH_MASK); + bd->title_uo_mask.menu_call = !!(mask & BDJ_MENU_CALL_MASK); + + _update_uo_mask(bd); +} + const uint8_t *bd_get_aacs_data(BLURAY *bd, int type) { return disc_get_data(bd->disc, type); } -#endif -#ifdef USING_BDJAVA uint64_t bd_get_uo_mask(BLURAY *bd) { /* internal function. Used by BD-J. */ @@ -1121,16 +1124,25 @@ return mask.u64; } -#endif -#ifdef USING_BDJAVA void bd_set_bdj_kit(BLURAY *bd, int mask) { _queue_event(bd, BD_EVENT_KEY_INTEREST_TABLE, mask); } -#endif -#ifdef USING_BDJAVA +int bd_bdj_sound_effect(BLURAY *bd, int id) +{ + if (bd->sound_effects && id >= bd->sound_effects->num_sounds) { + return -1; + } + if (id < 0 || id > 0xff) { + return -1; + } + + _queue_event(bd, BD_EVENT_SOUND_EFFECT, id); + return 0; +} + void bd_select_rate(BLURAY *bd, float rate, int reason) { if (reason == BDJ_PLAYBACK_STOP) { @@ -1149,9 +1161,26 @@ _queue_event(bd, BD_EVENT_STILL, 0); } } -#endif -#ifdef USING_BDJAVA +int bd_bdj_seek(BLURAY *bd, int playitem, int playmark, int64_t time) +{ + bd_mutex_lock(&bd->mutex); + + if (playitem > 0) { + bd_seek_playitem(bd, playitem); + } + if (playmark >= 0) { + bd_seek_mark(bd, playmark); + } + if (time >= 0) { + bd_seek_time(bd, time); + } + + bd_mutex_unlock(&bd->mutex); + + return 1; +} + int bd_set_virtual_package(BLURAY *bd, const char *vp_path, int psr_init_backup) { bd_mutex_lock(&bd->mutex); @@ -1177,16 +1206,12 @@ return 0; } -#endif -#ifdef USING_BDJAVA BD_DISC *bd_get_disc(BLURAY *bd) { return bd ? bd->disc : NULL; } -#endif -#ifdef USING_BDJAVA uint32_t bd_reg_read(BLURAY *bd, int psr, int reg) { if (psr) { @@ -1195,9 +1220,7 @@ return bd_gpr_read(bd->regs, reg); } } -#endif -#ifdef USING_BDJAVA int bd_reg_write(BLURAY *bd, int psr, int reg, uint32_t value, uint32_t psr_value_mask) { if (psr) { @@ -1214,9 +1237,7 @@ return bd_gpr_write(bd->regs, reg, value); } } -#endif -#ifdef USING_BDJAVA BD_ARGB_BUFFER *bd_lock_osd_buffer(BLURAY *bd) { bd_mutex_lock(&bd->argb_buffer_mutex); @@ -1302,11 +1323,13 @@ bd->argb_buffer->dirty[BD_OVERLAY_IG].y1 = 0; } } -#endif + +/* + * BD-J + */ static int _start_bdj(BLURAY *bd, unsigned title) { -#ifdef USING_BDJAVA if (bd->bdjava == NULL) { const char *root = disc_root(bd->disc); bd->bdjava = bdj_open(root, bd, bd->disc_info.bdj_disc_id, &bd->bdjstorage); @@ -1316,14 +1339,8 @@ } return !bdj_process_event(bd->bdjava, BDJ_EVENT_START, title); -#else - (void)bd; - BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Title %d: BD-J not compiled in\n", title); - return 0; -#endif } -#ifdef USING_BDJAVA static int _bdj_event(BLURAY *bd, unsigned ev, unsigned param) { if (bd->bdjava != NULL) { @@ -1331,11 +1348,7 @@ } return -1; } -#else -#define _bdj_event(bd, ev, param) do{}while(0) -#endif -#ifdef USING_BDJAVA static void _stop_bdj(BLURAY *bd) { if (bd->bdjava != NULL) { @@ -1344,11 +1357,7 @@ _queue_event(bd, BD_EVENT_KEY_INTEREST_TABLE, 0); } } -#else -#define _stop_bdj(bd) do{}while(0) -#endif -#ifdef USING_BDJAVA static void _close_bdj(BLURAY *bd) { if (bd->bdjava != NULL) { @@ -1356,20 +1365,13 @@ bd->bdjava = NULL; } } -#else -#define _close_bdj(bd) do{}while(0) -#endif -#ifdef USING_BDJAVA static void _storage_free(BLURAY *bd) { X_FREE(bd->bdjstorage.cache_root); X_FREE(bd->bdjstorage.persistent_root); X_FREE(bd->bdjstorage.classpath); } -#else -#define _storage_free(bd) do{}while(0) -#endif /* * open / close @@ -1377,6 +1379,8 @@ BLURAY *bd_init(void) { + char *env; + BD_DEBUG(DBG_BLURAY, "libbluray version "BLURAY_VERSION_STRING"\n"); BLURAY *bd = calloc(1, sizeof(BLURAY)); @@ -1394,9 +1398,13 @@ } bd_mutex_init(&bd->mutex); -#ifdef USING_BDJAVA bd_mutex_init(&bd->argb_buffer_mutex); -#endif + + env = getenv("LIBBLURAY_PERSISTENT_STORAGE"); + if (env) { + int v = (!strcmp(env, "yes")) ? 1 : (!strcmp(env, "no")) ? 0 : atoi(env); + bd->bdjstorage.no_persistent_storage = !v; + } BD_DEBUG(DBG_BLURAY, "BLURAY initialized!\n"); @@ -1405,8 +1413,7 @@ static int _bd_open(BLURAY *bd, const char *device_path, const char *keyfile_path, - void *read_blocks_handle, - int (*read_blocks)(void *handle, void *buf, int lba, int num_blocks)) + fs_access *p_fs) { BD_ENC_INFO enc_info; @@ -1418,7 +1425,7 @@ return 0; } - bd->disc = disc_open(device_path, read_blocks_handle, read_blocks, + bd->disc = disc_open(device_path, p_fs, &enc_info, keyfile_path, (void*)bd->regs, (void*)bd_psr_read, (void*)bd_psr_write); @@ -1438,7 +1445,7 @@ return 0; } - return _bd_open(bd, device_path, keyfile_path, NULL, NULL); + return _bd_open(bd, device_path, keyfile_path, NULL); } int bd_open_stream(BLURAY *bd, @@ -1449,7 +1456,21 @@ return 0; } - return _bd_open(bd, NULL, NULL, read_blocks_handle, read_blocks); + fs_access fs = { read_blocks_handle, read_blocks, NULL, NULL }; + return _bd_open(bd, NULL, NULL, &fs); +} + +int bd_open_files(BLURAY *bd, + void *handle, + struct bd_dir_s *(*open_dir)(void *handle, const char *rel_path), + struct bd_file_s *(*open_file)(void *handle, const char *rel_path)) +{ + if (!open_dir || !open_file) { + return 0; + } + + fs_access fs = { handle, NULL, open_dir, open_file }; + return _bd_open(bd, NULL, NULL, &fs); } BLURAY *bd_open(const char *device_path, const char *keyfile_path) @@ -1471,18 +1492,18 @@ void bd_close(BLURAY *bd) { + if (!bd) { + return; + } + _close_bdj(bd); _close_m2ts(&bd->st0); _close_preload(&bd->st_ig); _close_preload(&bd->st_textst); - if (bd->title_list != NULL) { - nav_free_title_list(bd->title_list); - } - if (bd->title != NULL) { - nav_title_close(bd->title); - } + nav_free_title_list(&bd->title_list); + nav_title_close(&bd->title); hdmv_vm_free(&bd->hdmv_vm); @@ -1491,16 +1512,14 @@ sound_free(&bd->sound_effects); bd_registers_free(bd->regs); - _free_event_queue(bd); + event_queue_destroy(&bd->event_queue); array_free((void**)&bd->titles); _storage_free(bd); disc_close(&bd->disc); bd_mutex_destroy(&bd->mutex); -#ifdef USING_BDJAVA bd_mutex_destroy(&bd->argb_buffer_mutex); -#endif BD_DEBUG(DBG_BLURAY, "BLURAY destroyed!\n"); @@ -1522,8 +1541,7 @@ if (pos > bd->s_pos) { bd->next_mark = ii; bd->next_mark_pos = pos; - _update_chapter_psr(bd); - return; + break; } } @@ -1558,12 +1576,21 @@ NAV_CLIP *clip, uint32_t title_pkt, uint32_t clip_pkt) { if (_seek_stream(bd, &bd->st0, clip, clip_pkt) >= 0) { - - _queue_event(bd, BD_EVENT_SEEK, 0); + uint32_t media_time; /* update title position */ bd->s_pos = (uint64_t)title_pkt * 192; + /* Update PSR_TIME */ + media_time = _update_time_psr_from_stream(bd); + + /* emit notification events */ + if (media_time >= clip->in_time) { + media_time = media_time - clip->in_time + clip->title_time; + } + _queue_event(bd, BD_EVENT_SEEK, media_time); + _bdj_event(bd, BDJ_EVENT_SEEK, media_time); + /* playmark tracking */ _find_next_playmark(bd); @@ -1700,7 +1727,7 @@ bd_mutex_lock(&bd->mutex); if (bd->title) { - ret = nav_chapter_get_current(bd->st0.clip, SPN(bd->st0.clip_pos)); + ret = nav_chapter_get_current(bd->title, SPN(bd->s_pos)); } bd_mutex_unlock(&bd->mutex); @@ -1830,14 +1857,22 @@ { uint32_t clip_pkt, out_pkt; - if (tick < bd->st0.clip->out_time) { - - // Find the closest access unit to the requested position - nav_clip_time_search(bd->st0.clip, tick, &clip_pkt, &out_pkt); + if (!bd->title || !bd->st0.clip) { + BD_DEBUG(DBG_BLURAY | DBG_CRIT, "_clip_seek_time(): no playlist playing\n"); + return -1; + } - _seek_internal(bd, bd->st0.clip, out_pkt, clip_pkt); + if (tick >= bd->st0.clip->out_time) { + BD_DEBUG(DBG_BLURAY | DBG_CRIT, "_clip_seek_time(): timestamp after clip end (%u < %u)\n", + bd->st0.clip->out_time, tick); + return -1; } + // Find the closest access unit to the requested position + nav_clip_time_search(bd->st0.clip, tick, &clip_pkt, &out_pkt); + + _seek_internal(bd, bd->st0.clip, out_pkt, clip_pkt); + return bd->s_pos; } @@ -1850,6 +1885,14 @@ out_len = 0; BD_DEBUG(DBG_STREAM, "Reading [%d bytes] at %"PRIu64"...\n", len, bd->s_pos); + if (st->clip == NULL) { + // We previously reached the last clip. Nothing + // else to read. + _queue_event(bd, BD_EVENT_END_OF_TITLE, 0); + bd->end_of_playlist |= 1; + return 0; + } + while (len > 0) { uint32_t clip_pkt; @@ -1878,13 +1921,6 @@ } } } - if (st->clip == NULL) { - // We previously reached the last clip. Nothing - // else to read. - _queue_event(bd, BD_EVENT_END_OF_TITLE, 0); - bd->end_of_playlist |= 1; - return 0; - } if (st->int_buf_off == 6144 || clip_pkt >= st->clip->end_pkt) { // Do we need to get the next clip? @@ -1956,6 +1992,19 @@ /* fatal error */ return -1; } + + /* finetune seek point (avoid skipping PAT/PMT/PCR) */ + if (BD_UNLIKELY(st->seek_flag)) { + st->seek_flag = 0; + + /* rewind if previous packets contain PAT/PMT/PCR */ + while (st->int_buf_off >= 192 && TS_PID(bd->int_buf + st->int_buf_off - 192) <= HDMV_PID_PCR) { + st->clip_pos -= 192; + st->int_buf_off -= 192; + bd->s_pos -= 192; + } + } + } if (size > (unsigned int)6144 - st->int_buf_off) { size = 6144 - st->int_buf_off; @@ -2064,7 +2113,7 @@ gc_run(bd->graphics_controller, GC_CTRL_PG_RESET, 0, NULL); bd->st_textst.clip = &bd->title->sub_path[textst_subpath].clip_list.clip[textst_subclip]; - if (!bd->st0.clip->cl) { + if (!bd->st_textst.clip->cl) { /* required for fonts */ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "_preload_textst_subpath(): missing clip data\n"); return -1; @@ -2079,14 +2128,16 @@ /* set fonts and encoding from clip info */ gc_add_font(bd->graphics_controller, NULL, -1); - for (ii = 0; ii < bd->st_textst.clip->cl->font_info.font_count; ii++) { - char *file = str_printf("%s.otf", bd->st_textst.clip->cl->font_info.font[ii].file_id); - uint8_t *data = NULL; - size_t size = disc_read_file(bd->disc, "BDMV" DIR_SEP "AUXDATA", file, &data); - if (data && size > 0 && gc_add_font(bd->graphics_controller, data, size) < 0) { - X_FREE(data); + for (ii = 0; ii < bd->st_textst.clip->cl->clip.font_info.font_count; ii++) { + char *file = str_printf("%s.otf", bd->st_textst.clip->cl->clip.font_info.font[ii].file_id); + if (file) { + uint8_t *data = NULL; + size_t size = disc_read_file(bd->disc, "BDMV" DIR_SEP "AUXDATA", file, &data); + if (data && size > 0 && gc_add_font(bd->graphics_controller, data, size) < 0) { + X_FREE(data); + } + X_FREE(file); } - X_FREE(file); } gc_run(bd->graphics_controller, GC_CTRL_PG_CHARCODE, char_code, NULL); @@ -2234,10 +2285,7 @@ _close_preload(&bd->st_ig); _close_preload(&bd->st_textst); - if (bd->title) { - nav_title_close(bd->title); - bd->title = NULL; - } + nav_title_close(&bd->title); /* reset UO mask */ memset(&bd->st0.uo_mask, 0, sizeof(BD_UO_MASK)); @@ -2245,6 +2293,33 @@ _update_uo_mask(bd); } +static int _add_known_playlist(BD_DISC *p, const char *mpls_id) +{ + char *old_mpls_ids; + char *new_mpls_ids = NULL; + int result = -1; + + old_mpls_ids = disc_property_get(p, DISC_PROPERTY_PLAYLISTS); + if (!old_mpls_ids) { + return disc_property_put(p, DISC_PROPERTY_PLAYLISTS, mpls_id); + } + + /* no duplicates */ + if (str_strcasestr(old_mpls_ids, mpls_id)) { + goto out; + } + + new_mpls_ids = str_printf("%s,%s", old_mpls_ids, mpls_id); + if (new_mpls_ids) { + result = disc_property_put(p, DISC_PROPERTY_PLAYLISTS, new_mpls_ids); + } + + out: + X_FREE(old_mpls_ids); + X_FREE(new_mpls_ids); + return result; +} + static int _open_playlist(BLURAY *bd, const char *f_name, unsigned angle) { _close_playlist(bd); @@ -2262,12 +2337,7 @@ bd_psr_write(bd->regs, PSR_PLAYLIST, atoi(bd->title->name)); bd_psr_write(bd->regs, PSR_ANGLE_NUMBER, bd->title->angle + 1); - - if (_is_interactive_title(bd)) { - bd_psr_write(bd->regs, PSR_CHAPTER, 0xffff); - } else { - bd_psr_write(bd->regs, PSR_CHAPTER, 1); - } + bd_psr_write(bd->regs, PSR_CHAPTER, 0xffff); // Get the initial clip of the playlist bd->st0.clip = nav_next_clip(bd->title, NULL); @@ -2278,6 +2348,13 @@ _preload_subpaths(bd); + bd->st0.seek_flag = 1; + + /* remember played playlists when using menus */ + if (bd->title_type != title_undef) { + _add_known_playlist(bd->disc, bd->title->name); + } + return 1; } return 0; @@ -2285,9 +2362,14 @@ int bd_select_playlist(BLURAY *bd, uint32_t playlist) { - char *f_name = str_printf("%05d.mpls", playlist); + char *f_name; int result; + f_name = str_printf("%05d.mpls", playlist); + if (!f_name) { + return 0; + } + bd_mutex_lock(&bd->mutex); if (bd->title_list) { @@ -2309,26 +2391,7 @@ return result; } -#ifdef USING_BDJAVA -int bd_bdj_seek(BLURAY *bd, int playitem, int playmark, int64_t time) -{ - bd_mutex_lock(&bd->mutex); - - if (playitem > 0) { - bd_seek_playitem(bd, playitem); - } - if (playmark >= 0) { - bd_seek_mark(bd, playmark); - } - if (time >= 0) { - bd_seek_time(bd, time); - } - - bd_mutex_unlock(&bd->mutex); - - return 1; -} - +/* BD-J callback */ static int _play_playlist_at(BLURAY *bd, int playlist, int playitem, int playmark, int64_t time) { if (playlist < 0) { @@ -2340,15 +2403,14 @@ return 0; } -#ifdef USING_BDJAVA bd->bdj_wait_start = 1; /* playback is triggered by bd_select_rate() */ -#endif bd_bdj_seek(bd, playitem, playmark, time); return 1; } +/* BD-J callback */ int bd_play_playlist_at(BLURAY *bd, int playlist, int playitem, int playmark, int64_t time) { int result; @@ -2361,21 +2423,6 @@ return result; } -int bd_bdj_sound_effect(BLURAY *bd, int id) -{ - if (bd->sound_effects && id >= bd->sound_effects->num_sounds) { - return -1; - } - if (id < 0 || id > 0xff) { - return -1; - } - - _queue_event(bd, BD_EVENT_SOUND_EFFECT, id); - return 0; -} - -#endif /* USING_BDJAVA */ - // Select a title for playback // The title index is an index into the list // established by bd_get_titles() @@ -2487,9 +2534,7 @@ return 0; } - if (bd->title_list != NULL) { - nav_free_title_list(bd->title_list); - } + nav_free_title_list(&bd->title_list); bd->title_list = nav_get_title_list(bd->disc, flags, min_title_length); if (!bd->title_list) { @@ -2504,6 +2549,9 @@ int bd_get_main_title(BLURAY *bd) { + if (!bd) { + return -1; + } if (bd->title_type != title_undef) { BD_DEBUG(DBG_CRIT | DBG_BLURAY, "bd_get_main_title() can't be used with BluRay menus\n"); } @@ -2516,10 +2564,19 @@ return bd->title_list->main_title_idx; } -static void _copy_streams(NAV_CLIP *clip, BLURAY_STREAM_INFO *streams, MPLS_STREAM *si, int count) +static int _copy_streams(NAV_CLIP *clip, BLURAY_STREAM_INFO **pstreams, MPLS_STREAM *si, int count) { + BLURAY_STREAM_INFO *streams; int ii; + if (!count) { + return 1; + } + streams = *pstreams = calloc(count, sizeof(BLURAY_STREAM_INFO)); + if (!streams) { + return 0; + } + for (ii = 0; ii < count; ii++) { streams[ii].coding_type = si[ii].coding_type; streams[ii].format = si[ii].format; @@ -2533,6 +2590,8 @@ else streams[ii].subpath_id = -1; } + + return 1; } static BLURAY_TITLE_INFO* _fill_title_info(NAV_TITLE* title, uint32_t title_idx, uint32_t playlist) @@ -2541,63 +2600,84 @@ unsigned int ii; title_info = calloc(1, sizeof(BLURAY_TITLE_INFO)); + if (!title_info) { + goto error; + } title_info->idx = title_idx; title_info->playlist = playlist; title_info->duration = (uint64_t)title->duration * 2; title_info->angle_count = title->angle_count; title_info->chapter_count = title->chap_list.count; - title_info->chapters = calloc(title_info->chapter_count, sizeof(BLURAY_TITLE_CHAPTER)); - for (ii = 0; ii < title_info->chapter_count; ii++) { - title_info->chapters[ii].idx = ii; - title_info->chapters[ii].start = (uint64_t)title->chap_list.mark[ii].title_time * 2; - title_info->chapters[ii].duration = (uint64_t)title->chap_list.mark[ii].duration * 2; - title_info->chapters[ii].offset = (uint64_t)title->chap_list.mark[ii].title_pkt * 192L; - title_info->chapters[ii].clip_ref = title->chap_list.mark[ii].clip_ref; + if (title_info->chapter_count) { + title_info->chapters = calloc(title_info->chapter_count, sizeof(BLURAY_TITLE_CHAPTER)); + if (!title_info->chapters) { + goto error; + } + for (ii = 0; ii < title_info->chapter_count; ii++) { + title_info->chapters[ii].idx = ii; + title_info->chapters[ii].start = (uint64_t)title->chap_list.mark[ii].title_time * 2; + title_info->chapters[ii].duration = (uint64_t)title->chap_list.mark[ii].duration * 2; + title_info->chapters[ii].offset = (uint64_t)title->chap_list.mark[ii].title_pkt * 192L; + title_info->chapters[ii].clip_ref = title->chap_list.mark[ii].clip_ref; + } } title_info->mark_count = title->mark_list.count; - title_info->marks = calloc(title_info->mark_count, sizeof(BLURAY_TITLE_MARK)); - for (ii = 0; ii < title_info->mark_count; ii++) { - title_info->marks[ii].idx = ii; - title_info->marks[ii].type = title->mark_list.mark[ii].mark_type; - title_info->marks[ii].start = (uint64_t)title->mark_list.mark[ii].title_time * 2; - title_info->marks[ii].duration = (uint64_t)title->mark_list.mark[ii].duration * 2; - title_info->marks[ii].offset = (uint64_t)title->mark_list.mark[ii].title_pkt * 192L; - title_info->marks[ii].clip_ref = title->mark_list.mark[ii].clip_ref; + if (title_info->mark_count) { + title_info->marks = calloc(title_info->mark_count, sizeof(BLURAY_TITLE_MARK)); + if (!title_info->marks) { + goto error; + } + for (ii = 0; ii < title_info->mark_count; ii++) { + title_info->marks[ii].idx = ii; + title_info->marks[ii].type = title->mark_list.mark[ii].mark_type; + title_info->marks[ii].start = (uint64_t)title->mark_list.mark[ii].title_time * 2; + title_info->marks[ii].duration = (uint64_t)title->mark_list.mark[ii].duration * 2; + title_info->marks[ii].offset = (uint64_t)title->mark_list.mark[ii].title_pkt * 192L; + title_info->marks[ii].clip_ref = title->mark_list.mark[ii].clip_ref; + } } title_info->clip_count = title->clip_list.count; - title_info->clips = calloc(title_info->clip_count, sizeof(BLURAY_CLIP_INFO)); - for (ii = 0; ii < title_info->clip_count; ii++) { - MPLS_PI *pi = &title->pl->play_item[ii]; - BLURAY_CLIP_INFO *ci = &title_info->clips[ii]; - NAV_CLIP *nc = &title->clip_list.clip[ii]; - - ci->pkt_count = nc->end_pkt - nc->start_pkt; - ci->start_time = (uint64_t)nc->title_time * 2; - ci->in_time = (uint64_t)pi->in_time * 2; - ci->out_time = (uint64_t)pi->out_time * 2; - ci->still_mode = pi->still_mode; - ci->still_time = pi->still_time; - ci->video_stream_count = pi->stn.num_video; - ci->audio_stream_count = pi->stn.num_audio; - ci->pg_stream_count = pi->stn.num_pg + pi->stn.num_pip_pg; - ci->ig_stream_count = pi->stn.num_ig; - ci->sec_video_stream_count = pi->stn.num_secondary_video; - ci->sec_audio_stream_count = pi->stn.num_secondary_audio; - ci->video_streams = calloc(ci->video_stream_count, sizeof(BLURAY_STREAM_INFO)); - ci->audio_streams = calloc(ci->audio_stream_count, sizeof(BLURAY_STREAM_INFO)); - ci->pg_streams = calloc(ci->pg_stream_count, sizeof(BLURAY_STREAM_INFO)); - ci->ig_streams = calloc(ci->ig_stream_count, sizeof(BLURAY_STREAM_INFO)); - ci->sec_video_streams = calloc(ci->sec_video_stream_count, sizeof(BLURAY_STREAM_INFO)); - ci->sec_audio_streams = calloc(ci->sec_audio_stream_count, sizeof(BLURAY_STREAM_INFO)); - _copy_streams(nc, ci->video_streams, pi->stn.video, ci->video_stream_count); - _copy_streams(nc, ci->audio_streams, pi->stn.audio, ci->audio_stream_count); - _copy_streams(nc, ci->pg_streams, pi->stn.pg, ci->pg_stream_count); - _copy_streams(nc, ci->ig_streams, pi->stn.ig, ci->ig_stream_count); - _copy_streams(nc, ci->sec_video_streams, pi->stn.secondary_video, ci->sec_video_stream_count); - _copy_streams(nc, ci->sec_audio_streams, pi->stn.secondary_audio, ci->sec_audio_stream_count); + if (title_info->clip_count) { + title_info->clips = calloc(title_info->clip_count, sizeof(BLURAY_CLIP_INFO)); + if (!title_info->clips) { + goto error; + } + for (ii = 0; ii < title_info->clip_count; ii++) { + MPLS_PI *pi = &title->pl->play_item[ii]; + BLURAY_CLIP_INFO *ci = &title_info->clips[ii]; + NAV_CLIP *nc = &title->clip_list.clip[ii]; + + memcpy(ci->clip_id, pi->clip->clip_id, sizeof(ci->clip_id)); + ci->pkt_count = nc->end_pkt - nc->start_pkt; + ci->start_time = (uint64_t)nc->title_time * 2; + ci->in_time = (uint64_t)pi->in_time * 2; + ci->out_time = (uint64_t)pi->out_time * 2; + ci->still_mode = pi->still_mode; + ci->still_time = pi->still_time; + ci->video_stream_count = pi->stn.num_video; + ci->audio_stream_count = pi->stn.num_audio; + ci->pg_stream_count = pi->stn.num_pg + pi->stn.num_pip_pg; + ci->ig_stream_count = pi->stn.num_ig; + ci->sec_video_stream_count = pi->stn.num_secondary_video; + ci->sec_audio_stream_count = pi->stn.num_secondary_audio; + if (!_copy_streams(nc, &ci->video_streams, pi->stn.video, ci->video_stream_count) || + !_copy_streams(nc, &ci->audio_streams, pi->stn.audio, ci->audio_stream_count) || + !_copy_streams(nc, &ci->pg_streams, pi->stn.pg, ci->pg_stream_count) || + !_copy_streams(nc, &ci->ig_streams, pi->stn.ig, ci->ig_stream_count) || + !_copy_streams(nc, &ci->sec_video_streams, pi->stn.secondary_video, ci->sec_video_stream_count) || + !_copy_streams(nc, &ci->sec_audio_streams, pi->stn.secondary_audio, ci->sec_audio_stream_count)) { + + goto error; + } + } } return title_info; + + error: + BD_DEBUG(DBG_CRIT, "Out of memory\n"); + bd_free_title_info(title_info); + return NULL; } static BLURAY_TITLE_INFO *_get_title_info(BLURAY *bd, uint32_t title_idx, uint32_t playlist, const char *mpls_name, @@ -2606,6 +2686,11 @@ NAV_TITLE *title; BLURAY_TITLE_INFO *title_info; + /* current title ? => no need to load mpls file */ + if (bd->title && bd->title->angle == angle && !strcmp(bd->title->name, mpls_name)) { + return _fill_title_info(bd->title, title_idx, playlist); + } + title = nav_title_open(bd->disc, mpls_name, angle); if (title == NULL) { BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Unable to open title %s!\n", mpls_name); @@ -2614,7 +2699,7 @@ title_info = _fill_title_info(title, title_idx, playlist); - nav_title_close(title); + nav_title_close(&title); return title_info; } @@ -2637,9 +2722,14 @@ BLURAY_TITLE_INFO* bd_get_playlist_info(BLURAY *bd, uint32_t playlist, unsigned angle) { - char *f_name = str_printf("%05d.mpls", playlist); + char *f_name; BLURAY_TITLE_INFO *title_info; + f_name = str_printf("%05d.mpls", playlist); + if (!f_name) { + return NULL; + } + title_info = _get_title_info(bd, 0, playlist, f_name, angle); X_FREE(f_name); @@ -2651,18 +2741,22 @@ { unsigned int ii; - X_FREE(title_info->chapters); - X_FREE(title_info->marks); - for (ii = 0; ii < title_info->clip_count; ii++) { - X_FREE(title_info->clips[ii].video_streams); - X_FREE(title_info->clips[ii].audio_streams); - X_FREE(title_info->clips[ii].pg_streams); - X_FREE(title_info->clips[ii].ig_streams); - X_FREE(title_info->clips[ii].sec_video_streams); - X_FREE(title_info->clips[ii].sec_audio_streams); + if (title_info) { + X_FREE(title_info->chapters); + X_FREE(title_info->marks); + if (title_info->clips) { + for (ii = 0; ii < title_info->clip_count; ii++) { + X_FREE(title_info->clips[ii].video_streams); + X_FREE(title_info->clips[ii].audio_streams); + X_FREE(title_info->clips[ii].pg_streams); + X_FREE(title_info->clips[ii].ig_streams); + X_FREE(title_info->clips[ii].sec_video_streams); + X_FREE(title_info->clips[ii].sec_audio_streams); + } + X_FREE(title_info->clips); + } + X_FREE(title_info); } - X_FREE(title_info->clips); - X_FREE(title_info); } /* @@ -2694,18 +2788,27 @@ bd_mutex_lock(&bd->mutex); bd->decode_pg = !!value; - result = bd_psr_write_bits(bd->regs, PSR_PG_STREAM, - (!!value) << 31, - 0x80000000); + result = !bd_psr_write_bits(bd->regs, PSR_PG_STREAM, + (!!value) << 31, + 0x80000000); bd_mutex_unlock(&bd->mutex); return result; } + if (idx == BLURAY_PLAYER_SETTING_PERSISTENT_STORAGE) { + if (bd->title_type != title_undef) { + BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Can't disable persistent storage during playback\n"); + return 0; + } + bd->bdjstorage.no_persistent_storage = !value; + return 1; + } + for (i = 0; i < sizeof(map) / sizeof(map[0]); i++) { if (idx == map[i].idx) { bd_mutex_lock(&bd->mutex); - result = !bd_psr_setting_write(bd->regs, idx, value); + result = !bd_psr_setting_write(bd->regs, map[i].psr, value); bd_mutex_unlock(&bd->mutex); return result; } @@ -2725,27 +2828,22 @@ case BLURAY_PLAYER_SETTING_COUNTRY_CODE: return bd_set_player_setting(bd, idx, str_to_uint32(s, 2)); -#ifdef USING_BDJAVA case BLURAY_PLAYER_CACHE_ROOT: + bd_mutex_lock(&bd->mutex); + X_FREE(bd->bdjstorage.cache_root); + bd->bdjstorage.cache_root = str_dup(s); + bd_mutex_unlock(&bd->mutex); + BD_DEBUG(DBG_BDJ, "Cache root dir set to %s\n", bd->bdjstorage.cache_root); + return 1; + case BLURAY_PLAYER_PERSISTENT_ROOT: - switch (idx) { - case BLURAY_PLAYER_CACHE_ROOT: - bd_mutex_lock(&bd->mutex); - X_FREE(bd->bdjstorage.cache_root); - bd->bdjstorage.cache_root = str_dup(s); - bd_mutex_unlock(&bd->mutex); - BD_DEBUG(DBG_BDJ, "Cache root dir set to %s\n", bd->bdjstorage.cache_root); - return 1; - - case BLURAY_PLAYER_PERSISTENT_ROOT: - bd_mutex_lock(&bd->mutex); - X_FREE(bd->bdjstorage.persistent_root); - bd->bdjstorage.persistent_root = str_dup(s); - bd_mutex_unlock(&bd->mutex); - BD_DEBUG(DBG_BDJ, "Persistent root dir set to %s\n", bd->bdjstorage.persistent_root); - return 1; - } -#endif /* USING_BDJAVA */ + bd_mutex_lock(&bd->mutex); + X_FREE(bd->bdjstorage.persistent_root); + bd->bdjstorage.persistent_root = str_dup(s); + bd_mutex_unlock(&bd->mutex); + BD_DEBUG(DBG_BDJ, "Persistent root dir set to %s\n", bd->bdjstorage.persistent_root); + return 1; + default: return 0; } @@ -2756,6 +2854,9 @@ bd_mutex_lock(&bd->mutex); switch (stream_type) { + case BLURAY_AUDIO_STREAM: + bd_psr_write(bd->regs, PSR_PRIMARY_AUDIO_ID, stream_id & 0xff); + break; case BLURAY_PG_TEXTST_STREAM: bd_psr_write_bits(bd->regs, PSR_PG_STREAM, ((!!enable_flag)<<31) | (stream_id & 0xfff), @@ -2819,6 +2920,17 @@ * Navigation mode interface */ +static void _set_scr(BLURAY *bd, int64_t pts) +{ + if (pts >= 0) { + uint32_t tick = (uint32_t)(((uint64_t)pts) >> 1); + _update_time_psr(bd, tick); + + } else if (!bd->app_scr) { + _update_time_psr_from_stream(bd); + } +} + static void _process_psr_restore_event(BLURAY *bd, BD_PSR_EVENT *ev) { /* PSR restore events are handled internally. @@ -2846,7 +2958,7 @@ bd_seek_playitem(bd, ev->new_val); return; case PSR_TIME: - bd_seek_time(bd, ((int64_t)ev->new_val) << 1); + _clip_seek_time(bd, ev->new_val); _init_ig_stream(bd); _run_gc(bd, GC_CTRL_INIT_MENU, 0); return; @@ -2891,10 +3003,6 @@ _bdj_event (bd, BDJ_EVENT_PLAYITEM,ev->new_val); _queue_event(bd, BD_EVENT_PLAYITEM, ev->new_val); break; - case PSR_CHAPTER: - _bdj_event (bd, BDJ_EVENT_CHAPTER, ev->new_val); - _queue_event(bd, BD_EVENT_CHAPTER, ev->new_val); - break; case PSR_TIME: _bdj_event (bd, BDJ_EVENT_PTS, ev->new_val); break; @@ -2924,6 +3032,13 @@ disc_event(bd->disc, DISC_EVENT_TITLE, ev->new_val); break; + case PSR_CHAPTER: + _bdj_event (bd, BDJ_EVENT_CHAPTER, ev->new_val); + if (ev->new_val != 0xffff) { + _queue_event(bd, BD_EVENT_CHAPTER, ev->new_val); + } + break; + /* stream selection */ case PSR_IG_STREAM_ID: @@ -3076,6 +3191,11 @@ return 0; } + if (bd->disc_info.no_menu_support) { + BD_DEBUG(DBG_BLURAY | DBG_CRIT, "bd_play(): no menu support\n"); + return 0; + } + /* first play object ? */ if (title == BLURAY_TITLE_FIRST_PLAY) { @@ -3138,7 +3258,7 @@ return 0; } -#ifdef USING_BDJAVA +/* BD-J callback */ int bd_play_title_internal(BLURAY *bd, unsigned title) { /* used by BD-J. Like bd_play_title() but bypasses UO mask checks. */ @@ -3148,7 +3268,6 @@ bd_mutex_unlock(&bd->mutex); return ret; } -#endif int bd_play(BLURAY *bd) { @@ -3165,7 +3284,7 @@ } if (!bd->event_queue) { - _init_event_queue(bd); + bd->event_queue = event_queue_new(sizeof(BD_EVENT)); bd_psr_lock(bd->regs); bd_psr_register_cb(bd->regs, _process_psr_event, bd); @@ -3203,6 +3322,12 @@ int bd_play_title(BLURAY *bd, unsigned title) { int ret; + + if (title == BLURAY_TITLE_TOP_MENU) { + /* menu call uses different UO mask */ + return bd_menu_call(bd, -1); + } + bd_mutex_lock(&bd->mutex); ret = _try_play_title(bd, title); bd_mutex_unlock(&bd->mutex); @@ -3211,9 +3336,7 @@ static int _try_menu_call(BLURAY *bd, int64_t pts) { - if (pts >= 0) { - bd_psr_write(bd->regs, PSR_TIME, (uint32_t)(((uint64_t)pts) >> 1)); - } + _set_scr(bd, pts); if (bd->title_type == title_undef) { BD_DEBUG(DBG_BLURAY | DBG_CRIT, "bd_menu_call(): bd_play() not called\n"); @@ -3375,7 +3498,6 @@ return 0; } -#ifdef USING_BDJAVA if (bd->title_type == title_bdj) { if (bd->end_of_playlist == 1) { _bdj_event(bd, BDJ_EVENT_END_OF_PLAYLIST, bd_psr_read(bd->regs, PSR_PLAYLIST)); @@ -3394,7 +3516,6 @@ return 0; } } -#endif int bytes = _bd_read(bd, buf, len); @@ -3425,7 +3546,7 @@ int bd_get_event(BLURAY *bd, BD_EVENT *event) { if (!bd->event_queue) { - _init_event_queue(bd); + bd->event_queue = event_queue_new(sizeof(BD_EVENT)); bd_psr_register_cb(bd->regs, _process_psr_event, bd); _queue_initial_psr_events(bd); @@ -3442,22 +3563,41 @@ * user interaction */ -static void _set_scr(BLURAY *bd, int64_t pts) +void bd_set_scr(BLURAY *bd, int64_t pts) { - if (pts >= 0) { - bd_psr_write(bd->regs, PSR_TIME, (uint32_t)(((uint64_t)pts) >> 1)); + bd_mutex_lock(&bd->mutex); + bd->app_scr = 1; + _set_scr(bd, pts); + bd_mutex_unlock(&bd->mutex); +} + +static int _set_rate(BLURAY *bd, uint32_t rate) +{ + if (!bd->title) { + return -1; } + + if (bd->title_type == title_bdj) { + return _bdj_event(bd, BDJ_EVENT_RATE, rate); + } + + return 0; } -void bd_set_scr(BLURAY *bd, int64_t pts) +int bd_set_rate(BLURAY *bd, uint32_t rate) { + int result; + bd_mutex_lock(&bd->mutex); - _set_scr(bd, pts); + result = _set_rate(bd, rate); bd_mutex_unlock(&bd->mutex); + + return result; } int bd_mouse_select(BLURAY *bd, int64_t pts, uint16_t x, uint16_t y) { + uint32_t param = (x << 16) | y; int result = -1; bd_mutex_lock(&bd->mutex); @@ -3465,7 +3605,9 @@ _set_scr(bd, pts); if (bd->title_type == title_hdmv) { - result = _run_gc(bd, GC_CTRL_MOUSE_MOVE, (x << 16) | y); + result = _run_gc(bd, GC_CTRL_MOUSE_MOVE, param); + } else if (bd->title_type == title_bdj) { + result = _bdj_event(bd, BDJ_EVENT_MOUSE, param); } bd_mutex_unlock(&bd->mutex); @@ -3477,16 +3619,18 @@ { int result = -1; + if (key == BD_VK_ROOT_MENU) { + return bd_menu_call(bd, pts); + } + bd_mutex_lock(&bd->mutex); _set_scr(bd, pts); if (bd->title_type == title_hdmv) { result = _run_gc(bd, GC_CTRL_VK_KEY, key); -#ifdef USING_BDJAVA } else if (bd->title_type == title_bdj) { result = _bdj_event(bd, BDJ_EVENT_VK_KEY, key); -#endif } bd_mutex_unlock(&bd->mutex); @@ -3513,7 +3657,6 @@ void bd_register_argb_overlay_proc(BLURAY *bd, void *handle, bd_argb_overlay_proc_f func, BD_ARGB_BUFFER *buf) { -#ifdef USING_BDJAVA if (!bd) { return; } @@ -3525,12 +3668,6 @@ bd->argb_buffer = buf; bd_mutex_unlock(&bd->argb_buffer_mutex); -#else - (void)bd; - (void)handle; - (void)func; - (void)buf; -#endif } int bd_get_sound_effect(BLURAY *bd, unsigned sound_id, BLURAY_SOUND_EFFECT *effect) @@ -3561,7 +3698,37 @@ } /* - * + * Direct file access + */ + +static int _bd_read_file(BLURAY *bd, const char *dir, const char *file, void **data, int64_t *size) +{ + if (!bd || !bd->disc || !file || !data || !size) { + BD_DEBUG(DBG_CRIT, "Invalid arguments for bd_read_file()\n"); + return 0; + } + + *data = NULL; + *size = (int64_t)disc_read_file(bd->disc, dir, file, (uint8_t**)data); + if (!*data || *size < 0) { + BD_DEBUG(DBG_BLURAY, "bd_read_file() failed\n"); + X_FREE(*data); + return 0; + } + + BD_DEBUG(DBG_BLURAY, "bd_read_file(): read %"PRId64" bytes from %s"DIR_SEP"%s\n", + *size, dir, file); + return 1; +} + +int bd_read_file(BLURAY *bd, const char *path, void **data, int64_t *size) +{ + return _bd_read_file(bd, NULL, path, data, size); +} + + +/* + * Metadata */ const struct meta_dl *bd_get_meta(BLURAY *bd) @@ -3573,7 +3740,7 @@ } if (!bd->meta) { - _meta_open(bd); + bd->meta = meta_parse(bd->disc); } uint32_t psr_menu_lang = bd_psr_read(bd->regs, PSR_MENU_LANG); @@ -3593,11 +3760,23 @@ bd->titles[meta->toc_entries[ii].title_number]->name = meta->toc_entries[ii].title_name; } } + bd->disc_info.disc_name = meta->di_name; } return meta; } +int bd_get_meta_file(BLURAY *bd, const char *name, void **data, int64_t *size) +{ + return _bd_read_file(bd, DIR_SEP "BDMV" DIR_SEP "META" DIR_SEP "DL", name, data, size); +} + +/* + * Database access + */ + +#include "bdnav/mpls_parse.h" + struct clpi_cl *bd_get_clpi(BLURAY *bd, unsigned clip_ref) { if (bd->title && clip_ref < bd->title->clip_list.count) { @@ -3614,7 +3793,7 @@ void bd_free_clpi(struct clpi_cl *cl) { - clpi_free(cl); + clpi_free(&cl); } struct mpls_pl *bd_read_mpls(const char *mpls_file) @@ -3624,7 +3803,7 @@ void bd_free_mpls(struct mpls_pl *pl) { - mpls_free(pl); + mpls_free(&pl); } struct mobj_objects *bd_read_mobj(const char *mobj_file) @@ -3639,19 +3818,10 @@ struct bdjo_data *bd_read_bdjo(const char *bdjo_file) { -#ifdef USING_BDJAVA return bdjo_parse(bdjo_file); -#else - (void)bdjo_file; - return NULL; -#endif } void bd_free_bdjo(struct bdjo_data *obj) { -#ifdef USING_BDJAVA bdjo_free(&obj); -#else - (void)obj; -#endif } diff -Nru libbluray-0.8.1/src/libbluray/bluray.h libbluray-1.0.1/src/libbluray/bluray.h --- libbluray-0.8.1/src/libbluray/bluray.h 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/bluray.h 2017-06-23 13:34:44.000000000 +0000 @@ -69,38 +69,33 @@ typedef struct { uint8_t bluray_detected; + /* Disc ID */ + const char *disc_name; /* optional disc name in preferred language */ + const char *udf_volume_id; /* optional UDF volume identifier */ + uint8_t disc_id[20]; + + /* HDMV / BD-J titles */ + uint8_t no_menu_support; /* 1 if this disc can't be played using on-disc menus */ uint8_t first_play_supported; uint8_t top_menu_supported; + uint32_t num_titles; + const BLURAY_TITLE *const *titles; /* index is title number 1 ... N */ + const BLURAY_TITLE *first_play; /* titles[N+1]. NULL if not present on the disc. */ + const BLURAY_TITLE *top_menu; /* titles[0]. NULL if not present on the disc. */ + uint32_t num_hdmv_titles; uint32_t num_bdj_titles; uint32_t num_unsupported_titles; - uint8_t aacs_detected; - uint8_t libaacs_detected; - uint8_t aacs_handled; - - uint8_t bdplus_detected; - uint8_t libbdplus_detected; - uint8_t bdplus_handled; - - /* aacs error code */ - int aacs_error_code; - /* aacs MKB version */ - int aacs_mkbv; - - /* Disc ID */ - uint8_t disc_id[20]; - + /* BD-J info (valid only if disc uses BD-J) */ uint8_t bdj_detected; /* 1 if disc uses BD-J */ - uint8_t bdj_supported; /* 1 if BD-J support was compiled in */ + uint8_t bdj_supported; /* (deprecated) */ uint8_t libjvm_detected; /* 1 if usable Java VM was found */ uint8_t bdj_handled; /* 1 if usable Java VM + libbluray.jar was found */ - /* BD+ content code generation */ - uint8_t bdplus_gen; - /* BD+ content code relese date */ - uint32_t bdplus_date; /* (year << 16) | (month << 8) | day */ + char bdj_org_id[9]; /* (BD-J) disc organization ID */ + char bdj_disc_id[33]; /* (BD-J) disc ID */ /* disc application info */ uint8_t video_format; /* bd_video_format_e */ @@ -109,16 +104,22 @@ uint8_t initial_output_mode_preference; /* 0 - 2D, 1 - 3D */ uint8_t provider_data[32]; - /* HDMV / BD-J titles */ - uint32_t num_titles; - const BLURAY_TITLE *const *titles; /* index is title number 1 ... N */ - const BLURAY_TITLE *first_play; /* titles[N+1]. NULL if not present on the disc. */ - const BLURAY_TITLE *top_menu; /* titles[0]. NULL if not present on the disc. */ + /* AACS info (valid only if disc uses AACS) */ + uint8_t aacs_detected; /* 1 if disc is using AACS encoding */ + uint8_t libaacs_detected; /* 1 if usable AACS decoding library was found */ + uint8_t aacs_handled; /* 1 if disc is using supported AACS encoding */ + + int aacs_error_code; /* AACS error code (BD_AACS_*) */ + int aacs_mkbv; /* AACS MKB version */ + + /* BD+ info (valid only if disc uses BD+) */ + uint8_t bdplus_detected; /* 1 if disc is using BD+ encoding */ + uint8_t libbdplus_detected; /* 1 if usable BD+ decoding library was found */ + uint8_t bdplus_handled; /* 1 if disc is using supporred BD+ encoding */ - char bdj_org_id[9]; /* (BD-J) disc organization ID */ - char bdj_disc_id[33]; /* (BD-J) disc ID */ + uint8_t bdplus_gen; /* BD+ content code generation */ + uint32_t bdplus_date; /* BD+ content code relese date ((year<<16)|(month<<8)|day) */ - const char *udf_volume_id; /* optional UDF volume identifier */ } BLURAY_DISC_INFO; /* @@ -204,6 +205,11 @@ BLURAY_STILL_INFINITE = 0x02, } bd_still_mode_e; +typedef enum { + BLURAY_MARK_ENTRY = 0x01, /* entry mark for chapter search */ + BLURAY_MARK_LINK = 0x02, /* link point */ +} bd_mark_type_e; + typedef struct bd_stream_info { uint8_t coding_type; uint8_t format; @@ -232,39 +238,39 @@ BLURAY_STREAM_INFO *sec_audio_streams; BLURAY_STREAM_INFO *sec_video_streams; - uint64_t start_time; - uint64_t in_time; - uint64_t out_time; + uint64_t start_time; /* start media time, 90kHz, ("playlist time") */ + uint64_t in_time; /* start timestamp, 90kHz */ + uint64_t out_time; /* end timestamp, 90kHz */ + char clip_id[6]; } BLURAY_CLIP_INFO; typedef struct bd_chapter { uint32_t idx; - uint64_t start; - uint64_t duration; - uint64_t offset; + uint64_t start; /* start media time, 90kHz, ("playlist time") */ + uint64_t duration; /* duration */ + uint64_t offset; /* distance from title start, bytes */ unsigned clip_ref; } BLURAY_TITLE_CHAPTER; typedef struct bd_mark { uint32_t idx; - int type; - uint64_t start; - uint64_t duration; - uint64_t offset; + int type; /* bd_mark_type_e */ + uint64_t start; /* mark media time, 90kHz, ("playlist time") */ + uint64_t duration; /* time to next mark */ + uint64_t offset; /* mark distance from title start, bytes */ unsigned clip_ref; } BLURAY_TITLE_MARK; typedef struct bd_title_info { - uint32_t idx; + uint32_t idx; /* filled only with bd_get_title_info() */ uint32_t playlist; uint64_t duration; uint32_t clip_count; uint8_t angle_count; uint32_t chapter_count; + uint32_t mark_count; BLURAY_CLIP_INFO *clips; BLURAY_TITLE_CHAPTER *chapters; - - uint32_t mark_count; BLURAY_TITLE_MARK *marks; } BLURAY_TITLE_INFO; @@ -332,6 +338,22 @@ int (*read_blocks)(void *handle, void *buf, int lba, int num_blocks)); /** + * Open BluRay disc + * + * @param bd BLURAY object + * @param handle opaque handle for open_dir and open_file + * @param open_dir function used to open a directory + * @param open_file function used to open a file + * @return 1 on success, 0 if error + */ +struct bd_dir_s; +struct bd_file_s; +int bd_open_files(BLURAY *bd, + void *handle, + struct bd_dir_s *(*open_dir)(void *handle, const char *rel_path), + struct bd_file_s *(*open_file)(void *handle, const char *rel_path)); + +/** * Close BluRay disc * * @param bd BLURAY object @@ -355,12 +377,29 @@ * If information is provided in multiple languages, currently * selected language (BLURAY_PLAYER_SETTING_MENU_LANG) is used. * + * Referenced thumbnail images should be read with bd_get_meta_file(). + * * @param bd BLURAY object * @return META_DL (disclib) object, NULL on error */ struct meta_dl; const struct meta_dl *bd_get_meta(BLURAY *bd); +/** + * + * Read metadata file from BluRay disc. + * + * Allocate large enough memory block and read file contents. + * Caller must free the memory block with free(). + * + * @param bd BLURAY object + * @param file_name name of metadata file + * @param data where to store pointer to file data + * @param size where to store file size + * @return 1 on success, 0 on error + */ +int bd_get_meta_file(BLURAY *bd, const char *file_name, void **data, int64_t *size); + /* * Title selection without on-disc menus @@ -527,15 +566,25 @@ * * Select stream (PG / TextST track) * + * When playing with on-disc menus: + * + * Stream selection is controlled by on-disc menus. + * If user can change stream selection also in player GUI, this function + * should be used to keep on-disc menus in sync with player GUI. + * + * When playing the disc without on-disc menus: + * + * Initial stream selection is done using preferred language settings. * This function can be used to override automatic stream selection. - * Selecting the stream is useful only when using libbluray internal decoders - * or stream is stored in a sub-path. + * Without on-disc menus selecting the stream is useful only when using + * libbluray internal decoders or the stream is stored in a sub-path. * * @param bd BLURAY object * @param stream_type BLURAY_*_STREAM * @param stream_id stream number (1..N) * @param enable_flag set to 0 to disable streams of this type */ +#define BLURAY_AUDIO_STREAM 0 #define BLURAY_PG_TEXTST_STREAM 1 void bd_select_stream(BLURAY *bd, uint32_t stream_type, uint32_t stream_id, uint32_t enable_flag); @@ -622,9 +671,11 @@ BLURAY_PLAYER_SETTING_TEXT_CAP = 30, /* Text Subtitle capability. Bit mask. */ BLURAY_PLAYER_SETTING_PLAYER_PROFILE = 31, /* Player profile and version. */ - BLURAY_PLAYER_SETTING_DECODE_PG = 0x100, /* Enable/disable PG (subtitle) decoder. Integer. */ - BLURAY_PLAYER_PERSISTENT_ROOT = 400, /* Root path to the BD_J persistent storage location. String. */ - BLURAY_PLAYER_CACHE_ROOT = 401, /* Root path to the BD_J cache storage location. String. */ + BLURAY_PLAYER_SETTING_DECODE_PG = 0x100, /* Enable/disable PG (subtitle) decoder. Integer. Default: disabled. */ + BLURAY_PLAYER_SETTING_PERSISTENT_STORAGE = 0x101, /* Enable/disable BD-J persistent storage. Integer. Default: enabled. */ + + BLURAY_PLAYER_PERSISTENT_ROOT = 0x200, /* Root path to the BD_J persistent storage location. String. */ + BLURAY_PLAYER_CACHE_ROOT = 0x201, /* Root path to the BD_J cache storage location. String. */ } bd_player_setting; /** @@ -649,7 +700,7 @@ typedef enum { - BD_EVENT_NONE = 0, /* no pending events */ + BD_EVENT_NONE = 0, /* no pending events */ /* * errors @@ -668,64 +719,65 @@ BD_EVENT_PLAYLIST = 6, /* current playlist (xxxxx.mpls) */ BD_EVENT_PLAYITEM = 7, /* current play item, 0...N-1 */ BD_EVENT_CHAPTER = 8, /* current chapter, 1...N */ - BD_EVENT_PLAYMARK = 30, /* playmark reached */ - BD_EVENT_END_OF_TITLE = 9, + BD_EVENT_PLAYMARK = 9, /* playmark reached */ + BD_EVENT_END_OF_TITLE = 10, /* * stream selection */ - BD_EVENT_AUDIO_STREAM = 10, /* 1..32, 0xff = none */ - BD_EVENT_IG_STREAM = 11, /* 1..32 */ - BD_EVENT_PG_TEXTST_STREAM = 12, /* 1..255, 0xfff = none */ - BD_EVENT_PIP_PG_TEXTST_STREAM = 13, /* 1..255, 0xfff = none */ - BD_EVENT_SECONDARY_AUDIO_STREAM = 14, /* 1..32, 0xff = none */ - BD_EVENT_SECONDARY_VIDEO_STREAM = 15, /* 1..32, 0xff = none */ - - BD_EVENT_PG_TEXTST = 16, /* 0 - disable, 1 - enable */ - BD_EVENT_PIP_PG_TEXTST = 17, /* 0 - disable, 1 - enable */ - BD_EVENT_SECONDARY_AUDIO = 18, /* 0 - disable, 1 - enable */ - BD_EVENT_SECONDARY_VIDEO = 19, /* 0 - disable, 1 - enable */ - BD_EVENT_SECONDARY_VIDEO_SIZE = 20, /* 0 - PIP, 0xf - fullscreen */ + BD_EVENT_AUDIO_STREAM = 11, /* 1..32, 0xff = none */ + BD_EVENT_IG_STREAM = 12, /* 1..32 */ + BD_EVENT_PG_TEXTST_STREAM = 13, /* 1..255, 0xfff = none */ + BD_EVENT_PIP_PG_TEXTST_STREAM = 14, /* 1..255, 0xfff = none */ + BD_EVENT_SECONDARY_AUDIO_STREAM = 15, /* 1..32, 0xff = none */ + BD_EVENT_SECONDARY_VIDEO_STREAM = 16, /* 1..32, 0xff = none */ + + BD_EVENT_PG_TEXTST = 17, /* 0 - disable, 1 - enable */ + BD_EVENT_PIP_PG_TEXTST = 18, /* 0 - disable, 1 - enable */ + BD_EVENT_SECONDARY_AUDIO = 19, /* 0 - disable, 1 - enable */ + BD_EVENT_SECONDARY_VIDEO = 20, /* 0 - disable, 1 - enable */ + BD_EVENT_SECONDARY_VIDEO_SIZE = 21, /* 0 - PIP, 0xf - fullscreen */ /* * playback control */ /* HDMV VM or JVM stopped playlist playback. Flush all buffers. */ - BD_EVENT_PLAYLIST_STOP = 31, + BD_EVENT_PLAYLIST_STOP = 22, /* discontinuity in the stream (non-seamless connection). Reset demuxer PES buffers. */ - BD_EVENT_DISCONTINUITY = 28, /* new timestamp (45 kHz) */ + BD_EVENT_DISCONTINUITY = 23, /* new timestamp (45 kHz) */ /* HDMV VM or JVM seeked the stream. Next read() will return data from new position. Flush all buffers. */ - BD_EVENT_SEEK = 21, + BD_EVENT_SEEK = 24, /* new media time (45 kHz) */ /* still playback (pause) */ - BD_EVENT_STILL = 22, /* 0 - off, 1 - on */ + BD_EVENT_STILL = 25, /* 0 - off, 1 - on */ /* Still playback for n seconds (reached end of still mode play item). * Playback continues by calling bd_read_skip_still(). */ - BD_EVENT_STILL_TIME = 23, /* 0 = infinite ; 1...300 = seconds */ + BD_EVENT_STILL_TIME = 26, /* 0 = infinite ; 1...300 = seconds */ /* Play sound effect */ - BD_EVENT_SOUND_EFFECT = 24, /* effect ID */ + BD_EVENT_SOUND_EFFECT = 27, /* effect ID */ /* * status */ - /* Nothing to do. Playlist is not playing, but title applet is running. */ - BD_EVENT_IDLE = 29, + /* Nothing to do. Playlist is not playing, but title applet is running. + * Application should not call bd_read*() immediately again to avoid busy loop. */ + BD_EVENT_IDLE = 28, /* Pop-Up menu available */ - BD_EVENT_POPUP = 25, /* 0 - no, 1 - yes */ + BD_EVENT_POPUP = 29, /* 0 - no, 1 - yes */ /* Interactive menu visible */ - BD_EVENT_MENU = 26, /* 0 - no, 1 - yes */ + BD_EVENT_MENU = 30, /* 0 - no, 1 - yes */ /* 3D */ - BD_EVENT_STEREOSCOPIC_STATUS = 27, /* 0 - 2D, 1 - 3D */ + BD_EVENT_STEREOSCOPIC_STATUS = 31, /* 0 - 2D, 1 - 3D */ /* BD-J key interest table changed */ BD_EVENT_KEY_INTEREST_TABLE = 32, /* bitmask, BLURAY_KIT_* */ @@ -933,9 +985,25 @@ /** * - * Pass user input to graphics controller. + * Set current playback rate. + * + * Notify BD-J media player when user changes playback rate + * (ex. pauses playback). + * Changing rate may fail if corresponding UO is masked or + * playlist is not playing. + * + * @param bd BLURAY object + * @param rate current playback rate * 90000 (0 = paused, 90000 = normal) + * @return <0 on error, 0 on success + */ +#define BLURAY_RATE_PAUSED 0 +#define BLURAY_RATE_NORMAL 90000 +int bd_set_rate(BLURAY *bd, uint32_t rate); + +/** + * + * Pass user input to graphics controller or BD-J. * Keys are defined in libbluray/keys.h. - * Current pts can be updated by using BD_VK_NONE key. This is required for animated menus. * * @param bd BLURAY object * @param pts current playback position (1/90000s) or -1 @@ -948,6 +1016,8 @@ * * Select menu button at location (x,y). * + * This function has no effect with BD-J menus. + * * @param bd BLURAY object * @param pts current playback position (1/90000s) or -1 * @param x mouse pointer x-position @@ -1001,6 +1071,21 @@ int bd_start_bdj(BLURAY *bd, const char* start_object); // start BD-J from the specified BD-J object (should be a 5 character string) void bd_stop_bdj(BLURAY *bd); // shutdown BD-J and clean up resources +/** + * + * Read a file from BluRay Virtual File System. + * + * Allocate large enough memory block and read file contents. + * Caller must free the memory block with free(). + * + * @param bd BLURAY object + * @param file_name path to the file (relative to disc root) + * @param data where to store pointer to allocated data + * @param size where to store file size + * @return 1 on success, 0 on error + */ +int bd_read_file(BLURAY *, const char *path, void **data, int64_t *size); + #ifdef __cplusplus } diff -Nru libbluray-0.8.1/src/libbluray/decoders/graphics_controller.c libbluray-1.0.1/src/libbluray/decoders/graphics_controller.c --- libbluray-0.8.1/src/libbluray/decoders/graphics_controller.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/decoders/graphics_controller.c 2017-06-23 13:34:44.000000000 +0000 @@ -35,6 +35,8 @@ #include "util/mutex.h" #include "util/time.h" +#include "bdnav/uo_mask.h" + #include "../register.h" #include "../keys.h" @@ -361,6 +363,10 @@ GC_TRACE("_save_page_state(): no bog data !\n"); return -1; } + if (!gc->igs || !gc->igs->ics) { + GC_TRACE("_save_page_state(): no IG composition\n"); + return -1; + } PG_DISPLAY_SET *s = gc->igs; BD_IG_PAGE *page = NULL; @@ -624,8 +630,13 @@ if (cobj->crop_flag) { if (cobj->crop_x || cobj->crop_y || cobj->crop_w != object->width) { - ov.img = cropped_img = rle_crop_object(object->img, object->width, - cobj->crop_x, cobj->crop_y, cobj->crop_w, cobj->crop_h); + cropped_img = rle_crop_object(object->img, object->width, + cobj->crop_x, cobj->crop_y, cobj->crop_w, cobj->crop_h); + if (!cropped_img) { + BD_DEBUG(DBG_DECODE | DBG_CRIT, "Error cropping PG object\n"); + return; + } + ov.img = cropped_img; } ov.w = cobj->crop_w; ov.h = cobj->crop_h; @@ -728,7 +739,7 @@ gc->popup_visible = 0; gc->valid_mouse_position = 0; - gc->page_uo_mask = bd_empty_uo_mask(); + gc->page_uo_mask = uo_mask_get_empty(); graphics_processor_free(&gc->igp); graphics_processor_free(&gc->pgp); @@ -825,6 +836,8 @@ bd_mutex_destroy(&gc->mutex); + X_FREE(gc->saved_bog_data); + X_FREE(*p); } } @@ -965,26 +978,38 @@ uint16_t y; RLE_ENC rle; - rle_begin(&rle); + if (rle_begin(&rle) < 0) { + return -1; + } for (y = 0, bmp_y = 0; y < style->region_info.region.height; y++) { if (y < style->text_box.ypos || y >= style->text_box.ypos + style->text_box.height) { - rle_add_bite(&rle, style->region_info.background_color, style->region_info.region.width); + if (rle_add_bite(&rle, style->region_info.background_color, style->region_info.region.width) < 0) + break; } else { - rle_add_bite(&rle, style->region_info.background_color, style->text_box.xpos); - rle_compress_chunk(&rle, bmp->mem + bmp->stride * bmp_y, bmp->width); + if (rle_add_bite(&rle, style->region_info.background_color, style->text_box.xpos) < 0) + break; + if (rle_compress_chunk(&rle, bmp->mem + bmp->stride * bmp_y, bmp->width) < 0) + break; bmp_y++; - rle_add_bite(&rle, style->region_info.background_color, - style->region_info.region.width - style->text_box.width - style->text_box.xpos); + if (rle_add_bite(&rle, style->region_info.background_color, + style->region_info.region.width - style->text_box.width - style->text_box.xpos) < 0) + break; } - rle_add_eol(&rle); + if (rle_add_eol(&rle) < 0) + break; } - _render_rle(p, pts, rle_get(&rle), - style->region_info.region.xpos, style->region_info.region.ypos, - style->region_info.region.width, style->region_info.region.height, - palette); + BD_PG_RLE_ELEM *img = rle_get(&rle); + if (img) { + _render_rle(p, pts, img, + style->region_info.region.xpos, style->region_info.region.ypos, + style->region_info.region.width, style->region_info.region.height, + palette); + } else { + BD_DEBUG(DBG_DECODE | DBG_CRIT, "Error encoding Text Subtitle region\n"); + } rle_end(&rle); @@ -1368,7 +1393,7 @@ if (s->ics->interactive_composition.ui_model == IG_UI_MODEL_POPUP && !gc->popup_visible) { - gc->page_uo_mask = bd_empty_uo_mask(); + gc->page_uo_mask = uo_mask_get_empty(); if (gc->ig_open) { GC_TRACE("_render_page(): popup menu not visible\n"); @@ -1923,7 +1948,7 @@ cmds->nav_cmds = NULL; cmds->sound_id_ref = -1; cmds->status = GC_STATUS_NONE; - cmds->page_uo_mask = bd_empty_uo_mask(); + cmds->page_uo_mask = uo_mask_get_empty(); } if (!gc) { diff -Nru libbluray-0.8.1/src/libbluray/decoders/graphics_controller.h libbluray-1.0.1/src/libbluray/decoders/graphics_controller.h --- libbluray-0.8.1/src/libbluray/decoders/graphics_controller.h 2015-02-18 09:08:30.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/decoders/graphics_controller.h 2017-06-23 13:34:44.000000000 +0000 @@ -22,7 +22,7 @@ #include "util/attributes.h" -#include "libbluray/bdnav/uo_mask_table.h" +#include "bdnav/uo_mask_table.h" #include <stdint.h> #include <stddef.h> /* size_t */ diff -Nru libbluray-0.8.1/src/libbluray/decoders/graphics_processor.h libbluray-1.0.1/src/libbluray/decoders/graphics_processor.h --- libbluray-0.8.1/src/libbluray/decoders/graphics_processor.h 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/decoders/graphics_processor.h 2017-06-23 13:34:44.000000000 +0000 @@ -29,7 +29,6 @@ #include <stdint.h> typedef struct graphics_processor_s GRAPHICS_PROCESSOR; -struct pes_buffer_s; /* * PG_DISPLAY_SET diff -Nru libbluray-0.8.1/src/libbluray/decoders/hdmv_pids.h libbluray-1.0.1/src/libbluray/decoders/hdmv_pids.h --- libbluray-0.8.1/src/libbluray/decoders/hdmv_pids.h 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/decoders/hdmv_pids.h 2017-06-23 13:34:44.000000000 +0000 @@ -40,6 +40,11 @@ #define HDMV_PID_PG_FIRST 0x1200 #define HDMV_PID_PG_LAST 0x121f +#define HDMV_PID_PG_B_FIRST 0x1220 /* base view */ +#define HDMV_PID_PG_B_LAST 0x123f +#define HDMV_PID_PG_E_FIRST 0x1240 /* enhanced view */ +#define HDMV_PID_PG_E_LAST 0x125f + #define HDMV_PID_IG_FIRST 0x1400 #define HDMV_PID_IG_LAST 0x141f @@ -61,5 +66,12 @@ #define IS_HDMV_PID_IG(pid) ((pid) >= HDMV_PID_IG_FIRST && (pid) <= HDMV_PID_IG_LAST) #define IS_HDMV_PID_TEXTST(pid) ((pid) == HDMV_PID_TEXTST) +/* + * Extract PID from HDMV MPEG-TS packet + */ + +#define TS_PID(buf) \ + ((((buf)[4+1] & 0x1f) << 8) | (buf)[4+2]) + #endif // _HDMV_PIDS_H_ diff -Nru libbluray-0.8.1/src/libbluray/decoders/ig_decode.c libbluray-1.0.1/src/libbluray/decoders/ig_decode.c --- libbluray-0.8.1/src/libbluray/decoders/ig_decode.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/decoders/ig_decode.c 2017-06-23 13:34:44.000000000 +0000 @@ -26,7 +26,7 @@ #include "pg_decode.h" // pg_decode_*() #include "../hdmv/mobj_parse.h" // mobj_parse_cmd() #include "../hdmv/mobj_data.h" // MOBJ_CMD -#include "../bdnav/mpls_parse.h" // mpls_parse_uo() +#include "../bdnav/uo_mask.h" // uo_mask_parse() #include "util/macro.h" #include "util/logging.h" @@ -204,7 +204,7 @@ uint8_t buf[8]; bb_read_bytes(bb, buf, 8); - return mpls_parse_uo(buf, p); + return uo_mask_parse(buf, p); } static int _decode_page(BITBUFFER *bb, BD_IG_PAGE *p) diff -Nru libbluray-0.8.1/src/libbluray/decoders/m2ts_demux.c libbluray-1.0.1/src/libbluray/decoders/m2ts_demux.c --- libbluray-0.8.1/src/libbluray/decoders/m2ts_demux.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/decoders/m2ts_demux.c 2017-06-23 13:34:44.000000000 +0000 @@ -44,6 +44,32 @@ PES_BUFFER *buf; }; +/* + * + */ + +static PES_BUFFER *_flush(M2TS_DEMUX *p) +{ + PES_BUFFER *result = NULL; + + result = p->buf; + p->buf = NULL; + + return result; +} + +void m2ts_demux_reset(M2TS_DEMUX *p) +{ + if (p) { + PES_BUFFER *buf = _flush(p); + pes_buffer_free(&buf); + } +} + +/* + * + */ + M2TS_DEMUX *m2ts_demux_init(uint16_t pid) { M2TS_DEMUX *p = calloc(1, sizeof(*p)); @@ -58,11 +84,50 @@ void m2ts_demux_free(M2TS_DEMUX **p) { if (p && *p) { - pes_buffer_free(&(*p)->buf); + m2ts_demux_reset(*p); X_FREE(*p); } } +/* + * + */ + +static int _realloc(PES_BUFFER *p, size_t size) +{ + uint8_t *tmp = realloc(p->buf, size); + + if (!tmp) { + BD_DEBUG(DBG_DECODE | DBG_CRIT, "out of memory\n"); + return -1; + } + + p->size = size; + p->buf = tmp; + + return 0; +} + +static int _add_ts(PES_BUFFER *p, uint8_t *buf, unsigned len) +{ + // realloc + if (p->size < p->len + len) { + if (_realloc(p, p->size * 2) < 0) { + return -1; + } + } + + // append + memcpy(p->buf + p->len, buf, len); + p->len += len; + + return 0; +} + +/* + * Parsing + */ + static int64_t _parse_timestamp(uint8_t *p) { int64_t ts; @@ -74,96 +139,72 @@ return ts; } -/* - * _add_ts() - * - add ts payload to buffer. - * - parse PES header if pusi is set. - * - return: - * < 0 error (incorrect PES header) - * = 0 PES packet continue - * > 0 PES packet payload length from PES header - */ -static int _add_ts(PES_BUFFER *p, unsigned pusi, uint8_t *buf, unsigned len) +static int _parse_pes(PES_BUFFER *p, uint8_t *buf, unsigned len) { - unsigned result = 0; + int result = 0; + + if (len < 6) { + BD_DEBUG(DBG_DECODE, "invalid BDAV TS (PES header not in single TS packet)\n"); + return -1; + } + if (buf[0] || buf[1] || buf[2] != 1) { + BD_DEBUG(DBG_DECODE, "invalid PES header (00 00 01)"); + return -1; + } + + // Parse PES header + unsigned pes_pid = buf[3]; + unsigned pes_length = buf[4] << 8 | buf[5]; + unsigned hdr_len = 6; - if (pusi) { + if (pes_pid != 0xbf) { - if (len < 6) { + if (len < 9) { BD_DEBUG(DBG_DECODE, "invalid BDAV TS (PES header not in single TS packet)\n"); return -1; } - if (buf[0] || buf[1] || buf[2] != 1) { - BD_DEBUG(DBG_DECODE, "invalid PES header (00 00 01)"); - return -1; - } - // Parse PES header - unsigned pes_pid = buf[3]; - unsigned pes_length = buf[4] << 8 | buf[5]; - unsigned hdr_len = 6; - - if (pes_pid != 0xbf) { - - if (len < 9) { - BD_DEBUG(DBG_DECODE, "invalid BDAV TS (PES header not in single TS packet)\n"); - return -1; - } + unsigned pts_exists = buf[7] & 0x80; + unsigned dts_exists = buf[7] & 0x40; + hdr_len += buf[8] + 3; - unsigned pts_exists = buf[7] & 0x80; - unsigned dts_exists = buf[7] & 0x40; - hdr_len += buf[8] + 3; - - if (len < hdr_len) { - BD_DEBUG(DBG_DECODE, "invalid BDAV TS (PES header not in single TS packet)\n"); - return -1; - } - - if (pts_exists) { - p->pts = _parse_timestamp(buf + 9); - } - if (dts_exists) { - p->dts = _parse_timestamp(buf + 14); - } + if (len < hdr_len) { + BD_DEBUG(DBG_DECODE, "invalid BDAV TS (PES header not in single TS packet)\n"); + return -1; } - buf += hdr_len; - len -= hdr_len; - - result = pes_length + 6 - hdr_len; + if (pts_exists) { + p->pts = _parse_timestamp(buf + 9); + } + if (dts_exists) { + p->dts = _parse_timestamp(buf + 14); + } } - // realloc - if (p->size < p->len + len) { - uint8_t *tmp; - p->size *= 2; - p->size = BD_MAX(p->size, BD_MAX(result, 0x100)); - tmp = realloc(p->buf, p->size); - if (!tmp) { - BD_DEBUG(DBG_DECODE | DBG_CRIT, "out of memory\n"); - p->size = 0; - return -1; - } - p->buf = tmp; + result = pes_length + 6 - hdr_len; + + if (_realloc(p, BD_MAX(result, 0x100)) < 0) { + return -1; } - // append - memcpy(p->buf + p->len, buf, len); - p->len += len; + p->len = len - hdr_len; + memcpy(p->buf, buf + hdr_len, p->len); return result; } + +/* + * + */ + PES_BUFFER *m2ts_demux(M2TS_DEMUX *p, uint8_t *buf) { uint8_t *end = buf + 6144; PES_BUFFER *result = NULL; if (!buf) { - // flush - result = p->buf; - p->buf = NULL; - return result; + return _flush(p); } for (; buf < end; buf += 192) { @@ -202,21 +243,27 @@ pes_buffer_free(&p->buf); } p->buf = pes_buffer_alloc(); - } - - if (!p->buf) { - BD_DEBUG(DBG_DECODE, "skipping packet (no pusi seen)\n"); - continue; - } - - int r = _add_ts(p->buf, pusi, buf + 4 + payload_offset, 188 - payload_offset); - if (r) { + if (!p->buf) { + continue; + } + int r = _parse_pes(p->buf, buf + 4 + payload_offset, 188 - payload_offset); if (r < 0) { - BD_DEBUG(DBG_DECODE, "skipping block (PES header error)\n"); pes_buffer_free(&p->buf); continue; } p->pes_length = r; + + } else { + + if (!p->buf) { + BD_DEBUG(DBG_DECODE, "skipping packet (no pusi seen)\n"); + continue; + } + + if (_add_ts(p->buf, buf + 4 + payload_offset, 188 - payload_offset) < 0) { + pes_buffer_free(&p->buf); + continue; + } } if (p->buf->len == p->pes_length) { diff -Nru libbluray-0.8.1/src/libbluray/decoders/m2ts_demux.h libbluray-1.0.1/src/libbluray/decoders/m2ts_demux.h --- libbluray-0.8.1/src/libbluray/decoders/m2ts_demux.h 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/decoders/m2ts_demux.h 2017-06-23 13:34:44.000000000 +0000 @@ -34,6 +34,8 @@ BD_PRIVATE M2TS_DEMUX *m2ts_demux_init(uint16_t pid); BD_PRIVATE void m2ts_demux_free(M2TS_DEMUX **); +BD_PRIVATE void m2ts_demux_reset(M2TS_DEMUX *); + /* * Demux aligned unit (mpeg-ts + pes). * input: aligned unit (6144 bytes). NULL to flush demuxer buffer. diff -Nru libbluray-0.8.1/src/libbluray/decoders/overlay.h libbluray-1.0.1/src/libbluray/decoders/overlay.h --- libbluray-0.8.1/src/libbluray/decoders/overlay.h 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/decoders/overlay.h 2017-06-23 13:34:44.000000000 +0000 @@ -1,6 +1,6 @@ /* * This file is part of libbluray - * Copyright (C) 2010-2012 Petri Hintukainen <phintuka@users.sourceforge.net> + * Copyright (C) 2010-2017 Petri Hintukainen <phintuka@users.sourceforge.net> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,6 +20,10 @@ #ifndef BD_OVERLAY_H_ #define BD_OVERLAY_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include <stdint.h> #define BD_OVERLAY_INTERFACE_VERSION 2 @@ -31,18 +35,18 @@ typedef enum { /* following events are executed immediately */ - BD_OVERLAY_INIT = 0, /* init overlay plane. Size and position of plane in x,y,w,h */ - BD_OVERLAY_CLOSE = 5, /* close overlay plane */ + BD_OVERLAY_INIT = 0, /* init overlay plane. Size and position of plane in x,y,w,h */ + BD_OVERLAY_CLOSE = 1, /* close overlay plane */ /* following events can be processed immediately, but changes * should not be flushed to display before next FLUSH event */ - BD_OVERLAY_CLEAR = 1, /* clear plane */ - BD_OVERLAY_DRAW = 2, /* draw bitmap (x,y,w,h,img,palette,crop) */ - BD_OVERLAY_WIPE = 3, /* clear area (x,y,w,h) */ - BD_OVERLAY_HIDE = 6, /* overlay is empty and can be hidden */ + BD_OVERLAY_CLEAR = 2, /* clear plane */ + BD_OVERLAY_DRAW = 3, /* draw bitmap (x,y,w,h,img,palette,crop) */ + BD_OVERLAY_WIPE = 4, /* clear area (x,y,w,h) */ + BD_OVERLAY_HIDE = 5, /* overlay is empty and can be hidden */ - BD_OVERLAY_FLUSH = 4, /* all changes have been done, flush overlay to display at given pts */ + BD_OVERLAY_FLUSH = 6, /* all changes have been done, flush overlay to display at given pts */ } bd_overlay_cmd_e; @@ -67,6 +71,8 @@ uint8_t plane; /* bd_overlay_plane_e */ uint8_t cmd; /* bd_overlay_cmd_e */ + uint8_t palette_update_flag; /* only palette was changed */ + uint16_t x; uint16_t y; uint16_t w; @@ -75,12 +81,6 @@ const BD_PG_PALETTE_ENTRY * palette; const BD_PG_RLE_ELEM * img; - uint16_t crop_x; /* deprecated: cropping is executed by libbluray */ - uint16_t crop_y; /* deprecated: cropping is executed by libbluray */ - uint16_t crop_w; /* deprecated: cropping is executed by libbluray */ - uint16_t crop_h; /* deprecated: cropping is executed by libbluray */ - - uint8_t palette_update_flag; /* only palette was changed */ } BD_OVERLAY; /* @@ -125,14 +125,14 @@ typedef enum { /* following events are executed immediately */ - BD_ARGB_OVERLAY_INIT = 0, /* init overlay plane. Size and position of plane in x,y,w,h */ - BD_ARGB_OVERLAY_CLOSE = 5, /* close overlay */ + BD_ARGB_OVERLAY_INIT = 0, /* init overlay plane. Size and position of plane in x,y,w,h */ + BD_ARGB_OVERLAY_CLOSE = 1, /* close overlay */ /* following events can be processed immediately, but changes * should not be flushed to display before next FLUSH event */ - BD_ARGB_OVERLAY_DRAW = 2, /* draw image */ - BD_ARGB_OVERLAY_FLUSH = 4, /* all changes have been done, flush overlay to display at given pts */ + BD_ARGB_OVERLAY_DRAW = 3, /* draw image */ + BD_ARGB_OVERLAY_FLUSH = 6, /* all changes have been done, flush overlay to display at given pts */ } bd_argb_overlay_cmd_e; typedef struct bd_argb_overlay_s { @@ -144,15 +144,14 @@ * frame buffer */ - /* destination clip on the overlay plane - */ + /* destination clip on the overlay plane */ uint16_t x; uint16_t y; uint16_t w; uint16_t h; + uint16_t stride; /* buffer stride */ const uint32_t * argb; /* 'h' lines, line length 'stride' pixels */ - uint16_t stride; /* buffer stride */ } BD_ARGB_OVERLAY; @@ -179,7 +178,7 @@ * - buffer can be replaced in overlay callback or lock(). */ - uint32_t *buf[2]; /* [0] - PG plane, [1] - IG plane */ + uint32_t *buf[4]; /* [0] - PG plane, [1] - IG plane. [2], [3] reserved for stereoscopic overlay. */ /* size of buffers * - Set by application @@ -199,4 +198,8 @@ } BD_ARGB_BUFFER; +#ifdef __cplusplus +} +#endif + #endif // BD_OVERLAY_H_ diff -Nru libbluray-0.8.1/src/libbluray/decoders/rle.c libbluray-1.0.1/src/libbluray/decoders/rle.c --- libbluray-0.8.1/src/libbluray/decoders/rle.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/decoders/rle.c 2017-06-23 13:34:44.000000000 +0000 @@ -29,47 +29,63 @@ * util */ -static void _rle_ensure_size(RLE_ENC *p) +static int _rle_ensure_size(RLE_ENC *p) { if (BD_UNLIKELY(!p->free_elem)) { BD_PG_RLE_ELEM *start = rle_get(p); + if (p->error) { + return -1; + } /* realloc to 2x */ - p->free_elem = p->num_elem; - start = refcnt_realloc(start, p->num_elem * 2 * sizeof(BD_PG_RLE_ELEM)); + void *tmp = refcnt_realloc(start, p->num_elem * 2 * sizeof(BD_PG_RLE_ELEM)); + if (!tmp) { + p->error = 1; + return -1; + } + start = tmp; p->elem = start + p->num_elem; + p->free_elem = p->num_elem; p->num_elem *= 2; } + + return 0; } /* - * encoding + * crop encoded image */ -static void _enc_elem(RLE_ENC *p, uint16_t color, uint16_t len) +static int _enc_elem(RLE_ENC *p, uint16_t color, uint16_t len) { - _rle_ensure_size(p); + if (BD_UNLIKELY(_rle_ensure_size(p) < 0)) { + return -1; + } p->elem->color = color; p->elem->len = len; p->free_elem--; p->elem++; + + return 0; } -static void _enc_eol(RLE_ENC *p) +static int _enc_eol(RLE_ENC *p) { - _enc_elem(p, 0, 0); + return _enc_elem(p, 0, 0); } BD_PG_RLE_ELEM *rle_crop_object(const BD_PG_RLE_ELEM *orig, int width, - int crop_x, int crop_y, int crop_w, int crop_h) + int crop_x, int crop_y, int crop_w, int crop_h) { RLE_ENC rle; int x0 = crop_x; int x1 = crop_x + crop_w; /* first pixel outside of cropped region */ int x, y; - rle_begin(&rle); + if (rle_begin(&rle) < 0) { + return NULL; + } /* skip crop_y */ for (y = 0; y < crop_y; y++) { @@ -106,7 +122,9 @@ bite.len -= x - x1; } - _enc_elem(&rle, bite.color, bite.len); + if (BD_UNLIKELY(_enc_elem(&rle, bite.color, bite.len) < 0)) { + goto out; + } } if (BD_LIKELY(!orig->len)) { @@ -116,9 +134,12 @@ BD_DEBUG(DBG_GC | DBG_CRIT, "rle eol marker missing\n"); } - _enc_eol(&rle); + if (BD_UNLIKELY(_enc_eol(&rle) < 0)) { + goto out; + } } + out: return rle_get(&rle); } @@ -126,44 +147,61 @@ * compression */ -static void _rle_grow(RLE_ENC *p) +static int _rle_grow(RLE_ENC *p) { p->free_elem--; p->elem++; - _rle_ensure_size(p); + if (BD_UNLIKELY(_rle_ensure_size(p) < 0)) { + return -1; + } p->elem->len = 0; + + return 0; } -void rle_add_eol(RLE_ENC *p) +int rle_add_eol(RLE_ENC *p) { if (BD_LIKELY(p->elem->len)) { - _rle_grow(p); + if (BD_UNLIKELY(_rle_grow(p) < 0)) { + return -1; + } } p->elem->color = 0; - _rle_grow(p); + if (BD_UNLIKELY(_rle_grow(p) < 0)) { + return -1; + } p->elem->color = 0xffff; + + return 0; } -void rle_add_bite(RLE_ENC *p, uint8_t color, int len) +int rle_add_bite(RLE_ENC *p, uint8_t color, int len) { if (BD_LIKELY(color == p->elem->color)) { p->elem->len += len; } else { if (BD_LIKELY(p->elem->len)) { - _rle_grow(p); + if (BD_UNLIKELY(_rle_grow(p) < 0)) { + return -1; + } } p->elem->color = color; p->elem->len = len; } + + return 0; } -void rle_compress_chunk(RLE_ENC *p, const uint8_t *mem, unsigned width) +int rle_compress_chunk(RLE_ENC *p, const uint8_t *mem, unsigned width) { unsigned ii; for (ii = 0; ii < width; ii++) { - rle_add_bite(p, mem[ii], 1); + if (BD_UNLIKELY(rle_add_bite(p, mem[ii], 1) < 0)) { + return -1; + } } + return 0; } diff -Nru libbluray-0.8.1/src/libbluray/decoders/rle.h libbluray-1.0.1/src/libbluray/decoders/rle.h --- libbluray-0.8.1/src/libbluray/decoders/rle.h 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/decoders/rle.h 2017-06-23 13:34:44.000000000 +0000 @@ -34,6 +34,8 @@ BD_PG_RLE_ELEM *elem; /* current element */ unsigned int free_elem;/* unused element count */ unsigned int num_elem; /* allocated element count */ + + int error; } RLE_ENC; /* @@ -46,26 +48,41 @@ BD_PRIVATE BD_PG_RLE_ELEM *rle_crop_object(const BD_PG_RLE_ELEM *orig, int width, int crop_x, int crop_y, int crop_w, int crop_h); -static inline void rle_begin(RLE_ENC *p) +static inline int rle_begin(RLE_ENC *p) { p->num_elem = 1024; p->free_elem = 1024; p->elem = refcnt_realloc(NULL, p->num_elem * sizeof(BD_PG_RLE_ELEM)); - + if (!p->elem) { + return -1; + } p->elem->len = 0; p->elem->color = 0xffff; + + p->error = 0; + + return 0; } static inline BD_PG_RLE_ELEM *rle_get(RLE_ENC *p) { BD_PG_RLE_ELEM *start = (p->elem ? p->elem - (p->num_elem - p->free_elem) : NULL); + if (p->error) { + if (start) { + bd_refcnt_dec(start); + p->elem = NULL; + } + return NULL; + } return start; } static inline void rle_end(RLE_ENC *p) { BD_PG_RLE_ELEM *start = rle_get(p); - bd_refcnt_dec(start); + if (start) { + bd_refcnt_dec(start); + } p->elem = NULL; } @@ -73,8 +90,8 @@ * compression */ -BD_PRIVATE void rle_add_eol(RLE_ENC *p); -BD_PRIVATE void rle_add_bite(RLE_ENC *p, uint8_t color, int len); -BD_PRIVATE void rle_compress_chunk(RLE_ENC *p, const uint8_t *mem, unsigned width); +BD_PRIVATE int rle_add_eol(RLE_ENC *p); +BD_PRIVATE int rle_add_bite(RLE_ENC *p, uint8_t color, int len); +BD_PRIVATE int rle_compress_chunk(RLE_ENC *p, const uint8_t *mem, unsigned width); #endif /* _BD_RLE_H_ */ diff -Nru libbluray-0.8.1/src/libbluray/decoders/textst_render.c libbluray-1.0.1/src/libbluray/decoders/textst_render.c --- libbluray-0.8.1/src/libbluray/decoders/textst_render.c 2015-04-07 19:56:47.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/decoders/textst_render.c 2017-06-23 13:34:44.000000000 +0000 @@ -23,7 +23,7 @@ #include "util/macro.h" #include "util/logging.h" -#include "libbluray/bluray.h" /* bd_char_code_e */ +#include "bluray.h" /* bd_char_code_e */ #include <stdint.h> @@ -74,6 +74,10 @@ #ifdef HAVE_FT2 TEXTST_RENDER *p = calloc(1, sizeof(TEXTST_RENDER)); + if (!p) { + return NULL; + } + if (!FT_Init_FreeType(&p->ft_lib)) { return p; } @@ -101,6 +105,7 @@ } X_FREE(p->font[ii].mem); } + X_FREE(p->font); FT_Done_FreeType(p->ft_lib); } diff -Nru libbluray-0.8.1/src/libbluray/disc/aacs.c libbluray-1.0.1/src/libbluray/disc/aacs.c --- libbluray-0.8.1/src/libbluray/disc/aacs.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/disc/aacs.c 2017-06-23 13:34:46.000000000 +0000 @@ -30,6 +30,7 @@ #include "util/strutl.h" #include <stdlib.h> +#include <string.h> struct bd_aacs { @@ -41,12 +42,9 @@ /* function pointers */ fptr_int decrypt_unit; + fptr_int decrypt_bus; - fptr_p_void get_vid; - fptr_p_void get_pmsn; - fptr_p_void get_device_binding_id; - fptr_p_void get_device_nonce; - fptr_p_void get_media_key; + int impl_id; }; @@ -58,15 +56,19 @@ } } -void libaacs_unload(BD_AACS **p) +static void _unload(BD_AACS *p) { - if (p && *p) { - _libaacs_close(*p); + _libaacs_close(p); - if ((*p)->h_libaacs) { - dl_dlclose((*p)->h_libaacs); - } + if (p->h_libaacs) { + dl_dlclose(p->h_libaacs); + } +} +void libaacs_unload(BD_AACS **p) +{ + if (p && *p) { + _unload(*p); X_FREE(*p); } } @@ -82,7 +84,11 @@ return 0; } -static void *_open_libaacs(void) +#define IMPL_USER 0 +#define IMPL_LIBAACS 1 +#define IMPL_LIBMMBD 2 + +static void *_open_libaacs(int *impl_id) { const char * const libaacs[] = { getenv("LIBAACS_PATH"), @@ -91,10 +97,11 @@ }; unsigned ii; - for (ii = 0; ii < sizeof(libaacs) / sizeof(libaacs[0]); ii++) { + for (ii = *impl_id; ii < sizeof(libaacs) / sizeof(libaacs[0]); ii++) { if (libaacs[ii]) { void *handle = dl_dlopen(libaacs[ii], "0"); if (handle) { + *impl_id = ii; BD_DEBUG(DBG_BLURAY, "Using %s for AACS\n", libaacs[ii]); return handle; } @@ -105,11 +112,15 @@ return NULL; } -BD_AACS *libaacs_load(void) +static BD_AACS *_load(int impl_id) { BD_AACS *p = calloc(1, sizeof(BD_AACS)); + if (!p) { + return NULL; + } + p->impl_id = impl_id; - p->h_libaacs = _open_libaacs(); + p->h_libaacs = _open_libaacs(&p->impl_id); if (!p->h_libaacs) { X_FREE(p); return NULL; @@ -118,11 +129,7 @@ BD_DEBUG(DBG_BLURAY, "Loading aacs library (%p)\n", p->h_libaacs); *(void **)(&p->decrypt_unit) = dl_dlsym(p->h_libaacs, "aacs_decrypt_unit"); - *(void **)(&p->get_vid) = dl_dlsym(p->h_libaacs, "aacs_get_vid"); - *(void **)(&p->get_pmsn) = dl_dlsym(p->h_libaacs, "aacs_get_pmsn"); - *(void **)(&p->get_device_binding_id) = dl_dlsym(p->h_libaacs, "aacs_get_device_binding_id"); - *(void **)(&p->get_device_nonce) = dl_dlsym(p->h_libaacs, "aacs_get_device_nonce"); - *(void **)(&p->get_media_key) = dl_dlsym(p->h_libaacs, "aacs_get_mk"); + *(void **)(&p->decrypt_bus) = dl_dlsym(p->h_libaacs, "aacs_decrypt_bus"); if (!p->decrypt_unit) { BD_DEBUG(DBG_BLURAY | DBG_CRIT, "libaacs dlsym failed! (%p)\n", p->h_libaacs); @@ -140,6 +147,11 @@ return p; } +BD_AACS *libaacs_load(int force_mmbd) +{ + return _load(force_mmbd ? IMPL_LIBMMBD : 0); +} + int libaacs_open(BD_AACS *p, const char *device, void *file_open_handle, void *file_open_fp, const char *keyfile_path) @@ -170,6 +182,15 @@ } else if (open2) { BD_DEBUG(DBG_BLURAY, "Using old aacs_open2(), no UDF support available\n"); p->aacs = open2(device, keyfile_path, &error_code); + + /* libmmbd needs dev: for devices */ + if (!p->aacs && p->impl_id == IMPL_LIBMMBD && !strncmp(device, "/dev/", 5)) { + char *tmp_device = str_printf("dev:%s", device); + if (tmp_device) { + p->aacs = open2(tmp_device, keyfile_path, &error_code); + X_FREE(tmp_device); + } + } } else if (open) { BD_DEBUG(DBG_BLURAY, "Using old aacs_open(), no verbose error reporting available\n"); p->aacs = open(device, keyfile_path); @@ -177,6 +198,22 @@ BD_DEBUG(DBG_BLURAY, "aacs_open() not found\n"); } + if (error_code) { + /* failed. try next aacs implementation if available. */ + BD_AACS *p2 = _load(p->impl_id + 1); + if (p2) { + if (!libaacs_open(p2, device, file_open_handle, file_open_fp, keyfile_path)) { + /* succeed - swap implementations */ + _unload(p); + *p = *p2; + X_FREE(p2); + return 0; + } + /* failed - report original errors */ + libaacs_unload(&p2); + } + } + if (p->aacs) { if (aacs_get_mkb_version) { p->mkbv = aacs_get_mkb_version(p->aacs); @@ -214,63 +251,55 @@ return 0; } -/* - * - */ - -static const uint8_t *_get_vid(BD_AACS *p) +int libaacs_decrypt_bus(BD_AACS *p, uint8_t *buf) { - if (!p->get_vid) { - BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_get_vid() dlsym failed!\n"); - return NULL; + if (p && p->aacs && p->decrypt_bus) { + if (p->decrypt_bus(p->aacs, buf) > 0) { + return 0; + } } - return (const uint8_t*)p->get_vid(p->aacs); + BD_DEBUG(DBG_AACS | DBG_CRIT, "Unable to BUS decrypt unit (AACS)!\n"); + return -1; } -static const uint8_t *_get_pmsn(BD_AACS *p) -{ - if (!p->get_pmsn) { - BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_get_pmsn() dlsym failed!\n"); - return NULL; - } +/* + * + */ - return (const uint8_t*)p->get_pmsn(p->aacs); +uint32_t libaacs_get_mkbv(BD_AACS *p) +{ + return p ? p->mkbv : 0; } -static const uint8_t *_get_device_binding_id(BD_AACS *p) +int libaacs_get_bec_enabled(BD_AACS *p) { - if (!p->get_device_binding_id) { - BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_get_device_binding_id() dlsym failed!\n"); - return NULL; - } + fptr_int get_bec; - return (const uint8_t*)p->get_device_binding_id(p->aacs); -} + if (!p || !p->h_libaacs) { + return 0; + } -static const uint8_t *_get_device_nonce(BD_AACS *p) -{ - if (!p->get_device_nonce) { - BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_get_device_nonce() dlsym failed!\n"); - return NULL; + *(void **)(&get_bec) = dl_dlsym(p->h_libaacs, "aacs_get_bus_encryption"); + if (!get_bec) { + BD_DEBUG(DBG_BLURAY, "aacs_get_bus_encryption() dlsym failed!\n"); + return 0; } - return (const uint8_t*)p->get_device_nonce(p->aacs); + return get_bec(p->aacs) == 3; } -static const uint8_t *_get_media_key(BD_AACS *p) +static const uint8_t *_get_data(BD_AACS *p, const char *func) { - if (!p->get_media_key) { - BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_get_mk() dlsym failed!\n"); + fptr_p_void fp; + + *(void **)(&fp) = dl_dlsym(p->h_libaacs, func); + if (!fp) { + BD_DEBUG(DBG_BLURAY | DBG_CRIT, "%s() dlsym failed!\n", func); return NULL; } - return (const uint8_t*)p->get_media_key(p->aacs); -} - -uint32_t libaacs_get_mkbv(BD_AACS *p) -{ - return p ? p->mkbv : 0; + return (const uint8_t*)fp(p->aacs); } static const char *_type2str(int type) @@ -282,6 +311,8 @@ case BD_AACS_DEVICE_BINDING_ID: return "DEVICE_BINDING_ID"; case BD_AACS_DEVICE_NONCE: return "DEVICE_NONCE"; case BD_AACS_MEDIA_KEY: return "MEDIA_KEY"; + case BD_AACS_CONTENT_CERT_ID: return "CONTENT_CERT_ID"; + case BD_AACS_BDJ_ROOT_CERT_HASH: return "BDJ_ROOT_CERT_HASH"; default: return "???"; } } @@ -298,19 +329,25 @@ return p->disc_id; case BD_AACS_MEDIA_VID: - return _get_vid(p); + return _get_data(p, "aacs_get_vid"); case BD_AACS_MEDIA_PMSN: - return _get_pmsn(p); + return _get_data(p, "aacs_get_pmsn"); case BD_AACS_DEVICE_BINDING_ID: - return _get_device_binding_id(p); + return _get_data(p, "aacs_get_device_binding_id"); case BD_AACS_DEVICE_NONCE: - return _get_device_nonce(p); + return _get_data(p, "aacs_get_device_nonce"); case BD_AACS_MEDIA_KEY: - return _get_media_key(p); + return _get_data(p, "aacs_get_mk"); + + case BD_AACS_CONTENT_CERT_ID: + return _get_data(p, "aacs_get_content_cert_id"); + + case BD_AACS_BDJ_ROOT_CERT_HASH: + return _get_data(p, "aacs_get_bdj_root_cert_hash"); } BD_DEBUG(DBG_BLURAY | DBG_CRIT, "get_aacs_data(): unknown query %d\n", type); diff -Nru libbluray-0.8.1/src/libbluray/disc/aacs.h libbluray-1.0.1/src/libbluray/disc/aacs.h --- libbluray-0.8.1/src/libbluray/disc/aacs.h 2015-02-12 09:56:04.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/disc/aacs.h 2017-06-23 13:34:46.000000000 +0000 @@ -28,7 +28,7 @@ typedef struct bd_aacs BD_AACS; BD_PRIVATE int libaacs_required(void *h, int (*have_file)(void *, const char *, const char *)); -BD_PRIVATE BD_AACS *libaacs_load(void); +BD_PRIVATE BD_AACS *libaacs_load(int force_mmbd); BD_PRIVATE int libaacs_open(BD_AACS *p, const char *device, void *file_open_handle, void *file_open_fp, const char *keyfile_path); @@ -36,8 +36,10 @@ BD_PRIVATE void libaacs_select_title(BD_AACS *p, uint32_t title); BD_PRIVATE int libaacs_decrypt_unit(BD_AACS *p, uint8_t *buf); +BD_PRIVATE int libaacs_decrypt_bus(BD_AACS *p, uint8_t *buf); BD_PRIVATE uint32_t libaacs_get_mkbv(BD_AACS *p); +BD_PRIVATE int libaacs_get_bec_enabled(BD_AACS *p); #define BD_AACS_DISC_ID 1 #define BD_AACS_MEDIA_VID 2 @@ -45,6 +47,8 @@ #define BD_AACS_DEVICE_BINDING_ID 4 #define BD_AACS_DEVICE_NONCE 5 #define BD_AACS_MEDIA_KEY 6 +#define BD_AACS_CONTENT_CERT_ID 7 +#define BD_AACS_BDJ_ROOT_CERT_HASH 8 BD_PRIVATE const uint8_t *libaacs_get_aacs_data(BD_AACS *p, int type); diff -Nru libbluray-0.8.1/src/libbluray/disc/bdplus.c libbluray-1.0.1/src/libbluray/disc/bdplus.c --- libbluray-0.8.1/src/libbluray/disc/bdplus.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/disc/bdplus.c 2017-06-23 13:34:46.000000000 +0000 @@ -30,6 +30,7 @@ #include "util/strutl.h" #include <stdlib.h> +#include <string.h> struct bd_bdplus { @@ -46,6 +47,8 @@ /* old API */ fptr_p_void title; + + int impl_id; }; @@ -57,15 +60,19 @@ } } -void libbdplus_unload(BD_BDPLUS **p) +static void _unload(BD_BDPLUS *p) { - if (p && *p) { - _libbdplus_close(*p); + _libbdplus_close(p); - if ((*p)->h_libbdplus) { - dl_dlclose((*p)->h_libbdplus); - } + if (p->h_libbdplus) { + dl_dlclose(p->h_libbdplus); + } +} +void libbdplus_unload(BD_BDPLUS **p) +{ + if (p && *p) { + _unload(*p); X_FREE(*p); } } @@ -81,7 +88,11 @@ return 0; } -static void *_libbdplus_open(void) +#define IMPL_USER 0 +#define IMPL_LIBBDPLUS 1 +#define IMPL_LIBMMBD 2 + +static void *_libbdplus_open(int *impl_id) { const char * const libbdplus[] = { getenv("LIBBDPLUS_PATH"), @@ -90,10 +101,11 @@ }; unsigned ii; - for (ii = 0; ii < sizeof(libbdplus) / sizeof(libbdplus[0]); ii++) { + for (ii = *impl_id; ii < sizeof(libbdplus) / sizeof(libbdplus[0]); ii++) { if (libbdplus[ii]) { void *handle = dl_dlopen(libbdplus[ii], "0"); if (handle) { + *impl_id = ii; BD_DEBUG(DBG_BLURAY, "Using %s for BD+\n", libbdplus[ii]); return handle; } @@ -104,13 +116,22 @@ return NULL; } -BD_BDPLUS *libbdplus_load(void) +int libbdplus_is_mmbd(BD_BDPLUS *p) +{ + return p && (p->impl_id == IMPL_LIBMMBD); +} + +static BD_BDPLUS *_load(int impl_id) { BD_BDPLUS *p = calloc(1, sizeof(BD_BDPLUS)); + if (!p) { + return NULL; + } + p->impl_id = impl_id; BD_DEBUG(DBG_BDPLUS, "attempting to load libbdplus\n"); - p->h_libbdplus = _libbdplus_open(); + p->h_libbdplus = _libbdplus_open(&p->impl_id); if (!p->h_libbdplus) { X_FREE(p); return NULL; @@ -141,7 +162,12 @@ return p; } -int libbdplus_init(BD_BDPLUS *p, const char *root, +BD_BDPLUS *libbdplus_load() +{ + return _load(0); +} + +int libbdplus_init(BD_BDPLUS *p, const char *root, const char *device, void *file_open_handle, void *file_open_fp, const uint8_t *vid, const uint8_t *mk) { @@ -150,6 +176,28 @@ _libbdplus_close(p); + /* force libmmbd BD+ if no AACS media key: + * - libbdplus requires media key + * - libmmbd does not export media key + * (=> libbdplus won't work with libmmbd AACS) + */ + if (mk == NULL && p->impl_id == IMPL_LIBBDPLUS) { + BD_BDPLUS *p2 = _load(IMPL_LIBMMBD); + if (p2) { + if (!libbdplus_init(p2, root, device, file_open_handle, file_open_fp, vid, mk)) { + /* succeed - swap implementations */ + _unload(p); + *p = *p2; + X_FREE(p2); + return 0; + } + /* failed - continue with original bd+ implementation */ + libbdplus_unload(&p2); + } + } + + /* */ + *(void **)(&bdplus_init) = dl_dlsym(p->h_libbdplus, "bdplus_init"); *(void **)(&set_fopen) = dl_dlsym(p->h_libbdplus, "bdplus_set_fopen"); @@ -159,10 +207,23 @@ } if (set_fopen) { + /* New libbdplus. Use libbluray for file I/O */ p->bdplus = bdplus_init(NULL, NULL, vid); set_fopen(p->bdplus, file_open_handle, file_open_fp); - } else { + } else if (root) { + /* Old libbdplus or libmmbd. Disc is mounted. */ p->bdplus = bdplus_init(root, NULL, vid); + } else if (device) { + /* Unmounted device */ + if (p->impl_id == IMPL_LIBMMBD && !strncmp(device, "/dev/", 5)) { + char *tmp = str_printf("dev:%s", device); + if (tmp) { + p->bdplus = bdplus_init(tmp, NULL, vid); + X_FREE(tmp); + } + } else { + BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Too old libbdplus detected. Disc must be mounted first.\n"); + } } if (!p->bdplus) { @@ -241,10 +302,12 @@ if (!p->m2ts) { /* use old API */ BD_BDPLUS_ST *ret = calloc(1, sizeof(BD_BDPLUS_ST)); - ret->lib = p; - ret->st = NULL; - p->title(p->bdplus, clip_id); - p->seek(p->bdplus, pos); + if (ret) { + ret->lib = p; + ret->st = NULL; + p->title(p->bdplus, clip_id); + p->seek(p->bdplus, pos); + } return ret; } @@ -258,9 +321,11 @@ p->m2ts_close(st); } else { BD_BDPLUS_ST *ret = calloc(1, sizeof(BD_BDPLUS_ST)); - ret->lib = p; - ret->st = st; - BD_DEBUG(DBG_BLURAY | DBG_CRIT, "BD+ active for clip %05d.m2ts\n", clip_id); + if (ret) { + ret->lib = p; + ret->st = st; + BD_DEBUG(DBG_BLURAY | DBG_CRIT, "BD+ active for clip %05d.m2ts\n", clip_id); + } return ret; } } diff -Nru libbluray-0.8.1/src/libbluray/disc/bdplus.h libbluray-1.0.1/src/libbluray/disc/bdplus.h --- libbluray-0.8.1/src/libbluray/disc/bdplus.h 2015-02-12 09:56:04.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/disc/bdplus.h 2017-06-23 13:34:46.000000000 +0000 @@ -29,7 +29,8 @@ BD_PRIVATE int libbdplus_required(void *have_file_handle, int (*have_file)(void *, const char *, const char *)); BD_PRIVATE BD_BDPLUS *libbdplus_load(void); -BD_PRIVATE int libbdplus_init(BD_BDPLUS *p, const char *root, +BD_PRIVATE int libbdplus_is_mmbd(BD_BDPLUS *); +BD_PRIVATE int libbdplus_init(BD_BDPLUS *p, const char *root, const char *device, void *open_file_handle, void *open_file_fp, const uint8_t *vid, const uint8_t *mk); BD_PRIVATE void libbdplus_unload(BD_BDPLUS **p); diff -Nru libbluray-0.8.1/src/libbluray/disc/dec.c libbluray-1.0.1/src/libbluray/disc/dec.c --- libbluray-0.8.1/src/libbluray/disc/dec.c 2015-02-18 17:16:19.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/disc/dec.c 2017-06-23 13:34:46.000000000 +0000 @@ -158,6 +158,10 @@ char *path; path = str_printf("%s" DIR_SEP "%s", dir, file); + if (!path) { + return 0; + } + fp = dev->pf_file_open_bdrom(dev->file_open_bdrom_handle, path); X_FREE(path); @@ -175,18 +179,7 @@ int result; const uint8_t *disc_id; - libaacs_unload(&dec->aacs); - - i->aacs_detected = libaacs_required((void*)dev, _bdrom_have_file); - if (!i->aacs_detected) { - /* no AACS */ - return 1; /* no error if libaacs is not needed */ - } - - dec->aacs = libaacs_load(); - i->libaacs_detected = !!dec->aacs; if (!dec->aacs) { - /* no libaacs */ return 0; } @@ -201,7 +194,7 @@ } if (result) { - BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_open() failed!\n"); + BD_DEBUG(DBG_BLURAY | DBG_CRIT, "aacs_open() failed: %d!\n", result); libaacs_unload(&dec->aacs); return 0; } @@ -214,15 +207,6 @@ BD_ENC_INFO *i, void *regs, void *psr_read, void *psr_write) { - libbdplus_unload(&dec->bdplus); - - i->bdplus_detected = libbdplus_required((void*)dev, _bdrom_have_file); - if (!i->bdplus_detected) { - return 0; - } - - dec->bdplus = libbdplus_load(); - i->libbdplus_detected = !!dec->bdplus; if (!dec->bdplus) { return 0; } @@ -235,7 +219,7 @@ return 0; } - if (libbdplus_init(dec->bdplus, dev->root, dev->file_open_bdrom_handle, (void*)dev->pf_file_open_bdrom, vid, mk)) { + if (libbdplus_init(dec->bdplus, dev->root, dev->device, dev->file_open_bdrom_handle, (void*)dev->pf_file_open_bdrom, vid, mk)) { BD_DEBUG(DBG_BLURAY | DBG_CRIT, "bdplus_init() failed\n"); i->bdplus_handled = 0; @@ -255,9 +239,47 @@ i->bdplus_gen = libbdplus_get_gen(dec->bdplus); i->bdplus_date = libbdplus_get_date(dec->bdplus); i->bdplus_handled = 1; + + if (i->bdplus_date == 0) { + // libmmbd -> no menu support + BD_DEBUG(DBG_BLURAY | DBG_CRIT, "WARNING: using libmmbd for BD+. On-disc menus will not work.\n"); + i->no_menu_support = 1; + } + + return 1; +} + +static int _dec_detect(struct dec_dev *dev, BD_ENC_INFO *i) +{ + /* Check for AACS */ + i->aacs_detected = libaacs_required((void*)dev, _bdrom_have_file); + if (!i->aacs_detected) { + /* No AACS (=> no BD+) */ + return 0; + } + + /* check for BD+ */ + i->bdplus_detected = libbdplus_required((void*)dev, _bdrom_have_file); return 1; } +static void _dec_load(BD_DEC *dec, BD_ENC_INFO *i) +{ + int force_mmbd_aacs = 0; + + if (i->bdplus_detected) { + /* load BD+ library and check BD+ library type. libmmbd doesn't work with libaacs */ + dec->bdplus = libbdplus_load(); + force_mmbd_aacs = dec->bdplus && libbdplus_is_mmbd(dec->bdplus); + } + + /* load AACS library */ + dec->aacs = libaacs_load(force_mmbd_aacs); + + i->libaacs_detected = !!dec->aacs; + i->libbdplus_detected = !!dec->bdplus; +} + /* * */ @@ -266,16 +288,38 @@ const char *keyfile_path, void *regs, void *psr_read, void *psr_write) { - BD_DEC *dec = calloc(1, sizeof(BD_DEC)); - if (dec) { - memset(enc_info, 0, sizeof(*enc_info)); - _libaacs_init(dec, dev, enc_info, keyfile_path); + BD_DEC *dec = NULL; + + memset(enc_info, 0, sizeof(*enc_info)); + + /* detect AACS/BD+ */ + if (!_dec_detect(dev, enc_info)) { + return NULL; + } + + dec = calloc(1, sizeof(BD_DEC)); + if (!dec) { + return NULL; + } + + /* load compatible libraries */ + _dec_load(dec, enc_info); + + /* init decoding libraries */ + /* BD+ won't help unless AACS works ... */ + if (_libaacs_init(dec, dev, enc_info, keyfile_path)) { _libbdplus_init(dec, dev, enc_info, regs, psr_read, psr_write); + } - if (!enc_info->bdplus_handled && !enc_info->aacs_handled) { - X_FREE(dec); - } + if (!enc_info->aacs_handled) { + /* AACS failed, clean up */ + dec_close(&dec); } + + /* BD+ failure may be non-fatal (not all titles in disc use BD+). + * Keep working AACS decoder even if BD+ init failed + */ + return dec; } @@ -301,6 +345,11 @@ return NULL; } +const uint8_t *dec_disc_id(BD_DEC *dec) +{ + return dec_data(dec, BD_AACS_DISC_ID); +} + void dec_start(BD_DEC *dec, uint32_t num_titles) { if (num_titles == 0) { diff -Nru libbluray-0.8.1/src/libbluray/disc/dec.h libbluray-1.0.1/src/libbluray/disc/dec.h --- libbluray-0.8.1/src/libbluray/disc/dec.h 2015-02-12 09:56:04.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/disc/dec.h 2017-06-23 13:34:46.000000000 +0000 @@ -53,6 +53,7 @@ /* get decoder data */ BD_PRIVATE const uint8_t *dec_data(BD_DEC *, int type); +BD_PRIVATE const uint8_t *dec_disc_id(BD_DEC *); /* status events from upper layers */ BD_PRIVATE void dec_start(BD_DEC *, uint32_t num_titles); diff -Nru libbluray-0.8.1/src/libbluray/disc/disc.c libbluray-1.0.1/src/libbluray/disc/disc.c --- libbluray-0.8.1/src/libbluray/disc/disc.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/disc/disc.c 2017-06-23 13:34:46.000000000 +0000 @@ -1,6 +1,6 @@ /* * This file is part of libbluray - * Copyright (C) 2014 Petri Hintukainen <phintuka@users.sourceforge.net> + * Copyright (C) 2014-2017 Petri Hintukainen <phintuka@users.sourceforge.net> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +24,7 @@ #include "disc.h" #include "dec.h" +#include "properties.h" #include "util/logging.h" #include "util/macro.h" @@ -31,15 +32,17 @@ #include "util/strutl.h" #include "file/file.h" #include "file/mount.h" +#include "file/dirs.h" +#include <ctype.h> +#include <stdio.h> #include <string.h> -#ifdef ENABLE_UDF #include "udf_fs.h" -#endif struct bd_disc { BD_MUTEX ovl_mutex; /* protect access to overlay root */ + BD_MUTEX properties_mutex; /* protect access to properties file */ char *disc_root; /* disc filesystem root (if disc is mounted) */ char *overlay_root; /* overlay filesystem root (if set) */ @@ -52,6 +55,9 @@ void (*pf_fs_close)(void *); const char *udf_volid; + char *properties_file; /* NULL if not yet used */ + + int8_t avchd; /* -1 - unknown. 0 - no. 1 - yes */ }; /* @@ -65,6 +71,10 @@ char *abs_path; abs_path = str_printf("%s%s", disc->disc_root, rel_path); + if (!abs_path) { + return NULL; + } + fp = file_open(abs_path, "rb"); X_FREE(abs_path); @@ -78,6 +88,10 @@ char *path; path = str_printf("%s%s", disc->disc_root, dir); + if (!path) { + return NULL; + } + dp = dir_open(path); X_FREE(path); @@ -85,6 +99,44 @@ } /* + * AVCHD 8.3 filenames + */ + +static char *_avchd_file_name(const char *rel_path) +{ + static const char map[][2][6] = { + { ".mpls", ".MPL" }, + { ".clpi", ".CPI" }, + { ".m2ts", ".MTS" }, + { ".bdmv", ".BDM" }, + }; + char *avchd_path = str_dup(rel_path); + char *name = avchd_path ? strrchr(avchd_path, DIR_SEP_CHAR) : NULL; + char *dot = name ? strrchr(name, '.') : NULL; + size_t i; + + if (dot) { + + /* take up to 8 chars from file name */ + for (i = 0; *name && name < dot && i < 9; i++, name++) { + *name = toupper(*name); + } + + /* convert extension */ + for (i = 0; i < sizeof(map) / sizeof(map[0]); i++) { + if (!strcmp(dot, map[i][0])) { + strcpy(name, map[i][1]); + return avchd_path; + } + } + } + + /* failed */ + X_FREE(avchd_path); + return NULL; +} + +/* * overlay filesystem */ @@ -96,8 +148,10 @@ if (p->overlay_root) { char *abs_path = str_printf("%s%s", p->overlay_root, rel_path); - fp = file_open(abs_path, "rb"); - X_FREE(abs_path); + if (abs_path) { + fp = file_open(abs_path, "rb"); + X_FREE(abs_path); + } } bd_mutex_unlock(&p->ovl_mutex); @@ -113,8 +167,10 @@ if (p->overlay_root) { char *abs_path = str_printf("%s%s", p->disc_root, dir); - dp = dir_open_default()(abs_path); - X_FREE(abs_path); + if (abs_path) { + dp = dir_open_default()(abs_path); + X_FREE(abs_path); + } } bd_mutex_unlock(&p->ovl_mutex); @@ -165,7 +221,7 @@ } /* append */ - priv = realloc(priv, sizeof(*priv) + priv->count * sizeof(BD_DIRENT)); + priv = realloc(dp->internal, sizeof(*priv) + priv->count * sizeof(BD_DIRENT)); if (!priv) { return; } @@ -183,6 +239,10 @@ dp->read = _comb_dir_read; dp->close = _comb_dir_close; dp->internal = calloc(1, sizeof(COMB_DIR)); + if (!dp->internal) { + X_FREE(dp); + goto out; + } while (!dir_read(ovl, &entry)) { _comb_dir_append(dp, &entry); @@ -191,6 +251,8 @@ _comb_dir_append(dp, &entry); } } + + out: dir_close(ovl); dir_close(rom); @@ -206,11 +268,14 @@ BD_DISC *p = calloc(1, sizeof(BD_DISC)); if (p) { bd_mutex_init(&p->ovl_mutex); + bd_mutex_init(&p->properties_mutex); /* default file access functions */ p->fs_handle = (void*)p; p->pf_file_open_bdrom = _bdrom_open_path; p->pf_dir_open_bdrom = _bdrom_open_dir; + + p->avchd = -1; } return p; } @@ -231,48 +296,50 @@ } BD_DISC *disc_open(const char *device_path, - void *read_blocks_handle, - int (*read_blocks)(void *handle, void *buf, int lba, int num_blocks), + fs_access *p_fs, struct bd_enc_info *enc_info, const char *keyfile_path, void *regs, void *psr_read, void *psr_write) { BD_DISC *p = _disc_init(); - if (p) { - _set_paths(p, device_path); - -#ifdef ENABLE_UDF - /* check if disc root directory can be opened. If not, treat it as device/image file. */ - BD_DIR_H *dp_img = device_path ? dir_open(device_path) : NULL; - if (!dp_img) { - void *udf = udf_image_open(device_path, read_blocks_handle, read_blocks); - if (!udf) { - BD_DEBUG(DBG_FILE | DBG_CRIT, "failed opening UDF image %s\n", device_path); - } else { - p->fs_handle = udf; - p->pf_fs_close = udf_image_close; - p->pf_file_open_bdrom = udf_file_open; - p->pf_dir_open_bdrom = udf_dir_open; + if (!p) { + return NULL; + } - p->udf_volid = udf_volume_id(udf); + if (p_fs && p_fs->open_dir) { + p->fs_handle = p_fs->fs_handle; + p->pf_file_open_bdrom = p_fs->open_file; + p->pf_dir_open_bdrom = p_fs->open_dir; + } - /* root not accessible with stdio */ - X_FREE(p->disc_root); - } + _set_paths(p, device_path); + + /* check if disc root directory can be opened. If not, treat it as device/image file. */ + BD_DIR_H *dp_img = device_path ? dir_open(device_path) : NULL; + if (!dp_img) { + void *udf = udf_image_open(device_path, p_fs ? p_fs->fs_handle : NULL, p_fs ? p_fs->read_blocks : NULL); + if (!udf) { + BD_DEBUG(DBG_FILE | DBG_CRIT, "failed opening UDF image %s\n", device_path); } else { - dir_close(dp_img); - BD_DEBUG(DBG_FILE, "%s does not seem to be image file or device node\n", device_path); - } -#else - (void)read_blocks_handle; - (void)read_blocks; -#endif + p->fs_handle = udf; + p->pf_fs_close = udf_image_close; + p->pf_file_open_bdrom = udf_file_open; + p->pf_dir_open_bdrom = udf_dir_open; + + p->udf_volid = udf_volume_id(udf); - struct dec_dev dev = { p->fs_handle, p->pf_file_open_bdrom, p, (file_openFp)disc_open_path, p->disc_root, device_path }; - p->dec = dec_init(&dev, enc_info, keyfile_path, regs, psr_read, psr_write); + /* root not accessible with stdio */ + X_FREE(p->disc_root); + } + } else { + dir_close(dp_img); + BD_DEBUG(DBG_FILE, "%s does not seem to be image file or device node\n", device_path); } + struct dec_dev dev = { p->fs_handle, p->pf_file_open_bdrom, p, (file_openFp)disc_open_path, p->disc_root, device_path }; + p->dec = dec_init(&dev, enc_info, keyfile_path, regs, psr_read, psr_write); + return p; } @@ -288,8 +355,10 @@ } bd_mutex_destroy(&p->ovl_mutex); + bd_mutex_destroy(&p->properties_mutex); X_FREE(p->disc_root); + X_FREE(p->properties_file); X_FREE(*pp); } } @@ -321,6 +390,18 @@ { BD_FILE_H *fp; + if (p->avchd > 0) { + char *avchd_path = _avchd_file_name(rel_path); + if (avchd_path) { + BD_DEBUG(DBG_FILE, "AVCHD: %s -> %s\n", rel_path, avchd_path); + fp = p->pf_file_open_bdrom(p->fs_handle, avchd_path); + X_FREE(avchd_path); + if (fp) { + return fp; + } + } + } + /* search file from overlay */ fp = _overlay_open_path(p, rel_path); @@ -329,7 +410,19 @@ fp = p->pf_file_open_bdrom(p->fs_handle, rel_path); if (!fp) { - BD_DEBUG(DBG_FILE | DBG_CRIT, "error opening file %s\n", rel_path); + + /* AVCHD short filenames detection */ + if (p->avchd < 0 && !strcmp(rel_path, "BDMV" DIR_SEP "index.bdmv")) { + fp = p->pf_file_open_bdrom(p->fs_handle, "BDMV" DIR_SEP "INDEX.BDM"); + if (fp) { + BD_DEBUG(DBG_FILE | DBG_CRIT, "detected AVCHD 8.3 filenames\n"); + } + p->avchd = !!fp; + } + + if (!fp) { + BD_DEBUG(DBG_FILE | DBG_CRIT, "error opening file %s\n", rel_path); + } } } @@ -342,6 +435,10 @@ char *path; path = str_printf("%s" DIR_SEP "%s", dir, file); + if (!path) { + return NULL; + } + fp = disc_open_path(p, path); X_FREE(path); @@ -377,7 +474,11 @@ *data = NULL; - fp = disc_open_file(disc, dir, file); + if (dir) { + fp = disc_open_file(disc, dir, file); + } else { + fp = disc_open_path(disc, file); + } if (!fp) { return 0; } @@ -425,6 +526,22 @@ BD_FILE_H *fp_in; BD_FILE_H *fp_out; int64_t got; + size_t size; + + if (!cache_path || !cache_path[0]) { + return -1; + } + + /* make sure cache directory exists */ + if (file_mkdirs(cache_path) < 0) { + return -1; + } + + /* plain directory ? */ + size = strlen(rel_path); + if (rel_path[size - 1] == '/' || rel_path[size - 1] == '\\') { + return 0; + } /* input file from BD-ROM */ fp_in = p->pf_file_open_bdrom(p->fs_handle, rel_path); @@ -433,9 +550,6 @@ return -1; } - /* make sure path exists */ - file_mkdirs(cache_path); - /* output file in local filesystem */ fp_out = file_open(cache_path, "wb"); if (!fp_out) { @@ -444,20 +558,20 @@ return -1; } - while (1) { + do { uint8_t buf[16*2048]; got = file_read(fp_in, buf, sizeof(buf)); - if (got <= 0) { - break; - } - if (fp_out->write(fp_out, buf, got) != got) { + + /* we'll call write(fp, buf, 0) after EOF. It is used to check for errors. */ + if (got < 0 || fp_out->write(fp_out, buf, got) != got) { BD_DEBUG(DBG_FILE | DBG_CRIT, "error caching file %s\n", rel_path); file_close(fp_out); file_close(fp_in); - file_unlink(cache_path); + (void)file_unlink(cache_path); return -1; } - } + } while (got > 0); + BD_DEBUG(DBG_FILE, "cached %s to %s\n", rel_path, cache_path); file_close(fp_out); @@ -466,6 +580,84 @@ } /* + * persistent properties storage + */ + +static char *_properties_file(BD_DISC *p) +{ + const uint8_t *disc_id = NULL; + uint8_t pseudo_id[20]; + char id_type, id_str[41]; + char *cache_home; + char *properties_file; + + cache_home = file_get_cache_home(); + if (!cache_home) { + return NULL; + } + + /* get disc ID */ + if (p->dec) { + id_type = 'A'; + disc_id = dec_disc_id(p->dec); + } + if (!disc_id) { + id_type = 'P'; + disc_pseudo_id(p, pseudo_id); + disc_id = pseudo_id; + } + + properties_file = str_printf("%s" DIR_SEP "bluray" DIR_SEP "properties" DIR_SEP "%c%s", + cache_home, id_type, + str_print_hex(id_str, disc_id, 20)); + + X_FREE(cache_home); + + return properties_file; +} + +static int _ensure_properties_file(BD_DISC *p) +{ + bd_mutex_lock(&p->properties_mutex); + if (!p->properties_file) { + p->properties_file = _properties_file(p); + } + bd_mutex_unlock(&p->properties_mutex); + + return p->properties_file ? 0 : -1; +} + +int disc_property_put(BD_DISC *p, const char *property, const char *val) +{ + int result; + + if (_ensure_properties_file(p) < 0) { + return -1; + } + + bd_mutex_lock(&p->properties_mutex); + result = properties_put(p->properties_file, property, val); + bd_mutex_unlock(&p->properties_mutex); + + return result; +} + +char *disc_property_get(BD_DISC *p, const char *property) +{ + char *result; + + if (_ensure_properties_file(p) < 0) { + return NULL; + } + + bd_mutex_lock(&p->properties_mutex); + result = properties_get(p->properties_file, property); + bd_mutex_unlock(&p->properties_mutex); + + return result; +} + +/* * streams */ @@ -496,7 +688,7 @@ void disc_event(BD_DISC *disc, uint32_t event, uint32_t param) { - if (disc->dec) { + if (disc && disc->dec) { switch (event) { case DISC_EVENT_START: dec_start(disc->dec, param); diff -Nru libbluray-0.8.1/src/libbluray/disc/disc.h libbluray-1.0.1/src/libbluray/disc/disc.h --- libbluray-0.8.1/src/libbluray/disc/disc.h 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/disc/disc.h 2017-06-23 13:34:46.000000000 +0000 @@ -1,6 +1,6 @@ /* * This file is part of libbluray - * Copyright (C) 2014 Petri Hintukainen <phintuka@users.sourceforge.net> + * Copyright (C) 2014-2017 Petri Hintukainen <phintuka@users.sourceforge.net> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,6 +29,18 @@ struct bd_dir_s; struct bd_enc_info; +/* application provided file system access (optional) */ +typedef struct fs_access { + void *fs_handle; + + /* method 1: block (device) access */ + int (*read_blocks)(void *fs_handle, void *buf, int lba, int num_blocks); + + /* method 2: file access */ + struct bd_dir_s *(*open_dir) (void *fs_handle, const char *rel_path); + struct bd_file_s *(*open_file)(void *fs_handle, const char *rel_path); +} fs_access; + /* * BluRay Virtual File System * @@ -38,8 +50,7 @@ typedef struct bd_disc BD_DISC; BD_PRIVATE BD_DISC *disc_open(const char *device_path, - void *read_blocks_handle, - int (*read_blocks)(void *handle, void *buf, int lba, int num_blocks), + fs_access *p_fs, struct bd_enc_info *enc_info, const char *keyfile_path, void *regs, void *psr_read, void *psr_write); @@ -81,6 +92,21 @@ BD_PRIVATE struct bd_file_s *disc_open_stream(BD_DISC *disc, const char *file); /* + * Store / fetch persistent properties for disc. + * Data is stored in cache directory and persists between playback sessions. + * + * Property name is ASCII string. '=' or '\n' is not allowed in name. + * property data is UTF8 string without line feeds. + */ + +BD_PRIVATE int disc_property_put(BD_DISC *disc, const char *property, const char *value); +BD_PRIVATE char *disc_property_get(BD_DISC *disc, const char *property); + +/* "Known" playlists */ +#define DISC_PROPERTY_PLAYLISTS "Playlists" +#define DISC_PROPERTY_MAIN_FEATURE "MainFeature" + +/* * */ diff -Nru libbluray-0.8.1/src/libbluray/disc/enc_info.h libbluray-1.0.1/src/libbluray/disc/enc_info.h --- libbluray-0.8.1/src/libbluray/disc/enc_info.h 2015-02-12 09:56:04.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/disc/enc_info.h 2017-06-23 13:34:46.000000000 +0000 @@ -34,6 +34,8 @@ uint8_t disc_id[20]; uint8_t bdplus_gen; uint32_t bdplus_date; + + uint8_t no_menu_support; } BD_ENC_INFO; #endif /* _BD_DISC_ENC_INFO_H_ */ diff -Nru libbluray-0.8.1/src/libbluray/disc/properties.c libbluray-1.0.1/src/libbluray/disc/properties.c --- libbluray-0.8.1/src/libbluray/disc/properties.c 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/disc/properties.c 2017-06-23 13:34:46.000000000 +0000 @@ -0,0 +1,228 @@ +/* + * This file is part of libbluray + * Copyright (C) 2017 Petri Hintukainen <phintuka@users.sourceforge.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include "properties.h" + +#include "file/file.h" +#include "util/logging.h" +#include "util/macro.h" +#include "util/strutl.h" + +#include <stdlib.h> +#include <string.h> +#include <inttypes.h> + +#define MAX_PROP_FILE_SIZE (64*1024) + +/* + * read / write file + */ + +static int _read_prop_file(const char *file, char **data) +{ + BD_FILE_H *fp; + int64_t size = -1; + + *data = NULL; + + if (file_path_exists(file) < 0) { + BD_DEBUG(DBG_FILE, "Properties file %s does not exist\n", file); + *data = str_dup(""); + if (!*data) { + return -1; + } + return 0; + } + + fp = file_open(file, "rt"); + if (!fp) { + goto unlink; + } + + size = file_size(fp); + if (size < 1 || size > MAX_PROP_FILE_SIZE) { + goto unlink; + } + + *data = malloc((size_t)size + 1); + if (!*data) { + file_close(fp); + return -1; + } + + if (file_read(fp, (uint8_t*)*data, size) != (size_t)size) { + goto unlink; + } + + file_close(fp); + (*data)[size] = 0; + return 0; + + unlink: + BD_DEBUG(DBG_FILE | DBG_CRIT, "Removing invalid properties file %s (%"PRId64" bytes)\n", file, size); + + X_FREE(*data); + if (fp) { + file_close(fp); + } + if (file_unlink(file) < 0) { + BD_DEBUG(DBG_FILE, "Error removing invalid properties file\n"); + } + *data = str_dup(""); + return *data ? 0 : -1; +} + +static int _write_prop_file(const char *file, const char *data) +{ + BD_FILE_H *fp; + size_t size; + int64_t written; + + size = strlen(data); + if (size > MAX_PROP_FILE_SIZE) { + BD_DEBUG(DBG_FILE | DBG_CRIT, "Not writing too large properties file: %s is %zu bytes\n", file, size); + return -1; + } + + if (file_mkdirs(file) < 0) { + return -1; + } + + fp = file_open(file, "wt"); + if (!fp) { + return -1; + } + + written = fp->write(fp, (const void*)data, (int64_t)size); + file_close(fp); + + if (written != (int64_t)size) { + BD_DEBUG(DBG_FILE, "Writing properties file %s failed\n", file); + if (file_unlink(file) < 0) { + BD_DEBUG(DBG_FILE, "Error removing properties file %s\n", file); + } + return -1; + } + + return 0; +} + +/* + * + */ + +static char *_scan_prop(char *data, const char *key, size_t *data_size) +{ + size_t key_size = strlen(key); + + while (data) { + if (!strncmp(data, key, key_size)) { + data += key_size; + char *lf = strchr(data, '\n'); + *data_size = lf ? (size_t)(lf - data) : strlen(data); + return data; + } + + /* next line */ + data = strchr(data, '\n'); + if (data) { + data++; + } + } + + return NULL; +} + +char *properties_get(const char *file, const char *property) +{ + char *key, *data; + size_t data_size; + char *result = NULL; + + if (strchr(property, '\n') || strchr(property, '=')) { + BD_DEBUG(DBG_FILE | DBG_CRIT, "Ignoring invalid property '%s'\n", property); + return NULL; + } + + if (_read_prop_file(file, &data) < 0) { + return NULL; + } + + key = str_printf("%s=", property); + if (!key) { + X_FREE(data); + return NULL; + } + + result = _scan_prop(data, key, &data_size); + if (result) { + result[data_size] = 0; + result = str_dup(result); + } + + X_FREE(key); + X_FREE(data); + return result; +} + +int properties_put(const char *file, const char *property, const char *val) +{ + char *key = NULL, *old_data = NULL, *new_data = NULL; + char *old_val; + size_t old_size; + int result = -1; + + if (strchr(property, '\n') || strchr(property, '=') || strchr(val, '\n')) { + BD_DEBUG(DBG_FILE | DBG_CRIT, "Ignoring invalid property '%s'='%s'\n", property, val); + goto out; + } + + if (_read_prop_file(file, &old_data) < 0) { + goto out; + } + + key = str_printf("%s=", property); + if (!key) { + goto out; + } + + old_val = _scan_prop(old_data, key, &old_size); + if (!old_val) { + new_data = str_printf("%s%s%s\n", old_data, key, val); + } else { + *old_val = 0; + new_data = str_printf("%s%s%s", old_data, val, old_val + old_size); + } + + if (!new_data) { + goto out; + } + + result = _write_prop_file(file, new_data); + + out: + X_FREE(old_data); + X_FREE(new_data); + X_FREE(key); + return result; +} diff -Nru libbluray-0.8.1/src/libbluray/disc/properties.h libbluray-1.0.1/src/libbluray/disc/properties.h --- libbluray-0.8.1/src/libbluray/disc/properties.h 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/disc/properties.h 2017-06-23 13:34:46.000000000 +0000 @@ -0,0 +1,55 @@ +/* + * This file is part of libbluray + * Copyright (C) 2017 Petri Hintukainen <phintuka@users.sourceforge.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Simple persistent storage for (key,value) pairs + * + */ + +#ifndef _BD_PROPERTIES_H_ +#define _BD_PROPERTIES_H_ + +#include "util/attributes.h" + +/* + * property name: ASCII string, no '=' or '\n' + * property value: UTF-8 string, no '\n' + */ + +/** + * + * Add / replace property value in file. + * + * @param file full path to properties file + * @param property property name + * @param val value for property + * @return 0 on success, -1 on error + */ +BD_PRIVATE int properties_put(const char *file, const char *property, const char *val); + +/** + * + * Read property value from file. + * + * @param file full path to properties file + * @param property property name + * @return property value or NULL + */ +BD_PRIVATE char *properties_get(const char *file, const char *property); + + +#endif /* _BD_PROPERTIES_H_ */ diff -Nru libbluray-0.8.1/src/libbluray/disc/udf_fs.c libbluray-1.0.1/src/libbluray/disc/udf_fs.c --- libbluray-0.8.1/src/libbluray/disc/udf_fs.c 2015-03-20 13:13:51.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/disc/udf_fs.c 2017-06-23 13:34:46.000000000 +0000 @@ -67,6 +67,9 @@ BD_FILE_H *udf_file_open(void *udf, const char *filename) { BD_FILE_H *file = calloc(1, sizeof(BD_FILE_H)); + if (!file) { + return NULL; + } BD_DEBUG(DBG_FILE, "Opening UDF file %s... (%p)\n", filename, (void*)file); @@ -116,6 +119,9 @@ BD_DIR_H *udf_dir_open(void *udf, const char* dirname) { BD_DIR_H *dir = calloc(1, sizeof(BD_DIR_H)); + if (!dir) { + return NULL; + } BD_DEBUG(DBG_DIR, "Opening UDF dir %s... (%p)\n", dirname, (void*)dir); @@ -153,7 +159,11 @@ static uint32_t _bi_size(struct udfread_block_input *bi_gen) { UDF_BI *bi = (UDF_BI *)bi_gen; - return file_size(bi->fp) / UDF_BLOCK_SIZE; + int64_t size = file_size(bi->fp); + if (size >= 0) { + return size / UDF_BLOCK_SIZE; + } + return 0; } static int _bi_read(struct udfread_block_input *bi_gen, uint32_t lba, void *buf, uint32_t nblocks, int flags) @@ -161,11 +171,12 @@ (void)flags; UDF_BI *bi = (UDF_BI *)bi_gen; int got = -1; + int64_t pos = (int64_t)lba * UDF_BLOCK_SIZE; /* seek + read must be atomic */ bd_mutex_lock(&bi->mutex); - if (file_seek(bi->fp, SEEK_SET, (int64_t)lba * UDF_BLOCK_SIZE) >= 0) { + if (file_seek(bi->fp, SEEK_SET, pos) == pos) { int64_t bytes = file_read(bi->fp, (uint8_t*)buf, (int64_t)nblocks * UDF_BLOCK_SIZE); if (bytes > 0) { got = bytes / UDF_BLOCK_SIZE; @@ -204,7 +215,7 @@ static int _si_close(struct udfread_block_input *bi_gen) { - free(bi_gen); + X_FREE(bi_gen); return 0; } diff -Nru libbluray-0.8.1/src/libbluray/hdmv/hdmv_vm.c libbluray-1.0.1/src/libbluray/hdmv/hdmv_vm.c --- libbluray-0.8.1/src/libbluray/hdmv/hdmv_vm.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/hdmv/hdmv_vm.c 2017-06-23 13:35:13.000000000 +0000 @@ -1,6 +1,6 @@ /* * This file is part of libbluray - * Copyright (C) 2010-2014 Petri Hintukainen <phintuka@users.sourceforge.net> + * Copyright (C) 2010-2017 Petri Hintukainen <phintuka@users.sourceforge.net> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -56,6 +56,7 @@ HDMV_EVENT event[5]; /* pending events to return */ NV_TIMER nv_timer; /* navigation timer */ + uint64_t rand; /* RAND state */ /* movie objects */ MOBJ_OBJECTS *movie_objects; /* disc movie objects */ @@ -353,6 +354,11 @@ p->num_titles = num_titles; p->have_top_menu = top_menu_available; p->have_first_play = first_play_available; +#ifdef DEBUG + p->rand = 1; +#else + p->rand = time(NULL); +#endif bd_mutex_init(&p->mutex); @@ -982,9 +988,16 @@ #define SWAP_u32(a, b) do { uint32_t tmp = a; a = b; b = tmp; } while(0) -static inline uint32_t RAND_u32(uint32_t range) +static inline uint32_t RAND_u32(HDMV_VM *p, uint32_t range) { - return range > 0 ? rand() % range + 1 : 0; + p->rand = p->rand * UINT64_C(6364136223846793005) + UINT64_C(1); + + if (range == 0) { + BD_DEBUG(DBG_HDMV|DBG_CRIT, "RAND_u32: invalid range (0)\n"); + return 1; + } + + return ((uint32_t)(p->rand >> 32)) % range + 1; } static inline uint32_t ADD_u32(uint32_t a, uint32_t b) @@ -1058,9 +1071,9 @@ case INSN_PLAY_PL: _play_at(p, dst, -1, -1); break; case INSN_PLAY_PL_PI: _play_at(p, dst, src, -1); break; case INSN_PLAY_PL_PM: _play_at(p, dst, -1, src); break; - case INSN_TERMINATE_PL: _play_stop(p); break; case INSN_LINK_PI: _play_at(p, -1, dst, -1); break; case INSN_LINK_MK: _play_at(p, -1, -1, dst); break; + case INSN_TERMINATE_PL: if (!_play_stop(p)) { inc_pc = 0; } break; default: BD_DEBUG(DBG_HDMV|DBG_CRIT, "unknown BRANCH/PLAY option %d in opcode 0x%08x\n", insn->branch_opt, *(uint32_t*)insn); @@ -1111,7 +1124,7 @@ case INSN_MOD: dst = src > 0 ? dst % src : 0xffffffff; break; case INSN_ADD: dst = ADD_u32(src, dst); break; case INSN_MUL: dst = MUL_u32(dst, src); break; - case INSN_RND: dst = RAND_u32(src); break; + case INSN_RND: dst = RAND_u32(p, src); break; case INSN_AND: dst &= src; break; case INSN_OR: dst |= src; break; case INSN_XOR: dst ^= src; break; diff -Nru libbluray-0.8.1/src/libbluray/hdmv/mobj_parse.c libbluray-1.0.1/src/libbluray/hdmv/mobj_parse.c --- libbluray-0.8.1/src/libbluray/hdmv/mobj_parse.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/hdmv/mobj_parse.c 2017-06-23 13:35:13.000000000 +0000 @@ -44,7 +44,9 @@ { uint32_t sig1, sig2; - bs_seek_byte(bs, 0); + if (bs_seek_byte(bs, 0) < 0) { + return 0; + } sig1 = bs_read(bs, 32); sig2 = bs_read(bs, 32); @@ -136,7 +138,10 @@ uint32_t data_len; int extension_data_start, i; - bs_init(&bs, fp); + if (bs_init(&bs, fp) < 0) { + BD_DEBUG(DBG_NAV, "MovieObject.bdmv: read error\n"); + goto error; + } if (!_mobj_parse_header(&bs, &extension_data_start)) { BD_DEBUG(DBG_NAV | DBG_CRIT, "MovieObject.bdmv: invalid header\n"); @@ -147,7 +152,10 @@ BD_DEBUG(DBG_NAV | DBG_CRIT, "MovieObject.bdmv: unknown extension data at %d\n", extension_data_start); } - bs_seek_byte(&bs, 40); + if (bs_seek_byte(&bs, 40) < 0) { + BD_DEBUG(DBG_NAV, "MovieObject.bdmv: read error\n"); + goto error; + } data_len = bs_read(&bs, 32); diff -Nru libbluray-0.8.1/src/libbluray/hdmv/mobj_print.c libbluray-1.0.1/src/libbluray/hdmv/mobj_print.c --- libbluray-0.8.1/src/libbluray/hdmv/mobj_print.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/hdmv/mobj_print.c 2017-06-23 13:35:13.000000000 +0000 @@ -159,6 +159,7 @@ /* PSR127 */ NULL, }; +#if 0 static const char * const insn_groups[4] = { "BRANCH", "COMPARE", @@ -175,6 +176,7 @@ "SET", "SETSYSTEM", }; +#endif static const char * const insn_opt_set[32] = { NULL, @@ -319,7 +321,7 @@ uint8_t u8[4]; } tmp; tmp.insn = *insn; - return (tmp.u8[0] << 24) | (tmp.u8[1] << 16) | (tmp.u8[2] << 8) | tmp.u8[3]; + return ((unsigned)tmp.u8[0] << 24) | (tmp.u8[1] << 16) | (tmp.u8[2] << 8) | tmp.u8[3]; } int mobj_sprint_cmd(char *buf, MOBJ_CMD *cmd) diff -Nru libbluray-0.8.1/src/libbluray/player_settings.h libbluray-1.0.1/src/libbluray/player_settings.h --- libbluray-0.8.1/src/libbluray/player_settings.h 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/player_settings.h 2017-06-23 13:34:46.000000000 +0000 @@ -102,6 +102,22 @@ /* + * BLURAY_PLAYER_SETTING_DISPLAY_CAP (PSR23) + * + * Display capability (bit mask) and display size + */ + +#define BLURAY_DCAP_1080p_720p_3D 0x01 /* capable of 1920x1080 23.976Hz and 1280x720 59.94Hz 3D */ +#define BLURAY_DCAP_720p_50Hz_3D 0x02 /* capable of 1280x720 50Hz 3D */ +#define BLURAY_DCAP_NO_3D_CLASSES_REQUIRED 0x04 /* 3D glasses are not required */ +#define BLURAY_DCAP_INTERLACED_3D 0x08 /* */ + +/* horizintal display size in centimeters */ +#define BLURAY_DCAP_DISPLAY_SIZE_UNDEFINED 0 +#define BLURAY_DCAP_DISPLAY_SIZE(cm) (((cm) > 0xfff ? 0xfff : (cm)) << 8) + + +/* * BLURAY_PLAYER_SETTING_VIDEO_CAP (PSR29) * * Player capability for video (bit mask) @@ -116,10 +132,48 @@ * BLURAY_PLAYER_SETTING_PLAYER_PROFILE (PSR31) * * Player profile and version + * + * Profile 1, version 1.0: no local storage, no VFS, no internet + * Profile 1, version 1.1: PiP, VFS, sec. audio, 256MB local storage, no internet + * Profile 2, version 2.0: BdLive (internet), 1GB local storage */ enum { + BLURAY_PLAYER_PROFILE_1_v1_0 = ((0x00 << 16) | (0x0100)), /* Profile 1, version 1.0 (Initial Standard Profile) */ + BLURAY_PLAYER_PROFILE_1_v1_1 = ((0x01 << 16) | (0x0110)), /* Profile 1, version 1.1 (secondary stream support) */ BLURAY_PLAYER_PROFILE_2_v2_0 = ((0x03 << 16) | (0x0200)), /* Profile 2, version 2.0 (network access, BdLive) */ + BLURAY_PLAYER_PROFILE_3_v2_0 = ((0x08 << 16) | (0x0200)), /* Profile 3, version 2.0 (audio only player) */ + BLURAY_PLAYER_PROFILE_5_v2_4 = ((0x13 << 16) | (0x0240)), /* Profile 5, version 2.4 (3D) */ +}; + + +/* + * BLURAY_PLAYER_SETTING_DECODE_PG + * + * Enable Presentation Graphics and Text Subtitle decoder + */ + +enum { + BLURAY_PG_TEXTST_DECODER_DISABLE = 0, /* disable both decoders */ + BLURAY_PG_TEXTST_DECODER_ENABLE = 1, /* enable both decoders */ +}; + + +/* + * BLURAY_PLAYER_SETTING_PERSISTENT_STORAGE + * + * Enable / disable BD-J persistent storage. + * + * If persistent storage is disabled, BD-J Xlets can't access any data + * stored during earlier playback sessions. Persistent data stored during + * current playback session will be removed and can't be accessed later. + * + * This setting can't be changed after bd_play() has been called. + */ + +enum { + BLURAY_PERSISTENT_STORAGE_DISABLE = 0, /* disable persistent storage between playback sessions */ + BLURAY_PERSISTENT_STORAGE_ENABLE = 1, /* enable persistent storage */ }; #endif /* BD_PLAYER_SETTINGS_H_ */ diff -Nru libbluray-0.8.1/src/libbluray/register.c libbluray-1.0.1/src/libbluray/register.c --- libbluray-0.8.1/src/libbluray/register.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/register.c 2017-06-23 13:34:46.000000000 +0000 @@ -362,9 +362,9 @@ * GPR read / write */ -int bd_gpr_write(BD_REGISTERS *p, int reg, uint32_t val) +int bd_gpr_write(BD_REGISTERS *p, unsigned int reg, uint32_t val) { - if (reg < 0 || reg >= BD_GPR_COUNT) { + if (reg >= BD_GPR_COUNT) { BD_DEBUG(DBG_BLURAY, "bd_gpr_write(%d): invalid register\n", reg); return -1; } @@ -373,9 +373,9 @@ return 0; } -uint32_t bd_gpr_read(BD_REGISTERS *p, int reg) +uint32_t bd_gpr_read(BD_REGISTERS *p, unsigned int reg) { - if (reg < 0 || reg >= BD_GPR_COUNT) { + if (reg >= BD_GPR_COUNT) { BD_DEBUG(DBG_BLURAY, "bd_gpr_read(%d): invalid register\n", reg); return 0; } @@ -387,11 +387,11 @@ * PSR read / write */ -uint32_t bd_psr_read(BD_REGISTERS *p, int reg) +uint32_t bd_psr_read(BD_REGISTERS *p, unsigned int reg) { uint32_t val; - if (reg < 0 || reg >= BD_PSR_COUNT) { + if (reg >= BD_PSR_COUNT) { BD_DEBUG(DBG_BLURAY, "bd_psr_read(%d): invalid register\n", reg); return -1; } @@ -405,9 +405,9 @@ return val; } -int bd_psr_setting_write(BD_REGISTERS *p, int reg, uint32_t val) +int bd_psr_setting_write(BD_REGISTERS *p, unsigned int reg, uint32_t val) { - if (reg < 0 || reg >= BD_PSR_COUNT) { + if (reg >= BD_PSR_COUNT) { BD_DEBUG(DBG_BLURAY, "bd_psr_write(%d, %d): invalid register\n", reg, val); return -1; } @@ -447,7 +447,7 @@ return 0; } -int bd_psr_write(BD_REGISTERS *p, int reg, uint32_t val) +int bd_psr_write(BD_REGISTERS *p, unsigned int reg, uint32_t val) { if ((reg == 13) || (reg >= 15 && reg <= 21) || @@ -461,7 +461,7 @@ return bd_psr_setting_write(p, reg, val); } -int bd_psr_write_bits(BD_REGISTERS *p, int reg, uint32_t val, uint32_t mask) +int bd_psr_write_bits(BD_REGISTERS *p, unsigned int reg, uint32_t val, uint32_t mask) { int result; @@ -530,3 +530,33 @@ bd_psr_unlock(p); } + +/* + * + */ + +void psr_init_3D(BD_REGISTERS *p, int initial_mode) +{ + bd_psr_lock(p); + + bd_psr_setting_write(p, PSR_OUTPUT_PREFER, + BLURAY_OUTPUT_PREFER_3D); + + bd_psr_setting_write(p, PSR_DISPLAY_CAP, + BLURAY_DCAP_1080p_720p_3D | + BLURAY_DCAP_720p_50Hz_3D | + BLURAY_DCAP_NO_3D_CLASSES_REQUIRED | + BLURAY_DCAP_INTERLACED_3D | + 0); + + bd_psr_setting_write(p, PSR_3D_CAP, + /* TODO */ 0xffffffff ); + + bd_psr_setting_write(p, PSR_PROFILE_VERSION, + BLURAY_PLAYER_PROFILE_5_v2_4); + + bd_psr_write(p, PSR_3D_STATUS, + !!initial_mode); + + bd_psr_unlock(p); +} diff -Nru libbluray-0.8.1/src/libbluray/register.h libbluray-1.0.1/src/libbluray/register.h --- libbluray-0.8.1/src/libbluray/register.h 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/libbluray/register.h 2017-06-23 13:34:46.000000000 +0000 @@ -104,7 +104,7 @@ * @param reg register number * @return value stored in register, -1 on error (invalid register number) */ -uint32_t bd_gpr_read(BD_REGISTERS *, int reg); +uint32_t bd_gpr_read(BD_REGISTERS *, unsigned int reg); /** * @@ -115,7 +115,7 @@ * @param val new value for register * @return 0 on success, -1 on error (invalid register number) */ -int bd_gpr_write(BD_REGISTERS *, int reg, uint32_t val); +int bd_gpr_write(BD_REGISTERS *, unsigned int reg, uint32_t val); /* @@ -130,7 +130,7 @@ * @param reg register number * @return value stored in register, -1 on error (invalid register number) */ -uint32_t bd_psr_read(BD_REGISTERS *, int reg); +uint32_t bd_psr_read(BD_REGISTERS *, unsigned int reg); /** * @@ -143,7 +143,7 @@ * @param val new value for register * @return 0 on success, -1 on error (invalid register number) */ -int bd_psr_write(BD_REGISTERS *, int reg, uint32_t val); +int bd_psr_write(BD_REGISTERS *, unsigned int reg, uint32_t val); /** * @@ -159,7 +159,7 @@ * @param mask bit mask. bits to be written are set to 1. * @return 0 on success, -1 on error (invalid register number) */ -int bd_psr_write_bits(BD_REGISTERS *, int reg, uint32_t val, uint32_t mask); +BD_PRIVATE int bd_psr_write_bits(BD_REGISTERS *, unsigned int reg, uint32_t val, uint32_t mask); /** * @@ -172,7 +172,7 @@ * @param val new value for register * @return 0 on success, -1 on error (invalid register number) */ -int bd_psr_setting_write(BD_REGISTERS *, int reg, uint32_t val); +BD_PRIVATE int bd_psr_setting_write(BD_REGISTERS *, unsigned int reg, uint32_t val); /** * @@ -180,7 +180,7 @@ * * @param registers BD_REGISTERS object */ -void bd_psr_lock(BD_REGISTERS *); +BD_PRIVATE void bd_psr_lock(BD_REGISTERS *); /** * @@ -188,7 +188,7 @@ * * @param registers BD_REGISTERS object */ -void bd_psr_unlock(BD_REGISTERS *); +BD_PRIVATE void bd_psr_unlock(BD_REGISTERS *); /** * @@ -198,7 +198,7 @@ * * @param registers BD_REGISTERS object */ -void bd_psr_save_state(BD_REGISTERS *); +BD_PRIVATE void bd_psr_save_state(BD_REGISTERS *); /** * @@ -209,7 +209,7 @@ * * @param registers BD_REGISTERS object */ -void bd_psr_restore_state(BD_REGISTERS *); +BD_PRIVATE void bd_psr_restore_state(BD_REGISTERS *); /** * @@ -219,7 +219,7 @@ * * @param registers BD_REGISTERS object */ -void bd_psr_reset_backup_registers(BD_REGISTERS *); +BD_PRIVATE void bd_psr_reset_backup_registers(BD_REGISTERS *); /* @@ -234,9 +234,9 @@ /* event data */ typedef struct { - int ev_type; /* event type */ + unsigned ev_type; /* event type */ - int psr_idx; /* register index */ + unsigned psr_idx; /* register index */ uint32_t old_val; /* old value of register */ uint32_t new_val; /* new value of register */ } BD_PSR_EVENT; @@ -263,6 +263,8 @@ */ void bd_psr_unregister_cb(BD_REGISTERS *, void (*callback)(void*,BD_PSR_EVENT*), void *cb_handle); +BD_PRIVATE void psr_init_3D(BD_REGISTERS *, int initial_mode); + /* * save / restore registers between playback sessions diff -Nru libbluray-0.8.1/src/util/attributes.h libbluray-1.0.1/src/util/attributes.h --- libbluray-0.8.1/src/util/attributes.h 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/util/attributes.h 2017-06-23 13:35:14.000000000 +0000 @@ -58,4 +58,10 @@ # define BD_UNLIKELY(x) __builtin_expect((x),0) #endif +#if defined(__GNUC__) && __GNUC__ > 3 +# define BD_USED __attribute__((warn_unused_result)) +#else +# define BD_USED +#endif + #endif /* LIBBLURAY_ATTRIBUTES_H_ */ diff -Nru libbluray-0.8.1/src/util/bits.c libbluray-1.0.1/src/util/bits.c --- libbluray-0.8.1/src/util/bits.c 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/util/bits.c 2017-06-23 13:35:14.000000000 +0000 @@ -20,6 +20,10 @@ * <http://www.gnu.org/licenses/>. *****************************************************************************/ +#if HAVE_CONFIG_H +#include "config.h" +#endif + #include "bits.h" #include "file/file.h" @@ -40,19 +44,43 @@ bb->i_left = 8; } -void bs_init( BITSTREAM *bs, BD_FILE_H *fp ) +static int _bs_read( BITSTREAM *bs) +{ + int result = 0; + int64_t got; + + got = file_read(bs->fp, bs->buf, BF_BUF_SIZE); + if (got <= 0 || got > BF_BUF_SIZE) { + BD_DEBUG(DBG_FILE, "_bs_read(): read error\n"); + got = 0; + result = -1; + } + + bs->size = (size_t)got; + bb_init(&bs->bb, bs->buf, bs->size); + + return result; +} + +static int _bs_read_at( BITSTREAM *bs, int64_t off ) +{ + if (file_seek(bs->fp, off, SEEK_SET) < 0) { + BD_DEBUG(DBG_FILE | DBG_CRIT, "bs_read(): seek failed\n"); + /* no change in state. Caller _must_ check return value. */ + return -1; + } + bs->pos = off; + return _bs_read(bs); +} + +int bs_init( BITSTREAM *bs, BD_FILE_H *fp ) { int64_t size = file_size(fp);; bs->fp = fp; bs->pos = 0; bs->end = (size < 0) ? 0 : size; - bs->size = file_read(bs->fp, bs->buf, BF_BUF_SIZE); - if (bs->size == 0 || bs->size > BF_BUF_SIZE) { - bs->size = 0; - bs->end = 0; - BD_DEBUG(DBG_FILE|DBG_CRIT, "bs_init(): read error!\n"); - } - bb_init(&bs->bb, bs->buf, bs->size); + + return _bs_read(bs); } void bb_seek( BITBUFFER *bb, int64_t off, int whence) @@ -82,8 +110,9 @@ } } -void bs_seek( BITSTREAM *bs, int64_t off, int whence) +static int _bs_seek( BITSTREAM *bs, int64_t off, int whence) { + int result = 0; int64_t b; switch (whence) { @@ -97,39 +126,43 @@ default: break; } + if (off < 0) { + BD_DEBUG(DBG_FILE | DBG_CRIT, "bs_seek(): seek failed (negative offset)\n"); + return -1; + } + b = off >> 3; if (b >= bs->end) { + int64_t pos; if (BF_BUF_SIZE < bs->end) { - bs->pos = bs->end - BF_BUF_SIZE; - file_seek(bs->fp, BF_BUF_SIZE, SEEK_END); + pos = bs->end - BF_BUF_SIZE; } else { - bs->pos = 0; - file_seek(bs->fp, 0, SEEK_SET); + pos = 0; } - bs->size = file_read(bs->fp, bs->buf, BF_BUF_SIZE); - bb_init(&bs->bb, bs->buf, bs->size); + result = _bs_read_at(bs, pos); bs->bb.p = bs->bb.p_end; } else if (b < bs->pos || b >= (bs->pos + BF_BUF_SIZE)) { - file_seek(bs->fp, b, SEEK_SET); - bs->pos = b; - bs->size = file_read(bs->fp, bs->buf, BF_BUF_SIZE); - bb_init(&bs->bb, bs->buf, bs->size); + result = _bs_read_at(bs, b); } else { b -= bs->pos; bs->bb.p = &bs->bb.p_start[b]; bs->bb.i_left = 8 - (off & 0x07); } + + return result; } +#if 0 void bb_seek_byte( BITBUFFER *bb, int64_t off) { bb_seek(bb, off << 3, SEEK_SET); } +#endif -void bs_seek_byte( BITSTREAM *s, int64_t off) +int bs_seek_byte( BITSTREAM *s, int64_t off) { - bs_seek(s, off << 3, SEEK_SET); + return _bs_seek(s, off << 3, SEEK_SET); } @@ -167,7 +200,7 @@ return( i_result ); } else { /* less in the buffer than requested */ - i_result |= (*bb->p&i_mask[bb->i_left]) << -i_shr; + i_result |= (unsigned)(*bb->p&i_mask[bb->i_left]) << -i_shr; i_count -= bb->i_left; bb->p++; bb->i_left = 8; diff -Nru libbluray-0.8.1/src/util/bits.h libbluray-1.0.1/src/util/bits.h --- libbluray-0.8.1/src/util/bits.h 2015-04-06 15:44:26.000000000 +0000 +++ libbluray-1.0.1/src/util/bits.h 2017-06-23 13:35:14.000000000 +0000 @@ -49,17 +49,17 @@ BD_FILE_H *fp; uint8_t buf[BF_BUF_SIZE]; BITBUFFER bb; - int64_t pos; - int64_t end; - size_t size; + int64_t pos; /* file offset of buffer start (buf[0]) */ + int64_t end; /* size of file */ + size_t size; /* bytes in buf */ } BITSTREAM; BD_PRIVATE void bb_init( BITBUFFER *bb, const uint8_t *p_data, size_t i_data ); -BD_PRIVATE void bs_init( BITSTREAM *bs, BD_FILE_H *fp ); +BD_PRIVATE int bs_init( BITSTREAM *bs, BD_FILE_H *fp ) BD_USED; BD_PRIVATE void bb_seek( BITBUFFER *bb, int64_t off, int whence); -BD_PRIVATE void bs_seek( BITSTREAM *bs, int64_t off, int whence); -BD_PRIVATE void bb_seek_byte( BITBUFFER *bb, int64_t off); -BD_PRIVATE void bs_seek_byte( BITSTREAM *s, int64_t off); +//BD_PRIVATE void bs_seek( BITSTREAM *bs, int64_t off, int whence); +//BD_PRIVATE void bb_seek_byte( BITBUFFER *bb, int64_t off); +BD_PRIVATE int bs_seek_byte( BITSTREAM *s, int64_t off) BD_USED; BD_PRIVATE void bb_skip( BITBUFFER *bb, size_t i_count ); BD_PRIVATE void bs_skip( BITSTREAM *bs, size_t i_count ); /* note: i_count must be less than BF_BUF_SIZE */ BD_PRIVATE uint32_t bb_read( BITBUFFER *bb, int i_count ); diff -Nru libbluray-0.8.1/src/util/event_queue.c libbluray-1.0.1/src/util/event_queue.c --- libbluray-0.8.1/src/util/event_queue.c 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/util/event_queue.c 2017-06-23 13:35:14.000000000 +0000 @@ -0,0 +1,104 @@ +/* + * This file is part of libbluray + * Copyright (C) 2010-2016 Petri Hintukainen <phintuka@users.sourceforge.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include "event_queue.h" + +#include "util/macro.h" +#include "util/mutex.h" + +#include <string.h> + + +#define MAX_EVENTS 31 /* 2^n - 1 */ + +struct bd_event_queue { + BD_MUTEX mutex; + size_t event_size; + unsigned in; /* next free slot */ + unsigned out; /* next event */ + + unsigned char ev[1]; +}; + + +void event_queue_destroy(BD_EVENT_QUEUE **pp) +{ + if (pp && *pp) { + BD_EVENT_QUEUE *eq = *pp; + bd_mutex_destroy(&eq->mutex); + X_FREE(*pp); + } +} + +BD_EVENT_QUEUE *event_queue_new(size_t event_size) +{ + BD_EVENT_QUEUE *eq = calloc(1, sizeof(BD_EVENT_QUEUE) + event_size * (MAX_EVENTS + 1)); + if (eq) { + bd_mutex_init(&eq->mutex); + eq->event_size = event_size; + } + return eq; +} + +int event_queue_get(BD_EVENT_QUEUE *eq, void *ev) +{ + int result = 0; + + if (eq) { + bd_mutex_lock(&eq->mutex); + + if (eq->in != eq->out) { + + memcpy(ev, &eq->ev[eq->out * eq->event_size], eq->event_size); + eq->out = (eq->out + 1) & MAX_EVENTS; + + result = 1; + } + + bd_mutex_unlock(&eq->mutex); + } + + return result; +} + +int event_queue_put(BD_EVENT_QUEUE *eq, const void *ev) +{ + int result = 0; + + if (eq) { + bd_mutex_lock(&eq->mutex); + + unsigned new_in = (eq->in + 1) & MAX_EVENTS; + + if (new_in != eq->out) { + memcpy(&eq->ev[eq->in * eq->event_size], ev, eq->event_size); + eq->in = new_in; + + result = 1; + } + + bd_mutex_unlock(&eq->mutex); + } + + return result; +} diff -Nru libbluray-0.8.1/src/util/event_queue.h libbluray-1.0.1/src/util/event_queue.h --- libbluray-0.8.1/src/util/event_queue.h 1970-01-01 00:00:00.000000000 +0000 +++ libbluray-1.0.1/src/util/event_queue.h 2017-06-23 13:35:14.000000000 +0000 @@ -0,0 +1,35 @@ +/* + * This file is part of libbluray + * Copyright (C) 2010-2016 Petri Hintukainen <phintuka@users.sourceforge.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#if !defined(BD_EVENT_QUEUE_H_) +#define BD_EVENT_QUEUE_H_ + +#include "util/attributes.h" + +#include <stddef.h> + +typedef struct bd_event_queue BD_EVENT_QUEUE; + +BD_PRIVATE BD_EVENT_QUEUE *event_queue_new(size_t event_size); +BD_PRIVATE void event_queue_destroy(BD_EVENT_QUEUE **); + +BD_PRIVATE int event_queue_get(BD_EVENT_QUEUE *eq, void *ev); +BD_PRIVATE int event_queue_put(BD_EVENT_QUEUE *eq, const void *ev); + +#endif /* BD_EVENT_QUEUE_H_ */ diff -Nru libbluray-0.8.1/src/util/logging.c libbluray-1.0.1/src/util/logging.c --- libbluray-0.8.1/src/util/logging.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/util/logging.c 2017-06-23 13:35:14.000000000 +0000 @@ -81,19 +81,35 @@ if (mask & debug_mask) { const char *f = strrchr(file, DIR_SEP_CHAR); - char buffer[4096], *pt = buffer; + char buffer[4096]; va_list args; + int len, len2; + BD_LOG_FUNC lf; - pt += sprintf(buffer, "%s:%d: ", f ? f + 1 : file, line); + len = sprintf(buffer, "%s:%d: ", f ? f + 1 : file, line); + if (len < 0) { + return; + } va_start(args, format); - vsnprintf(pt, sizeof(buffer) - (size_t)(intptr_t)(pt - buffer) - 1, format, args); + len2 = vsnprintf(buffer + len, sizeof(buffer) - len - 1, format, args); va_end(args); - if (log_func) { - log_func(buffer); + if (len2 < 0) { + return; + } + lf = log_func; + if (lf) { + buffer[sizeof(buffer)-1] = 0; + lf(buffer); + } else { - fprintf(logfile, "%s", buffer); + len += len2; + if ((size_t)len >= sizeof(buffer)) { + len = sizeof(buffer); + } + + fwrite(buffer, len, 1, logfile); } } } diff -Nru libbluray-0.8.1/src/util/macro.h libbluray-1.0.1/src/util/macro.h --- libbluray-0.8.1/src/util/macro.h 2015-03-20 10:50:38.000000000 +0000 +++ libbluray-1.0.1/src/util/macro.h 2017-06-23 13:35:14.000000000 +0000 @@ -25,7 +25,7 @@ #define MKINT_BE16(X) ( (X)[0] << 8 | (X)[1] ) #define MKINT_BE24(X) ( (X)[0] << 16 | (X)[1] << 8 | (X)[2] ) -#define MKINT_BE32(X) ( (X)[0] << 24 | (X)[1] << 16 | (X)[2] << 8 | (X)[3] ) +#define MKINT_BE32(X) ( (unsigned)((X)[0]) << 24 | (X)[1] << 16 | (X)[2] << 8 | (X)[3] ) #define X_FREE(X) ( free(X), X = NULL ) #define BD_MIN(a,b) ((a)<(b)?(a):(b)) diff -Nru libbluray-0.8.1/src/util/refcnt.h libbluray-1.0.1/src/util/refcnt.h --- libbluray-0.8.1/src/util/refcnt.h 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/util/refcnt.h 2017-06-23 13:35:14.000000000 +0000 @@ -20,6 +20,10 @@ #ifndef BD_REFCNT_H_ #define BD_REFCNT_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include "attributes.h" #include <stddef.h> @@ -53,4 +57,8 @@ void bd_refcnt_dec(const void *obj); #endif +#ifdef __cplusplus +} +#endif + #endif // BD_REFCNT_H_ diff -Nru libbluray-0.8.1/src/util/strutl.c libbluray-1.0.1/src/util/strutl.c --- libbluray-0.8.1/src/util/strutl.c 2015-05-15 09:25:06.000000000 +0000 +++ libbluray-1.0.1/src/util/strutl.c 2017-06-23 13:35:14.000000000 +0000 @@ -1,6 +1,7 @@ /* * This file is part of libbluray * Copyright (C) 2009-2010 John Stebbins + * Copyright (C) 2011-2017 Petri Hintukainen <phintuka@users.sourceforge.net> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -118,3 +119,23 @@ return out; } + +const char *str_strcasestr(const char *haystack, const char *needle) +{ + const char *result = NULL; + + char *h = str_dup(haystack); + char *n = str_dup(needle); + if (h && n) { + str_tolower(h); + str_tolower(n); + result = strstr(h, n); + if (result) { + result = haystack + (result - h); + } + } + + X_FREE(h); + X_FREE(n); + return result; +} diff -Nru libbluray-0.8.1/src/util/strutl.h libbluray-1.0.1/src/util/strutl.h --- libbluray-0.8.1/src/util/strutl.h 2015-01-26 08:01:57.000000000 +0000 +++ libbluray-1.0.1/src/util/strutl.h 2017-06-23 13:35:14.000000000 +0000 @@ -1,6 +1,7 @@ /* * This file is part of libbluray * Copyright (C) 2009-2010 John Stebbins + * Copyright (C) 2011-2017 Petri Hintukainen <phintuka@users.sourceforge.net> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,4 +33,6 @@ BD_PRIVATE char * str_print_hex(char *out, const uint8_t *str, int count); +BD_PRIVATE const char *str_strcasestr(const char *haystack, const char *needle); + #endif // STRUTL_H_