diff -Nru gupnp-dlna-0.10.2/aclocal.m4 gupnp-dlna-0.10.3/aclocal.m4 --- gupnp-dlna-0.10.2/aclocal.m4 2013-05-30 17:01:34.000000000 +0000 +++ gupnp-dlna-0.10.3/aclocal.m4 2015-06-30 22:53:41.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -12,33 +11,246 @@ # 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'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# 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. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[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. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2013 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. -# serial 1 - # 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.11' +[am__api_version='1.14' 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.11.6], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,24 +266,22 @@ # 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.11.6])dnl +[AM_AUTOMAKE_VERSION([1.14.1])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, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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. -# serial 1 - # 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/../..'. +# $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 @@ -90,7 +300,7 @@ # # 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 +# 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, @@ -116,22 +326,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 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. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[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 @@ -150,16 +357,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# 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 @@ -169,7 +374,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# 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 @@ -182,12 +387,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" 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=]) +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], @@ -195,8 +401,8 @@ # 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'. + # 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 @@ -236,16 +442,16 @@ : > 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 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # 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" + # 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 + # 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 @@ -254,8 +460,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # 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 @@ -263,7 +469,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # 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} @@ -311,7 +517,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# 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 @@ -321,9 +527,13 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[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='\' @@ -338,20 +548,18 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # 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 @@ -364,7 +572,7 @@ # 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 + # 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. @@ -376,21 +584,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # 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 + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //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' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -408,7 +614,7 @@ # 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 +# 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], @@ -418,18 +624,21 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 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. -# serial 16 - # 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]) # ----------------------------------------------- @@ -442,7 +651,7 @@ # 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.62])dnl +[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 @@ -471,31 +680,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[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], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +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 +[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) +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([AM_PROG_MKDIR_P])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. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -506,34 +724,79 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_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)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_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)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_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 ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +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 Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +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. @@ -555,15 +818,12 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 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. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -577,16 +837,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 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. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -603,20 +861,17 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 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. -# serial 5 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -627,10 +882,11 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -638,18 +894,14 @@ ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -667,7 +919,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# 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 @@ -692,52 +944,14 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# 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. - -# serial 6 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != 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 -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 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. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -745,11 +959,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# 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 @@ -762,54 +975,22 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 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. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 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. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -819,7 +1000,7 @@ # -------------------- # 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)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -833,13 +1014,58 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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. -# serial 1 +# _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-2013 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) # ------------------- @@ -854,22 +1080,16 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 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. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -880,32 +1100,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# 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 ( - 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 - rm -f conftest.file - 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 - + 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 @@ -915,31 +1143,50 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +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, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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. -# serial 2 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[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 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} @@ -957,7 +1204,7 @@ 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. + dnl Using '$V' instead of '$(V)' breaks IRIX make. AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' else @@ -974,44 +1221,40 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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. -# serial 1 - # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# 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 +# 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 +# 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'. +# 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, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 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. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1025,18 +1268,16 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 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. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# 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 @@ -1046,240 +1287,128 @@ # 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}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# 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' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -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 +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # 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]) + [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 - 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_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 -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# 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, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# 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. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[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. - -_PKG_TEXT - -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES - +m4_include([m4/ax_append_compile_flags.m4]) +m4_include([m4/ax_append_flag.m4]) +m4_include([m4/ax_check_compile_flag.m4]) +m4_include([m4/ax_check_enable_debug.m4]) +m4_include([m4/ax_compiler_flags.m4]) +m4_include([m4/ax_compiler_flags_cflags.m4]) +m4_include([m4/ax_compiler_flags_gir.m4]) +m4_include([m4/ax_compiler_flags_ldflags.m4]) +m4_include([m4/ax_is_release.m4]) +m4_include([m4/ax_require_defined.m4]) m4_include([m4/gtk-doc.m4]) m4_include([m4/introspection.m4]) m4_include([m4/libtool.m4]) diff -Nru gupnp-dlna-0.10.2/build-aux/compile gupnp-dlna-0.10.3/build-aux/compile --- gupnp-dlna-0.10.2/build-aux/compile 2013-05-30 17:01:36.000000000 +0000 +++ gupnp-dlna-0.10.3/build-aux/compile 2015-06-30 22:53:44.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -113,6 +112,11 @@ lib=$dir/$lib.lib break fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi done IFS=$save_IFS diff -Nru gupnp-dlna-0.10.2/build-aux/config.guess gupnp-dlna-0.10.3/build-aux/config.guess --- gupnp-dlna-0.10.2/build-aux/config.guess 2013-05-30 17:01:36.000000000 +0000 +++ gupnp-dlna-0.10.3/build-aux/config.guess 2015-06-30 22:53:44.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2014-03-23' # 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 2 of the License, or +# 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 @@ -22,19 +20,17 @@ # 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. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# 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"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # 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;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-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." @@ -138,6 +132,27 @@ 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 @@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" 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} @@ -302,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,10 +820,13 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -852,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + 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 '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + 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-gnu + 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-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + 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-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + 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-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + 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-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ 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 ;; @@ -1227,19 +1256,31 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - 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 - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + 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]*:*) @@ -1256,7 +1297,7 @@ NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,157 +1371,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <. @@ -26,11 +20,12 @@ # 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. +# 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 . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-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." @@ -123,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ -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) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,10 +252,12 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -270,10 +265,11 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -287,23 +283,26 @@ | 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 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -328,7 +327,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -370,13 +369,13 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -385,11 +384,13 @@ | 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-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -403,18 +404,22 @@ | 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-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -788,11 +793,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -820,6 +829,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -828,7 +841,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1019,7 +1032,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,29 +1363,29 @@ -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* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -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* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -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*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1492,9 +1509,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1543,6 +1557,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; diff -Nru gupnp-dlna-0.10.2/build-aux/depcomp gupnp-dlna-0.10.3/build-aux/depcomp --- gupnp-dlna-0.10.2/build-aux/depcomp 2013-05-30 17:01:36.000000000 +0000 +++ gupnp-dlna-0.10.3/build-aux/depcomp 2015-06-30 22:53:44.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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 @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -57,11 +56,65 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -75,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -86,32 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -134,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -143,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -157,15 +216,14 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -174,15 +232,15 @@ ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -200,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -209,7 +266,6 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -217,19 +273,15 @@ # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -247,9 +299,8 @@ # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -262,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -273,65 +322,113 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -342,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -355,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -366,76 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -446,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -473,6 +552,7 @@ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -524,13 +604,14 @@ # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -583,10 +664,12 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -622,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -657,15 +740,15 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff -Nru gupnp-dlna-0.10.2/build-aux/install-sh gupnp-dlna-0.10.3/build-aux/install-sh --- gupnp-dlna-0.10.2/build-aux/install-sh 2013-05-30 17:01:36.000000000 +0000 +++ gupnp-dlna-0.10.3/build-aux/install-sh 2015-06-30 22:53:44.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ 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-writeable bit of parent directory when it shouldn't. + # 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 diff -Nru gupnp-dlna-0.10.2/build-aux/ltmain.sh gupnp-dlna-0.10.3/build-aux/ltmain.sh --- gupnp-dlna-0.10.2/build-aux/ltmain.sh 2013-05-30 17:01:31.000000000 +0000 +++ gupnp-dlna-0.10.3/build-aux/ltmain.sh 2015-06-30 22:53:37.000000000 +0000 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.2ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1.11" TIMESTAMP="" package_revision=1.3337 diff -Nru gupnp-dlna-0.10.2/build-aux/missing gupnp-dlna-0.10.3/build-aux/missing --- gupnp-dlna-0.10.2/build-aux/missing 2013-05-30 17:01:36.000000000 +0000 +++ gupnp-dlna-0.10.3/build-aux/missing 2015-06-30 22:53:44.000000000 +0000 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # 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 @@ -26,68 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru gupnp-dlna-0.10.2/build-aux/test-driver gupnp-dlna-0.10.3/build-aux/test-driver --- gupnp-dlna-0.10.2/build-aux/test-driver 1970-01-01 00:00:00.000000000 +0000 +++ gupnp-dlna-0.10.3/build-aux/test-driver 2015-06-30 22:53:44.000000000 +0000 @@ -0,0 +1,139 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2013 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 +# the Free Software Foundation; either version 2, 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 file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru gupnp-dlna-0.10.2/config.h.in gupnp-dlna-0.10.3/config.h.in --- gupnp-dlna-0.10.2/config.h.in 2013-05-30 17:01:35.000000000 +0000 +++ gupnp-dlna-0.10.3/config.h.in 2015-06-30 22:53:43.000000000 +0000 @@ -34,8 +34,8 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O +/* Define if debugging is disabled */ +#undef NDEBUG /* Name of package */ #undef PACKAGE diff -Nru gupnp-dlna-0.10.2/configure gupnp-dlna-0.10.3/configure --- gupnp-dlna-0.10.2/configure 2013-05-30 17:01:35.000000000 +0000 +++ gupnp-dlna-0.10.3/configure 2015-06-30 22:53:42.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gupnp-dlna 0.10.2. +# Generated by GNU Autoconf 2.69 for gupnp-dlna 0.10.3. # # Report bugs to . # @@ -651,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='gupnp-dlna' PACKAGE_TARNAME='gupnp-dlna' -PACKAGE_VERSION='0.10.2' -PACKAGE_STRING='gupnp-dlna 0.10.2' +PACKAGE_VERSION='0.10.3' +PACKAGE_STRING='gupnp-dlna 0.10.3' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gupnp&component=gupnp-dlna' PACKAGE_URL='http://www.gupnp.org/' @@ -711,11 +711,14 @@ GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE +HAVE_GTK_DOC_FALSE +HAVE_GTK_DOC_TRUE GTKDOC_DEPS_LIBS GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE +GTKDOC_CHECK_PATH GTKDOC_CHECK HAVE_VAPIGEN_FALSE HAVE_VAPIGEN_TRUE @@ -772,7 +775,6 @@ DUMPBIN LD FGREP -SED host_os host_vendor host_cpu @@ -785,6 +787,10 @@ OBJDUMP DLLTOOL AS +WARN_SCANNERFLAGS +WARN_LDFLAGS +WARN_CFLAGS +SED EGREP GREP CPP @@ -806,13 +812,13 @@ CFLAGS CC GUPNP_DLNA_VERSION_INFO +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V -MAINT -MAINTAINER_MODE_FALSE -MAINTAINER_MODE_TRUE am__untar am__tar AMTAR @@ -877,9 +883,12 @@ ac_subst_files='' ac_user_opts=' enable_option_checking -enable_maintainer_mode enable_silent_rules +enable_maintainer_mode +enable_debug enable_dependency_tracking +enable_compile_warnings +enable_Werror enable_shared enable_static with_pic @@ -891,7 +900,6 @@ enable_gstreamer_metadata_backend enable_legacy_gstreamer_metadata_backend with_default_metadata_backend_dir -enable_debug enable_introspection with_html_dir enable_gtk_doc @@ -1468,7 +1476,7 @@ # 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 gupnp-dlna 0.10.2 to adapt to many kinds of systems. +\`configure' configures gupnp-dlna 0.10.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1538,7 +1546,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gupnp-dlna 0.10.2:";; + short | recursive ) echo "Configuration of gupnp-dlna 0.10.3:";; esac cat <<\_ACEOF @@ -1546,12 +1554,19 @@ --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] - --disable-maintainer-mode disable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --disable-maintainer-mode + disable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-debug[=yes] compile with debugging; one of yes/info/profile/no + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build + --enable-compile-warnings=[no/yes/error] + Enable compiler warnings and errors + --disable-Werror Unconditionally make all compiler warnings non-fatal --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1696,7 +1711,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gupnp-dlna configure 0.10.2 +gupnp-dlna configure 0.10.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1974,7 +1989,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gupnp-dlna $as_me 0.10.2, which was +It was created by gupnp-dlna $as_me 0.10.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2357,7 +2372,7 @@ -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2454,9 +2469,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2467,32 +2479,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# 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 ( - 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 - rm -f conftest.file - 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 + 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 @@ -2504,6 +2524,16 @@ 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. @@ -2526,12 +2556,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +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;} + { $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}" != xset; then @@ -2543,10 +2573,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# 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. +# 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. @@ -2685,12 +2715,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - 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. @@ -2773,6 +2797,45 @@ 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." @@ -2795,7 +2858,7 @@ # Define the identity of the package. PACKAGE='gupnp-dlna' - VERSION='0.10.2' + VERSION='0.10.3' cat >>confdefs.h <<_ACEOF @@ -2823,6 +2886,12 @@ 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. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used @@ -2830,86 +2899,125 @@ AMTAR='$${TAR-tar}' -{ $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; } -# Loop over all known methods to create a tar archive until one works. +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar plaintar pax cpio none' -_am_tools=${am_cv_prog_tar_ustar-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -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 + +# 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 + 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 - # 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 + # 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 + 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); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir + { 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 : + 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 "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 $as_echo "$am_cv_prog_tar_ustar" >&6; } @@ -2917,6 +3025,49 @@ +# 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 + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -2945,10 +3096,10 @@ enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +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 @@ -2980,6 +3131,81 @@ AM_BACKSLASH='\' + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable debugging" >&5 +$as_echo_n "checking whether to enable debugging... " >&6; } + + + + + + # Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; +else + enable_debug=yes +fi + + if test "x$enable_debug" = "xyes" || test "x$enable_debug" = "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CFLAGS="${CFLAGS} -g -O0" + CXXFLAGS="${CXXFLAGS} -g -O0" + FFLAGS="${FFLAGS} -g -O0" + FCFLAGS="${FCFLAGS} -g -O0" + OBJCFLAGS="${OBJCFLAGS} -g -O0" + + + else + if test "x$enable_debug" = "xinfo"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: info" >&5 +$as_echo "info" >&6; } + CFLAGS="${CFLAGS} -g" + CXXFLAGS="${CXXFLAGS} -g" + FFLAGS="${FFLAGS} -g" + FCFLAGS="${FCFLAGS} -g" + OBJCFLAGS="${OBJCFLAGS} -g" + elif test "x$enable_debug" = "xprofile"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: profile" >&5 +$as_echo "profile" >&6; } + CFLAGS="${CFLAGS} -g -pg" + CXXFLAGS="${CXXFLAGS} -g -pg" + FFLAGS="${FFLAGS} -g -pg" + FCFLAGS="${FCFLAGS} -g -pg" + OBJCFLAGS="${OBJCFLAGS} -g -pg" + LDFLAGS="${LDFLAGS} -pg" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test "x${CFLAGS+set}" != "xset"; then + CFLAGS="" + fi + if test "x${CXXFLAGS+set}" != "xset"; then + CXXFLAGS="" + fi + if test "x${FFLAGS+set}" != "xset"; then + FFLAGS="" + fi + if test "x${FCFLAGS+set}" != "xset"; then + FCFLAGS="" + fi + if test "x${OBJCFLAGS+set}" != "xset"; then + OBJCFLAGS="" + fi + fi + + +$as_echo "#define NDEBUG /**/" >>confdefs.h + + fi + ax_enable_debug=$enable_debug + + GUPNP_DLNA_CURRENT=3 GUPNP_DLNA_REVISION=0 @@ -3778,6 +4004,65 @@ 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" @@ -3797,7 +4082,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# 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 @@ -3853,8 +4138,8 @@ # 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'. + # 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 @@ -3889,16 +4174,16 @@ : > 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 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # 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" + # 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 + # 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 @@ -3907,8 +4192,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # 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 @@ -3916,7 +4201,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # 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} @@ -4262,95 +4547,1083 @@ if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - ac_cv_header_stdc=no + 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 + + + + + + + # $is_release = (.git directory does not exist) + if test -d .git; then : + ax_is_release=no +else + ax_is_release=yes +fi + + +{ $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 + + + # C support is enabled by default. + + + # Only enable C++ support if AC_PROG_CXX is called. The redefinition of + # AC_PROG_CXX is so that a fatal error is emitted if this macro is called + # before AC_PROG_CXX, which would otherwise cause no C++ warnings to be + # checked. + + + + + # Default value for IS-RELEASE is $ax_is_release + ax_compiler_flags_is_release=$ax_is_release + + # Check whether --enable-compile-warnings was given. +if test "${enable_compile_warnings+set}" = set; then : + enableval=$enable_compile_warnings; +else + if test "$ax_compiler_flags_is_release" = "yes"; then : + enable_compile_warnings="yes" +else + enable_compile_warnings="error" +fi +fi + + # Check whether --enable-Werror was given. +if test "${enable_Werror+set}" = set; then : + enableval=$enable_Werror; +else + enable_Werror=maybe +fi + + + # Return the user's chosen warning level + if test "$enable_Werror" = "no" -a \ + "$enable_compile_warnings" = "error"; then : + + enable_compile_warnings="yes" + +fi + + ax_enable_compile_warnings=$enable_compile_warnings + + + + + + + + + + + # Variable names + + + 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 + + + # Always pass -Werror=unknown-warning-option to get Clang to fail on bad + # flags, otherwise they are always appended to the warn_cflags variable, and + # Clang warns on them for every compilation unit. + # If this is passed to GCC, it will explode, so the flag must be enabled + # conditionally. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=unknown-warning-option" >&5 +$as_echo_n "checking whether C compiler accepts -Werror=unknown-warning-option... " >&6; } +if ${ax_cv_check_cflags___Werror_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ax_cv_check_cflags___Werror_unknown_warning_option=yes +else + ax_cv_check_cflags___Werror_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Werror_unknown_warning_option" >&5 +$as_echo "$ax_cv_check_cflags___Werror_unknown_warning_option" >&6; } +if test "x$ax_cv_check_cflags___Werror_unknown_warning_option" = xyes; then : + + ax_compiler_flags_test="-Werror=unknown-warning-option" + +else + + ax_compiler_flags_test="" + +fi + + + # Base flags + + + + +for flag in -fno-strict-aliasing ; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" +else + eval "$as_CACHEVAR=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : + +if ${WARN_CFLAGS+:} false; then : + + case " $WARN_CFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains \$flag"; } >&5 + (: WARN_CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_CFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + WARN_CFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + +else + : +fi + +done + + + if test "$ax_enable_compile_warnings" != "no"; then : + + # "yes" flags + + + + +for flag in -Wall -Wextra -Wundef -Wnested-externs -Wwrite-strings -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wno-unused-parameter -Wno-missing-field-initializers -Wdeclaration-after-statement -Wformat=2 -Wold-style-definition -Wcast-align -Wformat-nonliteral -Wformat-security -Wsign-compare -Wstrict-aliasing -Wshadow -Winline -Wpacked -Wmissing-format-attribute -Wmissing-noreturn -Winit-self -Wredundant-decls -Wmissing-include-dirs -Wunused-but-set-variable -Warray-bounds -Wimplicit-function-declaration -Wreturn-type -Wswitch-enum -Wswitch-default ; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" +else + eval "$as_CACHEVAR=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : + +if ${WARN_CFLAGS+:} false; then : + + case " $WARN_CFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains \$flag"; } >&5 + (: WARN_CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_CFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + WARN_CFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + +else + : +fi + +done + + +fi + if test "$ax_enable_compile_warnings" = "error"; then : + + # "error" flags; -Werror has to be appended unconditionally because + # it's not possible to test for + # + # suggest-attribute=format is disabled because it gives too many false + # positives + +if ${WARN_CFLAGS+:} false; then : + + case " $WARN_CFLAGS " in #( + *" -Werror "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains -Werror"; } >&5 + (: WARN_CFLAGS already contains -Werror) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_CFLAGS " -Werror" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + WARN_CFLAGS=-Werror + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + + + + + + +for flag in -Wno-suggest-attribute=format ; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" +else + eval "$as_CACHEVAR=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : + +if ${WARN_CFLAGS+:} false; then : + + case " $WARN_CFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains \$flag"; } >&5 + (: WARN_CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_CFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + WARN_CFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + +else + : +fi + +done + + +fi + + # In the flags below, when disabling specific flags, always add *both* + # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example) + # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall, + # which effectively turns that flag back on again as an error. + for flag in $WARN_CFLAGS; do + case $flag in #( + -Wno-*=*) : + ;; #( + -Wno-*) : + + + + + +for flag in -Wno-error=$($as_echo $flag | $SED 's/^-Wno-//'); do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" +else + eval "$as_CACHEVAR=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : + +if ${WARN_CFLAGS+:} false; then : + + case " $WARN_CFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains \$flag"; } >&5 + (: WARN_CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_CFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + WARN_CFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + +else + : +fi + +done + + ;; #( + *) : + ;; +esac + done + + 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 + + + # Substitute the variables + + + + + + + + + + + + # Variable names + + + # Always pass -Werror=unknown-warning-option to get Clang to fail on bad + # flags, otherwise they are always appended to the warn_ldflags variable, + # and Clang warns on them for every compilation unit. + # If this is passed to GCC, it will explode, so the flag must be enabled + # conditionally. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=unknown-warning-option" >&5 +$as_echo_n "checking whether C compiler accepts -Werror=unknown-warning-option... " >&6; } +if ${ax_cv_check_cflags___Werror_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ax_cv_check_cflags___Werror_unknown_warning_option=yes +else + ax_cv_check_cflags___Werror_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Werror_unknown_warning_option" >&5 +$as_echo "$ax_cv_check_cflags___Werror_unknown_warning_option" >&6; } +if test "x$ax_cv_check_cflags___Werror_unknown_warning_option" = xyes; then : + + ax_compiler_flags_test="-Werror=unknown-warning-option" + +else + + ax_compiler_flags_test="" + +fi + + + # Base flags + + + + +for flag in -Wl,--no-as-needed ; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" +else + eval "$as_CACHEVAR=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : + +if ${WARN_LDFLAGS+:} false; then : + + case " $WARN_LDFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS already contains \$flag"; } >&5 + (: WARN_LDFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_LDFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5 + (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + WARN_LDFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5 + (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + +else + : +fi + +done + + + if test "$ax_enable_compile_warnings" != "no"; then : + + # "yes" flags + + + + +for flag in ; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" +else + eval "$as_CACHEVAR=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : + +if ${WARN_LDFLAGS+:} false; then : + + case " $WARN_LDFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS already contains \$flag"; } >&5 + (: WARN_LDFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_LDFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5 + (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + WARN_LDFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5 + (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + +else + : +fi + +done + + +fi + if test "$ax_enable_compile_warnings" = "error"; then : + + # "error" flags; -Werror has to be appended unconditionally because + # it's not possible to test for + # + # suggest-attribute=format is disabled because it gives too many false + # positives + + + + +for flag in -Wl,--fatal-warnings ; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" +else + eval "$as_CACHEVAR=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : + +if ${WARN_LDFLAGS+:} false; then : + + case " $WARN_LDFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS already contains \$flag"; } >&5 + (: WARN_LDFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_LDFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5 + (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + WARN_LDFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5 + (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + +else + : +fi + +done + + +fi + + # Substitute the variables + + + + + + + # Variable names + + + # Base flags + +if ${WARN_SCANNERFLAGS+:} false; then : + + case " $WARN_SCANNERFLAGS " in #( + *" "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS already contains "; } >&5 + (: WARN_SCANNERFLAGS already contains ) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_SCANNERFLAGS " " + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5 + (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + +else + + WARN_SCANNERFLAGS= + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5 + (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + 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 : + if test "$ax_enable_compile_warnings" != "no"; then : -else - ac_cv_header_stdc=no -fi -rm -f conftest* + # "yes" flags -fi +if ${WARN_SCANNERFLAGS+:} false; then : -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 + case " $WARN_SCANNERFLAGS " in #( + *" --warn-all "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS already contains --warn-all "; } >&5 + (: WARN_SCANNERFLAGS already contains --warn-all ) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : + as_fn_append WARN_SCANNERFLAGS " --warn-all " + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5 + (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac else - ac_cv_header_stdc=no + + WARN_SCANNERFLAGS= --warn-all + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5 + (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + fi -rm -f conftest* + fi + if test "$ax_enable_compile_warnings" = "error"; then : -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 + # "error" flags -#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 : +if ${WARN_SCANNERFLAGS+:} false; then : + + case " $WARN_SCANNERFLAGS " in #( + *" --warn-error "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS already contains --warn-error "; } >&5 + (: WARN_SCANNERFLAGS already contains --warn-error ) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_SCANNERFLAGS " --warn-error " + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5 + (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac 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 + + WARN_SCANNERFLAGS= --warn-error + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5 + (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } 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 + # Substitute the variables + + + # Initialize libtool @@ -6624,7 +7897,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6649,7 +7922,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6668,7 +7944,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -12069,131 +13348,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $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; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_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. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { 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; } && - test -f conftest2.$ac_objext && { { 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 - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&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_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { 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; } && - test -f conftest2.$ac_objext && { { 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 - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; 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; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != 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 - @@ -13177,16 +14331,78 @@ - # Extract the first word of "gtkdoc-check", so it can be a program name with args. + gtk_doc_requires="gtk-doc >= 1.11" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 +$as_echo_n "checking for gtk-doc... " >&6; } + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_gtk_doc=yes +else + have_gtk_doc=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 +$as_echo "$have_gtk_doc" >&6; } + + if test "$have_gtk_doc" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&5 +$as_echo "$as_me: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&2;} + fi + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; 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_GTKDOC_CHECK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GTKDOC_CHECK"; then + ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # 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_GTKDOC_CHECK="gtkdoc-check.test" + $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 +GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; 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_GTKDOC_CHECK+:} false; then : +if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_CHECK in + case $GTKDOC_CHECK_PATH in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -13196,7 +14412,7 @@ 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_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GTKDOC_CHECK_PATH="$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 @@ -13207,10 +14423,10 @@ ;; esac fi -GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } +GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH +if test -n "$GTKDOC_CHECK_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 +$as_echo "$GTKDOC_CHECK_PATH" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13323,18 +14539,19 @@ fi - if test x$enable_gtk_doc = xyes; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.11\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.11") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - : -else - as_fn_error $? "You need to have gtk-doc >= 1.11 installed to build $PACKAGE_NAME" "$LINENO" 5 -fi - if test "x$PACKAGE_NAME" != "xglib"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } + + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + as_fn_error $? " + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 + fi + + if test "x$PACKAGE_NAME" != "xglib"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 @@ -13406,14 +14623,8 @@ $as_echo "yes" >&6; } fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } - # Check whether --enable-gtk-doc-html was given. if test "${enable_gtk_doc_html+set}" = set; then : enableval=$enable_gtk_doc_html; @@ -13438,6 +14649,14 @@ fi + if test x$have_gtk_doc = xyes; then + HAVE_GTK_DOC_TRUE= + HAVE_GTK_DOC_FALSE='#' +else + HAVE_GTK_DOC_TRUE='#' + HAVE_GTK_DOC_FALSE= +fi + if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= ENABLE_GTK_DOC_FALSE='#' @@ -13645,6 +14864,14 @@ 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='#' @@ -13689,6 +14916,10 @@ as_fn_error $? "conditional \"HAVE_VAPIGEN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -14110,7 +15341,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gupnp-dlna $as_me 0.10.2, which was +This file was extended by gupnp-dlna $as_me 0.10.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14177,7 +15408,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gupnp-dlna config.status 0.10.2 +gupnp-dlna config.status 0.10.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15200,7 +16431,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # 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 @@ -15213,7 +16444,7 @@ # 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 + # 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. @@ -15247,21 +16478,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # 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 + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //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' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || diff -Nru gupnp-dlna-0.10.2/configure.ac gupnp-dlna-0.10.3/configure.ac --- gupnp-dlna-0.10.2/configure.ac 2013-04-18 10:40:24.000000000 +0000 +++ gupnp-dlna-0.10.3/configure.ac 2015-06-30 22:50:47.000000000 +0000 @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) AC_INIT([gupnp-dlna], - [0.10.2], + [0.10.3], [https://bugzilla.gnome.org/enter_bug.cgi?product=gupnp&component=gupnp-dlna], [gupnp-dlna], [http://www.gupnp.org/]) @@ -15,6 +15,10 @@ AM_SILENT_RULES([yes]) +AX_REQUIRE_DEFINED([GTK_DOC_CHECK]) +AX_REQUIRE_DEFINED([GOBJECT_INTROSPECTION_CHECK]) +AX_CHECK_ENABLE_DEBUG([yes]) + dnl library versioning dnl Increase when changing the API GUPNP_DLNA_CURRENT=3 @@ -34,6 +38,9 @@ AC_PROG_CC AC_HEADER_STDC +AX_IS_RELEASE([git-directory]) +AX_COMPILER_FLAGS([WARN_CFLAGS]) + # Initialize libtool LT_PREREQ([2.2]) LT_INIT([win32-dll]) diff -Nru gupnp-dlna-0.10.2/data/Makefile.in gupnp-dlna-0.10.3/data/Makefile.in --- gupnp-dlna-0.10.2/data/Makefile.in 2013-05-30 17:01:36.000000000 +0000 +++ gupnp-dlna-0.10.3/data/Makefile.in 2015-06-30 22:53:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,27 +78,43 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/common.am +DIST_COMMON = $(top_srcdir)/common.am $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am subdir = data ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -108,6 +151,7 @@ } am__installdirs = "$(DESTDIR)$(dlnadir)" DATA = $(dlna_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -154,6 +198,7 @@ GST_PBU_LEGACY_LIBS = @GST_PBU_LEGACY_LIBS@ GST_PBU_LIBS = @GST_PBU_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -213,6 +258,9 @@ STRIP = @STRIP@ VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -348,11 +396,11 @@ @list='$(dlna_DATA)'; test -n "$(dlnadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(dlnadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -491,16 +539,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dlnaDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-dlnaDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dlnaDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-dlnaDATA @HAVE_XMLLINT_TRUE@check-profiles: $(dlnaprofiles) $(dlnaschemas) diff -Nru gupnp-dlna-0.10.2/debian/changelog gupnp-dlna-0.10.3/debian/changelog --- gupnp-dlna-0.10.2/debian/changelog 2013-10-26 09:59:39.000000000 +0000 +++ gupnp-dlna-0.10.3/debian/changelog 2015-07-17 19:16:48.000000000 +0000 @@ -1,8 +1,13 @@ -gupnp-dlna (0.10.2-1~jensge1~precise1) precise; urgency=low +gupnp-dlna (0.10.3-1~jensge1~precise1) precise; urgency=low - * Import 0.10.2 from debian + [ Jeremy Bicha ] + * debian/control: + - Bump minimum valac to 0.20 per configure.ac - -- Jens Georg Sat, 26 Oct 2013 11:59:20 +0200 + [ Jens Georg ] + * Import new upstream version 0.10.3 + + -- Jens Georg Fri, 17 Jul 2015 21:16:46 +0200 gupnp-dlna (0.10.2-1) unstable; urgency=low diff -Nru gupnp-dlna-0.10.2/debian/control gupnp-dlna-0.10.3/debian/control --- gupnp-dlna-0.10.2/debian/control 2013-06-04 13:42:45.000000000 +0000 +++ gupnp-dlna-0.10.3/debian/control 2015-07-17 19:14:13.000000000 +0000 @@ -12,11 +12,11 @@ libgstreamer-plugins-base1.0-dev (>= 1.0), libglib2.0-dev (>= 2.32), libgupnp-1.0-dev (>= 0.19.0), - valac (>= 0.18) | valac-0.18, + valac (>= 0.20), gtk-doc-tools, gobject-introspection (>= 0.9.12-4~), libgirepository1.0-dev (>= 0.9.12) -Standards-Version: 3.9.2 +Standards-Version: 3.9.4 Homepage: http://www.gupnp.org Vcs-Git: git://git.debian.org/git/collab-maint/gupnp-dlna.git Vcs-Browser: http://git.debian.org/?p=collab-maint/gupnp-dlna.git diff -Nru gupnp-dlna-0.10.2/debian/rules gupnp-dlna-0.10.3/debian/rules --- gupnp-dlna-0.10.2/debian/rules 2013-05-18 08:37:03.000000000 +0000 +++ gupnp-dlna-0.10.3/debian/rules 2015-07-17 19:14:13.000000000 +0000 @@ -6,7 +6,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-debug --enable-gtk-doc -DEB_DH_MAKESHLIBS_ARGS_ALL := -V +DEB_DH_MAKESHLIBS_ARGS_ALL := -V -- -c4 common-binary-predeb-arch:: list-missing diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/gupnp-dlna-sections.txt gupnp-dlna-0.10.3/doc/gupnp-dlna/gupnp-dlna-sections.txt --- gupnp-dlna-0.10.2/doc/gupnp-dlna/gupnp-dlna-sections.txt 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/gupnp-dlna-sections.txt 2015-06-30 22:54:32.000000000 +0000 @@ -1,7 +1,6 @@
gupnp-dlna-audio-information GUPnPDLNAAudioInformation -GUPnPDLNAAudioInformation GUPnPDLNAAudioInformationClass gupnp_dlna_audio_information_get_bitrate gupnp_dlna_audio_information_get_channels @@ -22,13 +21,13 @@ GUPNP_IS_DLNA_AUDIO_INFORMATION GUPNP_IS_DLNA_AUDIO_INFORMATION_CLASS GUPNP_TYPE_DLNA_AUDIO_INFORMATION +GUPnPDLNAAudioInformation gupnp_dlna_audio_information_get_type
gupnp-dlna-container-information GUPnPDLNAContainerInformation -GUPnPDLNAContainerInformation GUPnPDLNAContainerInformationClass gupnp_dlna_container_information_get_mpeg_version gupnp_dlna_container_information_get_packet_size @@ -43,6 +42,7 @@ GUPNP_IS_DLNA_CONTAINER_INFORMATION GUPNP_IS_DLNA_CONTAINER_INFORMATION_CLASS GUPNP_TYPE_DLNA_CONTAINER_INFORMATION +GUPnPDLNAContainerInformation gupnp_dlna_container_information_get_type
@@ -60,9 +60,6 @@ gupnp_dlna_int_range_free gupnp_dlna_int_range_get_min gupnp_dlna_int_range_get_max -GUPnPDLNAFractionRange -GUPnPDLNAFraction -GUPnPDLNAIntRange GUPNP_DLNA_FRACTION GUPNP_DLNA_FRACTION_RANGE @@ -70,6 +67,9 @@ GUPNP_TYPE_DLNA_FRACTION GUPNP_TYPE_DLNA_FRACTION_RANGE GUPNP_TYPE_DLNA_INT_RANGE +GUPnPDLNAFraction +GUPnPDLNAFractionRange +GUPnPDLNAIntRange gupnp_dlna_fraction_get_type gupnp_dlna_fraction_range_get_type gupnp_dlna_int_range_get_type @@ -78,7 +78,6 @@
gupnp-dlna-image-information GUPnPDLNAImageInformation -GUPnPDLNAImageInformation GUPnPDLNAImageInformationClass gupnp_dlna_image_information_get_depth gupnp_dlna_image_information_get_height @@ -91,13 +90,13 @@ GUPNP_IS_DLNA_IMAGE_INFORMATION GUPNP_IS_DLNA_IMAGE_INFORMATION_CLASS GUPNP_TYPE_DLNA_IMAGE_INFORMATION +GUPnPDLNAImageInformation gupnp_dlna_image_information_get_type
gupnp-dlna-information GUPnPDLNAInformation -GUPnPDLNAInformation GUPnPDLNAInformationClass gupnp_dlna_information_get_audio_information gupnp_dlna_information_get_container_information @@ -112,6 +111,7 @@ GUPNP_IS_DLNA_INFORMATION GUPNP_IS_DLNA_INFORMATION_CLASS GUPNP_TYPE_DLNA_INFORMATION +GUPnPDLNAInformation GUPnPDLNAInformationPrivate gupnp_dlna_information_get_type
@@ -172,10 +172,10 @@ gupnp_dlna_restriction_to_string gupnp_dlna_restriction_get_mime gupnp_dlna_restriction_get_entries -GUPnPDLNARestriction GUPNP_DLNA_RESTRICTION GUPNP_TYPE_DLNA_RESTRICTION +GUPnPDLNARestriction gupnp_dlna_restriction_get_type @@ -186,10 +186,10 @@ gupnp_dlna_value_list_is_empty gupnp_dlna_value_list_to_string gupnp_dlna_value_list_get_g_values -GUPnPDLNAValueList GUPNP_DLNA_VALUE_LIST GUPNP_TYPE_DLNA_VALUE_LIST +GUPnPDLNAValueList gupnp_dlna_value_list_get_type @@ -213,7 +213,6 @@
gupnp-dlna-video-information GUPnPDLNAVideoInformation -GUPnPDLNAVideoInformation GUPnPDLNAVideoInformationClass gupnp_dlna_video_information_get_bitrate gupnp_dlna_video_information_get_framerate @@ -233,6 +232,7 @@ GUPNP_IS_DLNA_VIDEO_INFORMATION GUPNP_IS_DLNA_VIDEO_INFORMATION_CLASS GUPNP_TYPE_DLNA_VIDEO_INFORMATION +GUPnPDLNAVideoInformation gupnp_dlna_video_information_get_type
diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/annotation-glossary.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/annotation-glossary.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/annotation-glossary.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/annotation-glossary.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,58 +2,48 @@ -Annotation Glossary - +GUPnP DLNA Reference Manual: Annotation Glossary + - + - - - - - - - - - - + + + + + + +
-

-Annotation Glossary

-

O

-
-out
-

Parameter for returning results. Default is transfer full.

+

+Annotation Glossary

A

-
-allow-none
-

NULL is ok, both for passing and for returning.

+
allow-none
+

NULL is OK, both for passing and for returning.

E

-
-element-type
-

Generics and defining elements of containers and arrays.

+
element-type
+

Generics and defining elements of containers and arrays.

+

O

+
out
+

Parameter for returning results. Default is transfer full.

T

-
-transfer full
-

Free data after the code is done.

-
-transfer none
-

Don't free data after the code is done.

+
transfer full
+

Free data after the code is done.

+
transfer none
+

Don't free data after the code is done.

- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21 \ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/ch01.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/ch01.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/ch01.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/ch01.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,30 +2,27 @@ -GUPnP DLNA - +GUPnP DLNA Reference Manual: GUPnP DLNA + - + - - - - - - - - - - + + + + + + +
-

-GUPnP DLNA

-
+

+GUPnP DLNA

+
GUPnPDLNAProfileGuesser — Utility API for discovering DLNA profile for given media. @@ -72,10 +69,6 @@

D

-GUPnPDLNAAudioInformation, struct in GUPnPDLNAAudioInformation -
-
-
GUPnPDLNAAudioInformationClass, struct in GUPnPDLNAAudioInformation
@@ -84,55 +77,35 @@
-GUPnPDLNAContainerInformation, struct in GUPnPDLNAContainerInformation -
-
-
GUPnPDLNAContainerInformationClass, struct in GUPnPDLNAContainerInformation
-GUPnPDLNAFraction, struct in gupnp-dlna-g-values -
-
-
-GUPnPDLNAFractionRange, struct in gupnp-dlna-g-values -
-
-
GUPnPDLNAFractionValue, struct in GUPnP DLNA Values
-GUPnPDLNAImageInformation, struct in GUPnPDLNAImageInformation -
-
-
GUPnPDLNAImageInformationClass, struct in GUPnPDLNAImageInformation
-GUPnPDLNAInformation, struct in GUPnPDLNAInformation +GUPnPDLNAInformation:audio-information, object property in GUPnPDLNAInformation
-GUPnPDLNAInformation:audio-information, object property in GUPnPDLNAInformation +GUPnPDLNAInformation:container-information, object property in GUPnPDLNAInformation
-GUPnPDLNAInformation:container-information, object property in GUPnPDLNAInformation +GUPnPDLNAInformation:image-information, object property in GUPnPDLNAInformation
-GUPnPDLNAInformation:image-information, object property in GUPnPDLNAInformation +GUPnPDLNAInformation:uri, object property in GUPnPDLNAInformation
-GUPnPDLNAInformation:uri, object property in GUPnPDLNAInformation -
-
-
-GUPnPDLNAInformation:video-information, object property in GUPnPDLNAInformation +GUPnPDLNAInformation:video-information, object property in GUPnPDLNAInformation
@@ -140,10 +113,6 @@
-GUPnPDLNAIntRange, struct in gupnp-dlna-g-values -
-
-
GUPnPDLNAIntValue, struct in GUPnP DLNA Values
@@ -152,31 +121,31 @@
-GUPnPDLNAProfile:audio-restrictions, object property in GUPnPDLNAProfile +GUPnPDLNAProfile:audio-restrictions, object property in GUPnPDLNAProfile
-GUPnPDLNAProfile:container-restrictions, object property in GUPnPDLNAProfile +GUPnPDLNAProfile:container-restrictions, object property in GUPnPDLNAProfile
-GUPnPDLNAProfile:extended, object property in GUPnPDLNAProfile +GUPnPDLNAProfile:extended, object property in GUPnPDLNAProfile
-GUPnPDLNAProfile:image-restrictions, object property in GUPnPDLNAProfile +GUPnPDLNAProfile:image-restrictions, object property in GUPnPDLNAProfile
-GUPnPDLNAProfile:mime, object property in GUPnPDLNAProfile +GUPnPDLNAProfile:mime, object property in GUPnPDLNAProfile
-GUPnPDLNAProfile:name, object property in GUPnPDLNAProfile +GUPnPDLNAProfile:name, object property in GUPnPDLNAProfile
-GUPnPDLNAProfile:video-restrictions, object property in GUPnPDLNAProfile +GUPnPDLNAProfile:video-restrictions, object property in GUPnPDLNAProfile
@@ -188,15 +157,15 @@
-GUPnPDLNAProfileGuesser::done, object signal in GUPnPDLNAProfileGuesser +GUPnPDLNAProfileGuesser::done, object signal in GUPnPDLNAProfileGuesser
-GUPnPDLNAProfileGuesser:extended-mode, object property in GUPnPDLNAProfileGuesser +GUPnPDLNAProfileGuesser:extended-mode, object property in GUPnPDLNAProfileGuesser
-GUPnPDLNAProfileGuesser:relaxed-mode, object property in GUPnPDLNAProfileGuesser +GUPnPDLNAProfileGuesser:relaxed-mode, object property in GUPnPDLNAProfileGuesser
@@ -204,75 +173,63 @@
-GUPnPDLNARestriction, struct in gupnp-dlna-restriction -
-
-
GUPnPDLNAStringValue, struct in GUPnP DLNA Values
-GUPnPDLNAValueList, struct in gupnp-dlna-value-list -
-
-
GUPnPDLNAValueState, enum in GUPnP DLNA Values
-GUPnPDLNAVideoInformation, struct in GUPnPDLNAVideoInformation -
-
-
GUPnPDLNAVideoInformationClass, struct in GUPnPDLNAVideoInformation
-gupnp_dlna_audio_information_get_bitrate, function in GUPnPDLNAAudioInformation +gupnp_dlna_audio_information_get_bitrate, function in GUPnPDLNAAudioInformation
-gupnp_dlna_audio_information_get_channels, function in GUPnPDLNAAudioInformation +gupnp_dlna_audio_information_get_channels, function in GUPnPDLNAAudioInformation
-gupnp_dlna_audio_information_get_depth, function in GUPnPDLNAAudioInformation +gupnp_dlna_audio_information_get_depth, function in GUPnPDLNAAudioInformation
-gupnp_dlna_audio_information_get_layer, function in GUPnPDLNAAudioInformation +gupnp_dlna_audio_information_get_layer, function in GUPnPDLNAAudioInformation
-gupnp_dlna_audio_information_get_level, function in GUPnPDLNAAudioInformation +gupnp_dlna_audio_information_get_level, function in GUPnPDLNAAudioInformation
-gupnp_dlna_audio_information_get_mime, function in GUPnPDLNAAudioInformation +gupnp_dlna_audio_information_get_mime, function in GUPnPDLNAAudioInformation
-gupnp_dlna_audio_information_get_mpeg_audio_version, function in GUPnPDLNAAudioInformation +gupnp_dlna_audio_information_get_mpeg_audio_version, function in GUPnPDLNAAudioInformation
-gupnp_dlna_audio_information_get_mpeg_version, function in GUPnPDLNAAudioInformation +gupnp_dlna_audio_information_get_mpeg_version, function in GUPnPDLNAAudioInformation
-gupnp_dlna_audio_information_get_profile, function in GUPnPDLNAAudioInformation +gupnp_dlna_audio_information_get_profile, function in GUPnPDLNAAudioInformation
-gupnp_dlna_audio_information_get_rate, function in GUPnPDLNAAudioInformation +gupnp_dlna_audio_information_get_rate, function in GUPnPDLNAAudioInformation
-gupnp_dlna_audio_information_get_stream_format, function in GUPnPDLNAAudioInformation +gupnp_dlna_audio_information_get_stream_format, function in GUPnPDLNAAudioInformation
-gupnp_dlna_audio_information_get_wma_version, function in GUPnPDLNAAudioInformation +gupnp_dlna_audio_information_get_wma_version, function in GUPnPDLNAAudioInformation
@@ -284,59 +241,59 @@
-gupnp_dlna_container_information_get_mime, function in GUPnPDLNAContainerInformation +gupnp_dlna_container_information_get_mime, function in GUPnPDLNAContainerInformation
-gupnp_dlna_container_information_get_mpeg_version, function in GUPnPDLNAContainerInformation +gupnp_dlna_container_information_get_mpeg_version, function in GUPnPDLNAContainerInformation
-gupnp_dlna_container_information_get_packet_size, function in GUPnPDLNAContainerInformation +gupnp_dlna_container_information_get_packet_size, function in GUPnPDLNAContainerInformation
-gupnp_dlna_container_information_get_profile, function in GUPnPDLNAContainerInformation +gupnp_dlna_container_information_get_profile, function in GUPnPDLNAContainerInformation
-gupnp_dlna_container_information_get_variant, function in GUPnPDLNAContainerInformation +gupnp_dlna_container_information_get_variant, function in GUPnPDLNAContainerInformation
-gupnp_dlna_container_information_is_system_stream, function in GUPnPDLNAContainerInformation +gupnp_dlna_container_information_is_system_stream, function in GUPnPDLNAContainerInformation
-gupnp_dlna_fraction_copy, function in gupnp-dlna-g-values +gupnp_dlna_fraction_copy, function in gupnp-dlna-g-values
-gupnp_dlna_fraction_free, function in gupnp-dlna-g-values +gupnp_dlna_fraction_free, function in gupnp-dlna-g-values
-gupnp_dlna_fraction_get_denominator, function in gupnp-dlna-g-values +gupnp_dlna_fraction_get_denominator, function in gupnp-dlna-g-values
-gupnp_dlna_fraction_get_numerator, function in gupnp-dlna-g-values +gupnp_dlna_fraction_get_numerator, function in gupnp-dlna-g-values
-gupnp_dlna_fraction_range_copy, function in gupnp-dlna-g-values +gupnp_dlna_fraction_range_copy, function in gupnp-dlna-g-values
-gupnp_dlna_fraction_range_free, function in gupnp-dlna-g-values +gupnp_dlna_fraction_range_free, function in gupnp-dlna-g-values
-gupnp_dlna_fraction_range_get_max, function in gupnp-dlna-g-values +gupnp_dlna_fraction_range_get_max, function in gupnp-dlna-g-values
-gupnp_dlna_fraction_range_get_min, function in gupnp-dlna-g-values +gupnp_dlna_fraction_range_get_min, function in gupnp-dlna-g-values
@@ -348,59 +305,59 @@
-gupnp_dlna_image_information_get_depth, function in GUPnPDLNAImageInformation +gupnp_dlna_image_information_get_depth, function in GUPnPDLNAImageInformation
-gupnp_dlna_image_information_get_height, function in GUPnPDLNAImageInformation +gupnp_dlna_image_information_get_height, function in GUPnPDLNAImageInformation
-gupnp_dlna_image_information_get_mime, function in GUPnPDLNAImageInformation +gupnp_dlna_image_information_get_mime, function in GUPnPDLNAImageInformation
-gupnp_dlna_image_information_get_width, function in GUPnPDLNAImageInformation +gupnp_dlna_image_information_get_width, function in GUPnPDLNAImageInformation
-gupnp_dlna_information_get_audio_information, function in GUPnPDLNAInformation +gupnp_dlna_information_get_audio_information, function in GUPnPDLNAInformation
-gupnp_dlna_information_get_container_information, function in GUPnPDLNAInformation +gupnp_dlna_information_get_container_information, function in GUPnPDLNAInformation
-gupnp_dlna_information_get_image_information, function in GUPnPDLNAInformation +gupnp_dlna_information_get_image_information, function in GUPnPDLNAInformation
-gupnp_dlna_information_get_profile_name, function in GUPnPDLNAInformation +gupnp_dlna_information_get_profile_name, function in GUPnPDLNAInformation
-gupnp_dlna_information_get_uri, function in GUPnPDLNAInformation +gupnp_dlna_information_get_uri, function in GUPnPDLNAInformation
-gupnp_dlna_information_get_video_information, function in GUPnPDLNAInformation +gupnp_dlna_information_get_video_information, function in GUPnPDLNAInformation
-gupnp_dlna_int_range_copy, function in gupnp-dlna-g-values +gupnp_dlna_int_range_copy, function in gupnp-dlna-g-values
-gupnp_dlna_int_range_free, function in gupnp-dlna-g-values +gupnp_dlna_int_range_free, function in gupnp-dlna-g-values
-gupnp_dlna_int_range_get_max, function in gupnp-dlna-g-values +gupnp_dlna_int_range_get_max, function in gupnp-dlna-g-values
-gupnp_dlna_int_range_get_min, function in gupnp-dlna-g-values +gupnp_dlna_int_range_get_min, function in gupnp-dlna-g-values
@@ -412,91 +369,91 @@
-gupnp_dlna_profile_get_audio_restrictions, function in GUPnPDLNAProfile +gupnp_dlna_profile_get_audio_restrictions, function in GUPnPDLNAProfile
-gupnp_dlna_profile_get_container_restrictions, function in GUPnPDLNAProfile +gupnp_dlna_profile_get_container_restrictions, function in GUPnPDLNAProfile
-gupnp_dlna_profile_get_extended, function in GUPnPDLNAProfile +gupnp_dlna_profile_get_extended, function in GUPnPDLNAProfile
-gupnp_dlna_profile_get_image_restrictions, function in GUPnPDLNAProfile +gupnp_dlna_profile_get_image_restrictions, function in GUPnPDLNAProfile
-gupnp_dlna_profile_get_mime, function in GUPnPDLNAProfile +gupnp_dlna_profile_get_mime, function in GUPnPDLNAProfile
-gupnp_dlna_profile_get_name, function in GUPnPDLNAProfile +gupnp_dlna_profile_get_name, function in GUPnPDLNAProfile
-gupnp_dlna_profile_get_video_restrictions, function in GUPnPDLNAProfile +gupnp_dlna_profile_get_video_restrictions, function in GUPnPDLNAProfile
-gupnp_dlna_profile_guesser_cleanup, function in GUPnPDLNAProfileGuesser +gupnp_dlna_profile_guesser_cleanup, function in GUPnPDLNAProfileGuesser
-gupnp_dlna_profile_guesser_get_extended_mode, function in GUPnPDLNAProfileGuesser +gupnp_dlna_profile_guesser_get_extended_mode, function in GUPnPDLNAProfileGuesser
-gupnp_dlna_profile_guesser_get_profile, function in GUPnPDLNAProfileGuesser +gupnp_dlna_profile_guesser_get_profile, function in GUPnPDLNAProfileGuesser
-gupnp_dlna_profile_guesser_get_relaxed_mode, function in GUPnPDLNAProfileGuesser +gupnp_dlna_profile_guesser_get_relaxed_mode, function in GUPnPDLNAProfileGuesser
-gupnp_dlna_profile_guesser_guess_profile_async, function in GUPnPDLNAProfileGuesser +gupnp_dlna_profile_guesser_guess_profile_async, function in GUPnPDLNAProfileGuesser
-gupnp_dlna_profile_guesser_guess_profile_from_info, function in GUPnPDLNAProfileGuesser +gupnp_dlna_profile_guesser_guess_profile_from_info, function in GUPnPDLNAProfileGuesser
-gupnp_dlna_profile_guesser_guess_profile_sync, function in GUPnPDLNAProfileGuesser +gupnp_dlna_profile_guesser_guess_profile_sync, function in GUPnPDLNAProfileGuesser
-gupnp_dlna_profile_guesser_list_profiles, function in GUPnPDLNAProfileGuesser +gupnp_dlna_profile_guesser_list_profiles, function in GUPnPDLNAProfileGuesser
-gupnp_dlna_profile_guesser_new, function in GUPnPDLNAProfileGuesser +gupnp_dlna_profile_guesser_new, function in GUPnPDLNAProfileGuesser
-gupnp_dlna_restriction_copy, function in gupnp-dlna-restriction +gupnp_dlna_restriction_copy, function in gupnp-dlna-restriction
-gupnp_dlna_restriction_free, function in gupnp-dlna-restriction +gupnp_dlna_restriction_free, function in gupnp-dlna-restriction
-gupnp_dlna_restriction_get_entries, function in gupnp-dlna-restriction +gupnp_dlna_restriction_get_entries, function in gupnp-dlna-restriction
-gupnp_dlna_restriction_get_mime, function in gupnp-dlna-restriction +gupnp_dlna_restriction_get_mime, function in gupnp-dlna-restriction
-gupnp_dlna_restriction_is_empty, function in gupnp-dlna-restriction +gupnp_dlna_restriction_is_empty, function in gupnp-dlna-restriction
-gupnp_dlna_restriction_to_string, function in gupnp-dlna-restriction +gupnp_dlna_restriction_to_string, function in gupnp-dlna-restriction
@@ -508,72 +465,72 @@
-gupnp_dlna_value_list_copy, function in gupnp-dlna-value-list +gupnp_dlna_value_list_copy, function in gupnp-dlna-value-list
-gupnp_dlna_value_list_free, function in gupnp-dlna-value-list +gupnp_dlna_value_list_free, function in gupnp-dlna-value-list
-gupnp_dlna_value_list_get_g_values, function in gupnp-dlna-value-list +gupnp_dlna_value_list_get_g_values, function in gupnp-dlna-value-list
-gupnp_dlna_value_list_is_empty, function in gupnp-dlna-value-list +gupnp_dlna_value_list_is_empty, function in gupnp-dlna-value-list
-gupnp_dlna_value_list_to_string, function in gupnp-dlna-value-list +gupnp_dlna_value_list_to_string, function in gupnp-dlna-value-list
-gupnp_dlna_video_information_get_bitrate, function in GUPnPDLNAVideoInformation +gupnp_dlna_video_information_get_bitrate, function in GUPnPDLNAVideoInformation
-gupnp_dlna_video_information_get_framerate, function in GUPnPDLNAVideoInformation +gupnp_dlna_video_information_get_framerate, function in GUPnPDLNAVideoInformation
-gupnp_dlna_video_information_get_height, function in GUPnPDLNAVideoInformation +gupnp_dlna_video_information_get_height, function in GUPnPDLNAVideoInformation
-gupnp_dlna_video_information_get_level, function in GUPnPDLNAVideoInformation +gupnp_dlna_video_information_get_level, function in GUPnPDLNAVideoInformation
-gupnp_dlna_video_information_get_mime, function in GUPnPDLNAVideoInformation +gupnp_dlna_video_information_get_mime, function in GUPnPDLNAVideoInformation
-gupnp_dlna_video_information_get_mpeg_version, function in GUPnPDLNAVideoInformation +gupnp_dlna_video_information_get_mpeg_version, function in GUPnPDLNAVideoInformation
-gupnp_dlna_video_information_get_pixel_aspect_ratio, function in GUPnPDLNAVideoInformation +gupnp_dlna_video_information_get_pixel_aspect_ratio, function in GUPnPDLNAVideoInformation
-gupnp_dlna_video_information_get_profile, function in GUPnPDLNAVideoInformation +gupnp_dlna_video_information_get_profile, function in GUPnPDLNAVideoInformation
-gupnp_dlna_video_information_get_width, function in GUPnPDLNAVideoInformation +gupnp_dlna_video_information_get_width, function in GUPnPDLNAVideoInformation
-gupnp_dlna_video_information_is_interlaced, function in GUPnPDLNAVideoInformation +gupnp_dlna_video_information_is_interlaced, function in GUPnPDLNAVideoInformation
-gupnp_dlna_video_information_is_system_stream, function in GUPnPDLNAVideoInformation +gupnp_dlna_video_information_is_system_stream, function in GUPnPDLNAVideoInformation
- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAAudioInformation.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAAudioInformation.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAAudioInformation.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAAudioInformation.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,32 +2,27 @@ -GUPnPDLNAAudioInformation - +GUPnP DLNA Reference Manual: GUPnPDLNAAudioInformation + - + - - - - - - - - - - + + + + + + +
@@ -36,76 +31,478 @@

GUPnPDLNAAudioInformation — Base class representing audio metadata needed for DLNA profiles matching.

- +
-
-

Synopsis

-
                    GUPnPDLNAAudioInformation;
-                    GUPnPDLNAAudioInformationClass;
-GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_bitrate
-                                                        (GUPnPDLNAAudioInformation *info);
-GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_channels
-                                                        (GUPnPDLNAAudioInformation *info);
-GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_depth
-                                                        (GUPnPDLNAAudioInformation *info);
-GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_layer
-                                                        (GUPnPDLNAAudioInformation *info);
-GUPnPDLNAStringValue gupnp_dlna_audio_information_get_level
-                                                        (GUPnPDLNAAudioInformation *info);
-GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_mpeg_audio_version
-                                                        (GUPnPDLNAAudioInformation *info);
-GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_mpeg_version
-                                                        (GUPnPDLNAAudioInformation *info);
-GUPnPDLNAStringValue gupnp_dlna_audio_information_get_profile
-                                                        (GUPnPDLNAAudioInformation *info);
-GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_rate
-                                                        (GUPnPDLNAAudioInformation *info);
-GUPnPDLNAStringValue gupnp_dlna_audio_information_get_stream_format
-                                                        (GUPnPDLNAAudioInformation *info);
-GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_wma_version
-                                                        (GUPnPDLNAAudioInformation *info);
-GUPnPDLNAStringValue gupnp_dlna_audio_information_get_mime
-                                                        (GUPnPDLNAAudioInformation *info);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+GUPnPDLNAIntValue + +gupnp_dlna_audio_information_get_bitrate () +
+GUPnPDLNAIntValue + +gupnp_dlna_audio_information_get_channels () +
+GUPnPDLNAIntValue + +gupnp_dlna_audio_information_get_depth () +
+GUPnPDLNAIntValue + +gupnp_dlna_audio_information_get_layer () +
+GUPnPDLNAStringValue + +gupnp_dlna_audio_information_get_level () +
+GUPnPDLNAIntValue + +gupnp_dlna_audio_information_get_mpeg_audio_version () +
+GUPnPDLNAIntValue + +gupnp_dlna_audio_information_get_mpeg_version () +
+GUPnPDLNAStringValue + +gupnp_dlna_audio_information_get_profile () +
+GUPnPDLNAIntValue + +gupnp_dlna_audio_information_get_rate () +
+GUPnPDLNAStringValue + +gupnp_dlna_audio_information_get_stream_format () +
+GUPnPDLNAIntValue + +gupnp_dlna_audio_information_get_wma_version () +
+GUPnPDLNAStringValue + +gupnp_dlna_audio_information_get_mime () +
+
+
+

Types and Values

+
++++ + + + + +
 GUPnPDLNAAudioInformationClass

Object Hierarchy

-
-  GObject
-   +----GUPnPDLNAAudioInformation
+
    GObject
+    ╰── GUPnPDLNAAudioInformation

Description

-

-GUPnPDLNAAudioInformation holds all audio metadatas important for +

GUPnPDLNAAudioInformation holds all audio metadatas important for matching profiles. Note that it does not mean all data should be provided for every audio file as in some cases it does not make -sense (e.g. WMA version does not make sense for MPEG audio files). -

-

-For metadata attributes that do not exist in current audio file an +sense (e.g. WMA version does not make sense for MPEG audio files).

+

For metadata attributes that do not exist in current audio file an unset value should be returned. For metadata attributes that do exist a set value with proper underlying value should be returned. In case metadata extractor has completely no clue how to extract some metadata attribute at all, an unsupported value should be returned. Note that unsupported values should be a temporary mean before fixing the multimedia framework to be able to extract -such attribute. -

-

-Note that gupnp_dlna_audio_information_get_mime() should always +such attribute.

+

Note that gupnp_dlna_audio_information_get_mime() should always return a set value. Otherwise it is highly probably that the file -will not match against any DLNA profile. -

+will not match against any DLNA profile.

-

Details

+

Functions

-

GUPnPDLNAAudioInformation

-
typedef struct _GUPnPDLNAAudioInformation GUPnPDLNAAudioInformation;
+

gupnp_dlna_audio_information_get_bitrate ()

+
GUPnPDLNAIntValue
+gupnp_dlna_audio_information_get_bitrate
+                               (GUPnPDLNAAudioInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAAudioInformation object.

 
+
+
+

Returns

+

A bitrate.

+

+
+
+
+
+

gupnp_dlna_audio_information_get_channels ()

+
GUPnPDLNAIntValue
+gupnp_dlna_audio_information_get_channels
+                               (GUPnPDLNAAudioInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAAudioInformation object.

 
+
+
+

Returns

+

A number of channels.

+

+
+
+
+
+

gupnp_dlna_audio_information_get_depth ()

+
GUPnPDLNAIntValue
+gupnp_dlna_audio_information_get_depth
+                               (GUPnPDLNAAudioInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAAudioInformation object.

 
+
+
+

Returns

+

A depth.

+

+
+
+
+
+

gupnp_dlna_audio_information_get_layer ()

+
GUPnPDLNAIntValue
+gupnp_dlna_audio_information_get_layer
+                               (GUPnPDLNAAudioInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAAudioInformation object.

 
+
+
+

Returns

+

A layer.

+

+
+
+
+
+

gupnp_dlna_audio_information_get_level ()

+
GUPnPDLNAStringValue
+gupnp_dlna_audio_information_get_level
+                               (GUPnPDLNAAudioInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAAudioInformation object.

 
+
+
+

Returns

+

A level.

+

+
+
+
+
+

gupnp_dlna_audio_information_get_mpeg_audio_version ()

+
GUPnPDLNAIntValue
+gupnp_dlna_audio_information_get_mpeg_audio_version
+                               (GUPnPDLNAAudioInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAAudioInformation object.

 
+
+
+

Returns

+

An MPEG audio version.

+

+
+
+
+
+

gupnp_dlna_audio_information_get_mpeg_version ()

+
GUPnPDLNAIntValue
+gupnp_dlna_audio_information_get_mpeg_version
+                               (GUPnPDLNAAudioInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAAudioInformation object.

 
+
+
+

Returns

+

An MPEG version.

+

+
+
+
+
+

gupnp_dlna_audio_information_get_profile ()

+
GUPnPDLNAStringValue
+gupnp_dlna_audio_information_get_profile
+                               (GUPnPDLNAAudioInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAAudioInformation object.

 
+
+
+

Returns

+

A profile.

+

+
+
+
+
+

gupnp_dlna_audio_information_get_rate ()

+
GUPnPDLNAIntValue
+gupnp_dlna_audio_information_get_rate (GUPnPDLNAAudioInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAAudioInformation object.

 
+
+
+

Returns

+

A sample rate.

+

+
+
+
+
+

gupnp_dlna_audio_information_get_stream_format ()

+
GUPnPDLNAStringValue
+gupnp_dlna_audio_information_get_stream_format
+                               (GUPnPDLNAAudioInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAAudioInformation object.

 
+
+
+

Returns

+

A stream format.

+

+
+
+
+
+

gupnp_dlna_audio_information_get_wma_version ()

+
GUPnPDLNAIntValue
+gupnp_dlna_audio_information_get_wma_version
+                               (GUPnPDLNAAudioInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAAudioInformation object.

 
+
+
+

Returns

+

A WMA version.

+

+
+
+
+
+

gupnp_dlna_audio_information_get_mime ()

+
GUPnPDLNAStringValue
+gupnp_dlna_audio_information_get_mime (GUPnPDLNAAudioInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAAudioInformation object.

 
+
+
+

Returns

+

A MIME type.

+

-
+
+
+
+

Types and Values

GUPnPDLNAAudioInformationClass

typedef struct {
@@ -150,317 +547,110 @@
         gpointer _reserved[12];
 } GUPnPDLNAAudioInformationClass;
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

GObjectClass parent_class;

Parent class.

get_bitrate ()

This is called by GUPnPDLNAProfileGuesser to get a -bitrate.

get_channels ()

This is called by GUPnPDLNAProfileGuesser to get a -channels count.

get_depth ()

This is called by GUPnPDLNAProfileGuesser to get a -depth.

get_layer ()

This is called by GUPnPDLNAProfileGuesser to get a -layer.

get_level ()

This is called by GUPnPDLNAProfileGuesser to get a -level.

get_mpeg_audio_version ()

This is called by GUPnPDLNAProfileGuesser -to get an MPEG audio version.

get_mpeg_version ()

This is called by GUPnPDLNAProfileGuesser to -get an MPEG version.

get_profile ()

This is called by GUPnPDLNAProfileGuesser to get a -profile.

get_rate ()

This is called by GUPnPDLNAProfileGuesser to get a -sample rate.

get_stream_format ()

This is called by GUPnPDLNAProfileGuesser to -get a stream format.

get_wma_version ()

This is called by GUPnPDLNAProfileGuesser to get -a WMA version.

get_mime ()

This is called by GUPnPDLNAProfileGuesser to get a MIME -type.

gpointer _reserved[12];

Padding. Ignore it.
-
-
-
-

gupnp_dlna_audio_information_get_bitrate ()

-
GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_bitrate
-                                                        (GUPnPDLNAAudioInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAAudioInformation object.

Returns :

A bitrate.
-
-
-
-

gupnp_dlna_audio_information_get_channels ()

-
GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_channels
-                                                        (GUPnPDLNAAudioInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAAudioInformation object.

Returns :

A number of channels.
-
-
-
-

gupnp_dlna_audio_information_get_depth ()

-
GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_depth
-                                                        (GUPnPDLNAAudioInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAAudioInformation object.

Returns :

A depth.
-
-
-
-

gupnp_dlna_audio_information_get_layer ()

-
GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_layer
-                                                        (GUPnPDLNAAudioInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAAudioInformation object.

Returns :

A layer.
-
-
-
-

gupnp_dlna_audio_information_get_level ()

-
GUPnPDLNAStringValue gupnp_dlna_audio_information_get_level
-                                                        (GUPnPDLNAAudioInformation *info);
-
-+
+

Members

+
+++++ - - + + + - - + + + - -

info :

A GUPnPDLNAAudioInformation object.

GObjectClass parent_class;

Parent class.

 

Returns :

A level.

get_bitrate ()

This is called by GUPnPDLNAProfileGuesser to get a +bitrate.

 
-
-
-
-

gupnp_dlna_audio_information_get_mpeg_audio_version ()

-
GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_mpeg_audio_version
-                                                        (GUPnPDLNAAudioInformation *info);
-
-- - - + + + - - + + + - -

info :

A GUPnPDLNAAudioInformation object.

get_channels ()

This is called by GUPnPDLNAProfileGuesser to get a +channels count.

 

Returns :

An MPEG audio version.

get_depth ()

This is called by GUPnPDLNAProfileGuesser to get a +depth.

 
-
-
-
-

gupnp_dlna_audio_information_get_mpeg_version ()

-
GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_mpeg_version
-                                                        (GUPnPDLNAAudioInformation *info);
-
-- - - + + + - - + + + - -

info :

A GUPnPDLNAAudioInformation object.

get_layer ()

This is called by GUPnPDLNAProfileGuesser to get a +layer.

 

Returns :

An MPEG version.

get_level ()

This is called by GUPnPDLNAProfileGuesser to get a +level.

 
-
-
-
-

gupnp_dlna_audio_information_get_profile ()

-
GUPnPDLNAStringValue gupnp_dlna_audio_information_get_profile
-                                                        (GUPnPDLNAAudioInformation *info);
-
-- - - + + + - - + + + - -

info :

A GUPnPDLNAAudioInformation object.

get_mpeg_audio_version ()

This is called by GUPnPDLNAProfileGuesser +to get an MPEG audio version.

 

Returns :

A profile.

get_mpeg_version ()

This is called by GUPnPDLNAProfileGuesser to +get an MPEG version.

 
-
-
-
-

gupnp_dlna_audio_information_get_rate ()

-
GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_rate
-                                                        (GUPnPDLNAAudioInformation *info);
-
-- - - + + + - - + + + - -

info :

A GUPnPDLNAAudioInformation object.

get_profile ()

This is called by GUPnPDLNAProfileGuesser to get a +profile.

 

Returns :

A sample rate.

get_rate ()

This is called by GUPnPDLNAProfileGuesser to get a +sample rate.

 
-
-
-
-

gupnp_dlna_audio_information_get_stream_format ()

-
GUPnPDLNAStringValue gupnp_dlna_audio_information_get_stream_format
-                                                        (GUPnPDLNAAudioInformation *info);
-
-- - - + + + - - + + + - -

info :

A GUPnPDLNAAudioInformation object.

get_stream_format ()

This is called by GUPnPDLNAProfileGuesser to +get a stream format.

 

Returns :

A stream format.

get_wma_version ()

This is called by GUPnPDLNAProfileGuesser to get +a WMA version.

 
-
-
-
-

gupnp_dlna_audio_information_get_wma_version ()

-
GUPnPDLNAIntValue   gupnp_dlna_audio_information_get_wma_version
-                                                        (GUPnPDLNAAudioInformation *info);
-
-- - - + + + - - + + +

info :

A GUPnPDLNAAudioInformation object.

get_mime ()

This is called by GUPnPDLNAProfileGuesser to get a MIME +type.

 

Returns :

A WMA version.

gpointer _reserved[12];

Padding. Ignore it.

 
-
-
-

gupnp_dlna_audio_information_get_mime ()

-
GUPnPDLNAStringValue gupnp_dlna_audio_information_get_mime
-                                                        (GUPnPDLNAAudioInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAAudioInformation object.

Returns :

A MIME type.

See Also

-GUPnPDLNABoolValue, GUPnPDLNAFractionValue, -GUPnPDLNAIntValue, GUPnPDLNAStringValue +

GUPnPDLNABoolValue, GUPnPDLNAFractionValue, +GUPnPDLNAIntValue, GUPnPDLNAStringValue

- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAContainerInformation.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAContainerInformation.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAContainerInformation.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAContainerInformation.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,32 +2,27 @@ -GUPnPDLNAContainerInformation - +GUPnP DLNA Reference Manual: GUPnPDLNAContainerInformation + - + - - - - - - - - - - + + + + + + +
@@ -36,66 +31,272 @@

GUPnPDLNAContainerInformation — Base class representing container metadata needed for DLNA profiles matching.

- +
-
-

Synopsis

-
                    GUPnPDLNAContainerInformation;
-                    GUPnPDLNAContainerInformationClass;
-GUPnPDLNAIntValue   gupnp_dlna_container_information_get_mpeg_version
-                                                        (GUPnPDLNAContainerInformation *info);
-GUPnPDLNAIntValue   gupnp_dlna_container_information_get_packet_size
-                                                        (GUPnPDLNAContainerInformation *info);
-GUPnPDLNAStringValue gupnp_dlna_container_information_get_profile
-                                                        (GUPnPDLNAContainerInformation *info);
-GUPnPDLNABoolValue  gupnp_dlna_container_information_is_system_stream
-                                                        (GUPnPDLNAContainerInformation *info);
-GUPnPDLNAStringValue gupnp_dlna_container_information_get_variant
-                                                        (GUPnPDLNAContainerInformation *info);
-GUPnPDLNAStringValue gupnp_dlna_container_information_get_mime
-                                                        (GUPnPDLNAContainerInformation *info);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+GUPnPDLNAIntValue + +gupnp_dlna_container_information_get_mpeg_version () +
+GUPnPDLNAIntValue + +gupnp_dlna_container_information_get_packet_size () +
+GUPnPDLNAStringValue + +gupnp_dlna_container_information_get_profile () +
+GUPnPDLNABoolValue + +gupnp_dlna_container_information_is_system_stream () +
+GUPnPDLNAStringValue + +gupnp_dlna_container_information_get_variant () +
+GUPnPDLNAStringValue + +gupnp_dlna_container_information_get_mime () +
+
+
+

Types and Values

+
++++ + + + + +
 GUPnPDLNAContainerInformationClass

Object Hierarchy

-
-  GObject
-   +----GUPnPDLNAContainerInformation
+
    GObject
+    ╰── GUPnPDLNAContainerInformation

Description

-

-GUPnPDLNAContainerInformation holds all container metadatas +

GUPnPDLNAContainerInformation holds all container metadatas important for matching profiles. Note that it does not mean all data should be provided for every media file as in some cases it does not make sense (e.g. MPEG version does not make sense for WMA -media files). -

-

-For metadata attributes that do not exist in current media file an +media files).

+

For metadata attributes that do not exist in current media file an unset value should be returned. For metadata attributes that do exist a set value with proper underlying value should be returned. In case metadata extractor has completely no clue how to extract some metadata attribute at all, an unsupported value should be returned. Note that unsupported values should be a temporary mean before fixing the multimedia framework to be able to extract -such attribute. -

-

-Note that gupnp_dlna_container_information_get_mime() should always +such attribute.

+

Note that gupnp_dlna_container_information_get_mime() should always return a set value. Otherwise it is highly probably that the file -will not match against any DLNA profile. -

+will not match against any DLNA profile.

-

Details

+

Functions

+
+

gupnp_dlna_container_information_get_mpeg_version ()

+
GUPnPDLNAIntValue
+gupnp_dlna_container_information_get_mpeg_version
+                               (GUPnPDLNAContainerInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAContainerInformation object.

 
+
+
+

Returns

+

An MPEG version.

+

+
+
+
+
+

gupnp_dlna_container_information_get_packet_size ()

+
GUPnPDLNAIntValue
+gupnp_dlna_container_information_get_packet_size
+                               (GUPnPDLNAContainerInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAContainerInformation object.

 
+
+
+

Returns

+

A packet size.

+

+
+
+
-

GUPnPDLNAContainerInformation

-
typedef struct _GUPnPDLNAContainerInformation GUPnPDLNAContainerInformation;
+

gupnp_dlna_container_information_get_profile ()

+
GUPnPDLNAStringValue
+gupnp_dlna_container_information_get_profile
+                               (GUPnPDLNAContainerInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAContainerInformation object.

 
+
+
+

Returns

+

A profile.

+

+
+

gupnp_dlna_container_information_is_system_stream ()

+
GUPnPDLNABoolValue
+gupnp_dlna_container_information_is_system_stream
+                               (GUPnPDLNAContainerInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAContainerInformation object.

 
+
+
+

Returns

+

Whether it is system stream.

+

+
+
+
+
+

gupnp_dlna_container_information_get_variant ()

+
GUPnPDLNAStringValue
+gupnp_dlna_container_information_get_variant
+                               (GUPnPDLNAContainerInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAContainerInformation object.

 
+
+
+

Returns

+

A variant.

+

+
+
+
+
+

gupnp_dlna_container_information_get_mime ()

+
GUPnPDLNAStringValue
+gupnp_dlna_container_information_get_mime
+                               (GUPnPDLNAContainerInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAContainerInformation object.

 
+
+
+

Returns

+

A MIME type.

+

+
+
+
+
+

Types and Values

+

GUPnPDLNAContainerInformationClass

typedef struct {
         GObjectClass parent_class;
@@ -121,173 +322,74 @@
         gpointer _reserved[12];
 } GUPnPDLNAContainerInformationClass;
-
-+
+

Members

+
+++++ - - - - - - - - - - + + + - - + + + - - + + + - - + + + - - - - - - - - -

GObjectClass parent_class;

Parent class.

get_mpeg_version ()

This is called by GUPnPDLNAProfileGuesser to -get an MPEG version.

get_packet_size ()

This is called by GUPnPDLNAProfileGuesser to get -a packet size.

GObjectClass parent_class;

Parent class.

 

get_profile ()

This is called by GUPnPDLNAProfileGuesser to get a -profile.

get_mpeg_version ()

This is called by GUPnPDLNAProfileGuesser to +get an MPEG version.

 

is_system_stream ()

This is called by GUPnPDLNAProfileGuesser to -get whether it is a system stream

get_packet_size ()

This is called by GUPnPDLNAProfileGuesser to get +a packet size.

 

get_variant ()

This is called by GUPnPDLNAProfileGuesser to get a -variant.

get_profile ()

This is called by GUPnPDLNAProfileGuesser to get a +profile.

 

get_mime ()

This is called by GUPnPDLNAProfileGuesser to get a MIME -type.

gpointer _reserved[12];

Padding. Ignore it.
-
-
-
-

gupnp_dlna_container_information_get_mpeg_version ()

-
GUPnPDLNAIntValue   gupnp_dlna_container_information_get_mpeg_version
-                                                        (GUPnPDLNAContainerInformation *info);
-
-- - - - + + + - - + + + - -

info :

A GUPnPDLNAContainerInformation object.

is_system_stream ()

This is called by GUPnPDLNAProfileGuesser to +get whether it is a system stream

 

Returns :

An MPEG version.

get_variant ()

This is called by GUPnPDLNAProfileGuesser to get a +variant.

 
-
-
-
-

gupnp_dlna_container_information_get_packet_size ()

-
GUPnPDLNAIntValue   gupnp_dlna_container_information_get_packet_size
-                                                        (GUPnPDLNAContainerInformation *info);
-
-- - - + + + - - + + +

info :

A GUPnPDLNAContainerInformation object.

get_mime ()

This is called by GUPnPDLNAProfileGuesser to get a MIME +type.

 

Returns :

A packet size.

gpointer _reserved[12];

Padding. Ignore it.

 
-
-
-

gupnp_dlna_container_information_get_profile ()

-
GUPnPDLNAStringValue gupnp_dlna_container_information_get_profile
-                                                        (GUPnPDLNAContainerInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAContainerInformation object.

Returns :

A profile.
-
-
-
-

gupnp_dlna_container_information_is_system_stream ()

-
GUPnPDLNABoolValue  gupnp_dlna_container_information_is_system_stream
-                                                        (GUPnPDLNAContainerInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAContainerInformation object.

Returns :

Whether it is system stream.
-
-
-
-

gupnp_dlna_container_information_get_variant ()

-
GUPnPDLNAStringValue gupnp_dlna_container_information_get_variant
-                                                        (GUPnPDLNAContainerInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAContainerInformation object.

Returns :

A variant.
-
-
-
-

gupnp_dlna_container_information_get_mime ()

-
GUPnPDLNAStringValue gupnp_dlna_container_information_get_mime
-                                                        (GUPnPDLNAContainerInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAContainerInformation object.

Returns :

A MIME type.

See Also

-GUPnPDLNABoolValue, GUPnPDLNAFractionValue, -GUPnPDLNAIntValue, GUPnPDLNAStringValue +

GUPnPDLNABoolValue, GUPnPDLNAFractionValue, +GUPnPDLNAIntValue, GUPnPDLNAStringValue

- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/gupnp-dlna.devhelp2 gupnp-dlna-0.10.3/doc/gupnp-dlna/html/gupnp-dlna.devhelp2 --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/gupnp-dlna.devhelp2 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/gupnp-dlna.devhelp2 2015-06-30 22:54:32.000000000 +0000 @@ -18,49 +18,48 @@ + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + + + + @@ -74,77 +73,65 @@ - + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + - - - - - - - + + + + - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/gupnp-dlna-gupnp-dlna-g-values.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/gupnp-dlna-gupnp-dlna-g-values.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/gupnp-dlna-gupnp-dlna-g-values.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/gupnp-dlna-gupnp-dlna-g-values.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,32 +2,27 @@ -gupnp-dlna-g-values - +GUPnP DLNA Reference Manual: gupnp-dlna-g-values + - + - - - - - - - - - - + + + + + + +
@@ -35,282 +30,446 @@

gupnp-dlna-g-values

gupnp-dlna-g-values

- +
-
-

Synopsis

-
GUPnPDLNAFraction * gupnp_dlna_fraction_copy            (GUPnPDLNAFraction *fraction);
-void                gupnp_dlna_fraction_free            (GUPnPDLNAFraction *fraction);
-gint                gupnp_dlna_fraction_get_numerator   (GUPnPDLNAFraction *fraction);
-gint                gupnp_dlna_fraction_get_denominator (GUPnPDLNAFraction *fraction);
-GUPnPDLNAFractionRange * gupnp_dlna_fraction_range_copy (GUPnPDLNAFractionRange *range);
-void                gupnp_dlna_fraction_range_free      (GUPnPDLNAFractionRange *range);
-GUPnPDLNAFraction * gupnp_dlna_fraction_range_get_min   (GUPnPDLNAFractionRange *range);
-GUPnPDLNAFraction * gupnp_dlna_fraction_range_get_max   (GUPnPDLNAFractionRange *range);
-GUPnPDLNAIntRange * gupnp_dlna_int_range_copy           (GUPnPDLNAIntRange *range);
-void                gupnp_dlna_int_range_free           (GUPnPDLNAIntRange *range);
-gint                gupnp_dlna_int_range_get_min        (GUPnPDLNAIntRange *range);
-gint                gupnp_dlna_int_range_get_max        (GUPnPDLNAIntRange *range);
-                    GUPnPDLNAFractionRange;
-                    GUPnPDLNAFraction;
-                    GUPnPDLNAIntRange;
-
-
-
-

Object Hierarchy

-
-  GBoxed
-   +----GUPnPDLNAFractionRange
-
-
-  GBoxed
-   +----GUPnPDLNAFraction
-
-
-  GBoxed
-   +----GUPnPDLNAIntRange
-
-
-
-

Description

-
-

Details

-
-

gupnp_dlna_fraction_copy ()

-
GUPnPDLNAFraction * gupnp_dlna_fraction_copy            (GUPnPDLNAFraction *fraction);
-
-+

Functions

+
++++ - - + - - + - -

fraction :

A fraction to copy. [transfer none] + +GUPnPDLNAFraction * + +gupnp_dlna_fraction_copy ()

Returns :

A copy of fraction. [transfer full] + +void + +gupnp_dlna_fraction_free ()
-
-
-
-

gupnp_dlna_fraction_free ()

-
void                gupnp_dlna_fraction_free            (GUPnPDLNAFraction *fraction);
-

-Frees fraction. -

-
-- - - - -

fraction :

A fraction to free.
-
-
-
-

gupnp_dlna_fraction_get_numerator ()

-
gint                gupnp_dlna_fraction_get_numerator   (GUPnPDLNAFraction *fraction);
-
-- - - + + - - + + + + + + - -

fraction :

A fraction. +gint + +gupnp_dlna_fraction_get_numerator () +

Returns :

 -fraction's numerator. +gint + +gupnp_dlna_fraction_get_denominator () +
+GUPnPDLNAFractionRange * + +gupnp_dlna_fraction_range_copy () +
-
-
-
-

gupnp_dlna_fraction_get_denominator ()

-
gint                gupnp_dlna_fraction_get_denominator (GUPnPDLNAFraction *fraction);
-
-- - - + + - - + + + + + + + + + + + + + + - -

fraction :

A fraction. +void + +gupnp_dlna_fraction_range_free () +

Returns :

 -fraction's denominator. +GUPnPDLNAFraction * + +gupnp_dlna_fraction_range_get_min () +
+GUPnPDLNAFraction * + +gupnp_dlna_fraction_range_get_max () +
+GUPnPDLNAIntRange * + +gupnp_dlna_int_range_copy () +
+void + +gupnp_dlna_int_range_free () +
-
-
-
-

gupnp_dlna_fraction_range_copy ()

-
GUPnPDLNAFractionRange * gupnp_dlna_fraction_range_copy (GUPnPDLNAFractionRange *range);
-
-- - - + - - +

range :

A range to copy. [transfer none] + +gint + +gupnp_dlna_int_range_get_min ()

Returns :

A copy of range. [transfer full] + +gint + +gupnp_dlna_int_range_get_max ()
+
+

Object Hierarchy

+
    GBoxed
+    ├── GUPnPDLNAFraction
+    ├── GUPnPDLNAFractionRange
+    ╰── GUPnPDLNAIntRange
+
+
+
+

Description

+
+
+

Functions

+
+

gupnp_dlna_fraction_copy ()

+
GUPnPDLNAFraction *
+gupnp_dlna_fraction_copy (GUPnPDLNAFraction *fraction);
+
+

Parameters

+
+++++ + + + + + +

fraction

A fraction to copy.

[transfer none]
+
+
+

Returns

+

A copy of fraction +.

+

[transfer full]

+
+
-

gupnp_dlna_fraction_range_free ()

-
void                gupnp_dlna_fraction_range_free      (GUPnPDLNAFractionRange *range);
-

-Frees range. -

-
-+

gupnp_dlna_fraction_free ()

+
void
+gupnp_dlna_fraction_free (GUPnPDLNAFraction *fraction);
+

Frees fraction +.

+
+

Parameters

+
+++++ - - + + +

range :

A range to free.

fraction

A fraction to free.

 
+
-

gupnp_dlna_fraction_range_get_min ()

-
GUPnPDLNAFraction * gupnp_dlna_fraction_range_get_min   (GUPnPDLNAFractionRange *range);
-
-- - - - - - - - - - +

gupnp_dlna_fraction_get_numerator ()

+
gint
+gupnp_dlna_fraction_get_numerator (GUPnPDLNAFraction *fraction);
+
+

Parameters

+

range :

A range.

Returns :

Minimum value of range. [transfer none] -
+++++ + + + + +

fraction

A fraction.

 
+
+

Returns

+

fraction +'s numerator.

+

+
+
-

gupnp_dlna_fraction_range_get_max ()

-
GUPnPDLNAFraction * gupnp_dlna_fraction_range_get_max   (GUPnPDLNAFractionRange *range);
-
-- - - - - - - - - - +

gupnp_dlna_fraction_get_denominator ()

+
gint
+gupnp_dlna_fraction_get_denominator (GUPnPDLNAFraction *fraction);
+
+

Parameters

+

range :

A range.

Returns :

Maximum value of range. [transfer none] -
+++++ + + + + +

fraction

A fraction.

 
+
+

Returns

+

fraction +'s denominator.

+

+
+
-

gupnp_dlna_int_range_copy ()

-
GUPnPDLNAIntRange * gupnp_dlna_int_range_copy           (GUPnPDLNAIntRange *range);
-
-- - - - - - - - - - +

gupnp_dlna_fraction_range_copy ()

+
GUPnPDLNAFractionRange *
+gupnp_dlna_fraction_range_copy (GUPnPDLNAFractionRange *range);
+
+

Parameters

+

range :

A range to copy. [transfer none] -

Returns :

A copy of range. [transfer full] -
+++++ + + + + +

range

A range to copy.

[transfer none]
+
+

Returns

+

A copy of range +.

+

[transfer full]

+
+
-

gupnp_dlna_int_range_free ()

-
void                gupnp_dlna_int_range_free           (GUPnPDLNAIntRange *range);
-

-Frees range. -

-
-+

gupnp_dlna_fraction_range_free ()

+
void
+gupnp_dlna_fraction_range_free (GUPnPDLNAFractionRange *range);
+

Frees range +.

+
+

Parameters

+
+++++ - - + + +

range :

A range to free.

range

A range to free.

 
+
-

gupnp_dlna_int_range_get_min ()

-
gint                gupnp_dlna_int_range_get_min        (GUPnPDLNAIntRange *range);
-
-- - - - - - - - - - +

gupnp_dlna_fraction_range_get_min ()

+
GUPnPDLNAFraction *
+gupnp_dlna_fraction_range_get_min (GUPnPDLNAFractionRange *range);
+
+

Parameters

+

range :

A range.

Returns :

Minimum value of range.
+++++ + + + + +

range

A range.

 
+
+

Returns

+

Minimum value of range +.

+

[transfer none]

+
+
-

gupnp_dlna_int_range_get_max ()

-
gint                gupnp_dlna_int_range_get_max        (GUPnPDLNAIntRange *range);
-
-- - - - - - - - - - +

gupnp_dlna_fraction_range_get_max ()

+
GUPnPDLNAFraction *
+gupnp_dlna_fraction_range_get_max (GUPnPDLNAFractionRange *range);
+
+

Parameters

+

range :

A range.

Returns :

Maximum value of range.
+++++ + + + + +

range

A range.

 
+
+

Returns

+

Maximum value of range +.

+

[transfer none]

+
+
-

GUPnPDLNAFractionRange

-
typedef struct _GUPnPDLNAFractionRange GUPnPDLNAFractionRange;
+

gupnp_dlna_int_range_copy ()

+
GUPnPDLNAIntRange *
+gupnp_dlna_int_range_copy (GUPnPDLNAIntRange *range);
+
+

Parameters

+
+++++ + + + + + +

range

A range to copy.

[transfer none]
+
+
+

Returns

+

A copy of range +.

+

[transfer full]

+
-

GUPnPDLNAFraction

-
typedef struct _GUPnPDLNAFraction GUPnPDLNAFraction;
+

gupnp_dlna_int_range_free ()

+
void
+gupnp_dlna_int_range_free (GUPnPDLNAIntRange *range);
+

Frees range +.

+
+

Parameters

+
+++++ + + + + + +

range

A range to free.

 
+
-

GUPnPDLNAIntRange

-
typedef struct _GUPnPDLNAIntRange GUPnPDLNAIntRange;
+

gupnp_dlna_int_range_get_min ()

+
gint
+gupnp_dlna_int_range_get_min (GUPnPDLNAIntRange *range);
+
+

Parameters

+
+++++ + + + + + +

range

A range.

 
+
+
+

Returns

+

Minimum value of range +.

+

+
+
+

gupnp_dlna_int_range_get_max ()

+
gint
+gupnp_dlna_int_range_get_max (GUPnPDLNAIntRange *range);
+
+

Parameters

+
+++++ + + + + + +

range

A range.

 
+
+
+

Returns

+

Maximum value of range +.

+

+
+
+ +
+

Types and Values

+
- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21 \ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/gupnp-dlna-gupnp-dlna-restriction.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/gupnp-dlna-gupnp-dlna-restriction.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/gupnp-dlna-gupnp-dlna-restriction.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/gupnp-dlna-gupnp-dlna-restriction.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,32 +2,27 @@ -gupnp-dlna-restriction - +GUPnP DLNA Reference Manual: gupnp-dlna-restriction + - + - - - - - - - - - - + + + + + + +
@@ -35,166 +30,248 @@

gupnp-dlna-restriction

gupnp-dlna-restriction

- +
-
-

Synopsis

-
GUPnPDLNARestriction * gupnp_dlna_restriction_copy      (GUPnPDLNARestriction *restriction);
-void                gupnp_dlna_restriction_free         (GUPnPDLNARestriction *restriction);
-gboolean            gupnp_dlna_restriction_is_empty     (GUPnPDLNARestriction *restriction);
-gchar *             gupnp_dlna_restriction_to_string    (GUPnPDLNARestriction *restriction);
-const gchar *       gupnp_dlna_restriction_get_mime     (GUPnPDLNARestriction *restriction);
-GHashTable *        gupnp_dlna_restriction_get_entries  (GUPnPDLNARestriction *restriction);
-                    GUPnPDLNARestriction;
-
-
-
-

Object Hierarchy

-
-  GBoxed
-   +----GUPnPDLNARestriction
-
-
-
-

Description

-
-

Details

-
-

gupnp_dlna_restriction_copy ()

-
GUPnPDLNARestriction * gupnp_dlna_restriction_copy      (GUPnPDLNARestriction *restriction);
-
-+

Functions

+
++++ - - + + + + + + + + + + + + + + + + + - - +

restriction :

A restriction to copy. [transfer none] + +GUPnPDLNARestriction * + +gupnp_dlna_restriction_copy () +
+void + +gupnp_dlna_restriction_free () +
+gboolean + +gupnp_dlna_restriction_is_empty () +
+gchar * + +gupnp_dlna_restriction_to_string () +
const gchar * + +gupnp_dlna_restriction_get_mime ()

Returns :

A copy of restriction. [transfer full] + +GHashTable * + +gupnp_dlna_restriction_get_entries ()
-
+
+

Object Hierarchy

+
    GBoxed
+    ╰── GUPnPDLNARestriction
+
+
+
+

Description

+
+
+

Functions

-

gupnp_dlna_restriction_free ()

-
void                gupnp_dlna_restriction_free         (GUPnPDLNARestriction *restriction);
-

-Frees restriction. -

-
-+

gupnp_dlna_restriction_copy ()

+
GUPnPDLNARestriction *
+gupnp_dlna_restriction_copy (GUPnPDLNARestriction *restriction);
+
+

Parameters

+
+++++ - - + + +

restriction :

A restriction to free.

restriction

A restriction to copy.

[transfer none]
+
+

Returns

+

A copy of restriction +.

+

[transfer full]

+
+
-

gupnp_dlna_restriction_is_empty ()

-
gboolean            gupnp_dlna_restriction_is_empty     (GUPnPDLNARestriction *restriction);
-
-- - - - - - - - - - +

gupnp_dlna_restriction_free ()

+
void
+gupnp_dlna_restriction_free (GUPnPDLNARestriction *restriction);
+

Frees restriction +.

+
+

Parameters

+

restriction :

A restriction. [transfer none] -

Returns :

 -TRUE if restriction is empty and has no MIME type, -otherwise FALSE.
+++++ + + + + +

restriction

A restriction to free.

 
+
-

gupnp_dlna_restriction_to_string ()

-
gchar *             gupnp_dlna_restriction_to_string    (GUPnPDLNARestriction *restriction);
-

-Creates a string representation of restriction. -

-
-- - - - - - - - - - +

gupnp_dlna_restriction_is_empty ()

+
gboolean
+gupnp_dlna_restriction_is_empty (GUPnPDLNARestriction *restriction);
+
+

Parameters

+

restriction :

A restriction. [transfer none] -

Returns :

A string representation of -restriction. Free with g_free() when not needed. [transfer full] -
+++++ + + + + +

restriction

A restriction.

[transfer none]
+
+

Returns

+

TRUE if restriction +is empty and has no MIME type, +otherwise FALSE.

+

+
+
-

gupnp_dlna_restriction_get_mime ()

-
const gchar *       gupnp_dlna_restriction_get_mime     (GUPnPDLNARestriction *restriction);
-

-Gets restriction's MIME type. -

-
-- - - - - - - - - - +

gupnp_dlna_restriction_to_string ()

+
gchar *
+gupnp_dlna_restriction_to_string (GUPnPDLNARestriction *restriction);
+

Creates a string representation of restriction +.

+
+

Parameters

+

restriction :

A restriction. [transfer none] -

Returns :

MIME type. Do not modify. [transfer none] -
+++++ + + + + +

restriction

A restriction.

[transfer none]
+
+

Returns

+

A string representation of +restriction +. Free with g_free() when not needed.

+

[transfer full]

+
+
-

gupnp_dlna_restriction_get_entries ()

-
GHashTable *        gupnp_dlna_restriction_get_entries  (GUPnPDLNARestriction *restriction);
-

-Gets restriction's entries. It is a string to GUPnPDLNAValueList -mapping. -

-
-- - - - - - - - - - +

gupnp_dlna_restriction_get_mime ()

+
const gchar *
+gupnp_dlna_restriction_get_mime (GUPnPDLNARestriction *restriction);
+

Gets restriction +'s MIME type.

+
+

Parameters

+

restriction :

A restriction. [transfer none] -

Returns :

Entries. Do not modify. [transfer none][element-type utf8 GUPnPDLNAValueList] -
+++++ + + + + +

restriction

A restriction.

[transfer none]
+
+

Returns

+

MIME type. Do not modify.

+

[transfer none]

+
+
-

GUPnPDLNARestriction

-
typedef struct _GUPnPDLNARestriction GUPnPDLNARestriction;
+

gupnp_dlna_restriction_get_entries ()

+
GHashTable *
+gupnp_dlna_restriction_get_entries (GUPnPDLNARestriction *restriction);
+

Gets restriction +'s entries. It is a string to GUPnPDLNAValueList +mapping.

+
+

Parameters

+
+++++ + + + + + +

restriction

A restriction.

[transfer none]
+
+
+

Returns

+

Entries. Do not modify.

+

[transfer none][element-type utf8 GUPnPDLNAValueList]

+
+
+

Types and Values

+
- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21 \ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/gupnp-dlna-gupnp-dlna-value-list.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/gupnp-dlna-gupnp-dlna-value-list.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/gupnp-dlna-gupnp-dlna-value-list.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/gupnp-dlna-gupnp-dlna-value-list.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,32 +2,27 @@ -gupnp-dlna-value-list - +GUPnP DLNA Reference Manual: gupnp-dlna-value-list + - + - - - - - - - - - - + + + + + + +
@@ -35,143 +30,212 @@

gupnp-dlna-value-list

gupnp-dlna-value-list

- +
-
-

Synopsis

-
GUPnPDLNAValueList * gupnp_dlna_value_list_copy         (GUPnPDLNAValueList *list);
-void                gupnp_dlna_value_list_free          (GUPnPDLNAValueList *list);
-gboolean            gupnp_dlna_value_list_is_empty      (GUPnPDLNAValueList *list);
-gchar *             gupnp_dlna_value_list_to_string     (GUPnPDLNAValueList *list);
-GList *             gupnp_dlna_value_list_get_g_values  (GUPnPDLNAValueList *list);
-                    GUPnPDLNAValueList;
-
-
-
-

Object Hierarchy

-
-  GBoxed
-   +----GUPnPDLNAValueList
-
-
-
-

Description

-
-

Details

-
-

gupnp_dlna_value_list_copy ()

-
GUPnPDLNAValueList * gupnp_dlna_value_list_copy         (GUPnPDLNAValueList *list);
-
-+

Functions

+
++++ - - + + + + + + + + + + + + + - - +

list :

A list to copy. [transfer none] + +GUPnPDLNAValueList * + +gupnp_dlna_value_list_copy () +
+void + +gupnp_dlna_value_list_free () +
+gboolean + +gupnp_dlna_value_list_is_empty () +
+gchar * + +gupnp_dlna_value_list_to_string ()

Returns :

A copy of list. [transfer full] + +GList * + +gupnp_dlna_value_list_get_g_values ()
-
+
+

Object Hierarchy

+
    GBoxed
+    ╰── GUPnPDLNAValueList
+
+
+
+

Description

+
+
+

Functions

-

gupnp_dlna_value_list_free ()

-
void                gupnp_dlna_value_list_free          (GUPnPDLNAValueList *list);
-

-Frees the value list. -

-
-+

gupnp_dlna_value_list_copy ()

+
GUPnPDLNAValueList *
+gupnp_dlna_value_list_copy (GUPnPDLNAValueList *list);
+
+

Parameters

+
+++++ - - + + +

list :

A list to free.

list

A list to copy.

[transfer none]
+
+

Returns

+

A copy of list +.

+

[transfer full]

+
+
-

gupnp_dlna_value_list_is_empty ()

-
gboolean            gupnp_dlna_value_list_is_empty      (GUPnPDLNAValueList *list);
-
-- - - - - - - - - - +

gupnp_dlna_value_list_free ()

+
void
+gupnp_dlna_value_list_free (GUPnPDLNAValueList *list);
+

Frees the value list.

+
+

Parameters

+

list :

A list. [transfer none] -

Returns :

 -TRUE if list is empty, otherwise FALSE.
+++++ + + + + +

list

A list to free.

 
+
-

gupnp_dlna_value_list_to_string ()

-
gchar *             gupnp_dlna_value_list_to_string     (GUPnPDLNAValueList *list);
-

-Creates a string representation of list. -

-
-- - - - - - - - - - +

gupnp_dlna_value_list_is_empty ()

+
gboolean
+gupnp_dlna_value_list_is_empty (GUPnPDLNAValueList *list);
+
+

Parameters

+

list :

A list. [transfer none] -

Returns :

A string representation of list. Free -with g_free() when not needed. [transfer full] -
+++++ + + + + +

list

A list.

[transfer none]
+
+

Returns

+

TRUE if list +is empty, otherwise FALSE.

+

+
+
-

gupnp_dlna_value_list_get_g_values ()

-
GList *             gupnp_dlna_value_list_get_g_values  (GUPnPDLNAValueList *list);
-

-Gets a list of GValues. GValues can be of types G_TYPE_BOOLEAN, -G_TYPE_INT, G_TYPE_STRING, GUPNP_TYPE_DLNA_FRACTION, -GUPNP_TYPE_DLNA_FRACTION_RANGE or GUPNP_TYPE_DLNA_INT_RANGE. -

-
-- - - - - - - - - - +

gupnp_dlna_value_list_to_string ()

+
gchar *
+gupnp_dlna_value_list_to_string (GUPnPDLNAValueList *list);
+

Creates a string representation of list +.

+
+

Parameters

+

list :

A list. [transfer none] -

Returns :

A list. Free it -with g_list_free_full() with g_free(). [transfer full][element-type GValue] -
+++++ + + + + +

list

A list.

[transfer none]
+
+

Returns

+

A string representation of list +. Free +with g_free() when not needed.

+

[transfer full]

+
+
-

GUPnPDLNAValueList

-
typedef struct _GUPnPDLNAValueList GUPnPDLNAValueList;
+

gupnp_dlna_value_list_get_g_values ()

+
GList *
+gupnp_dlna_value_list_get_g_values (GUPnPDLNAValueList *list);
+

Gets a list of GValues. GValues can be of types G_TYPE_BOOLEAN, +G_TYPE_INT, G_TYPE_STRING, GUPNP_TYPE_DLNA_FRACTION, +GUPNP_TYPE_DLNA_FRACTION_RANGE or GUPNP_TYPE_DLNA_INT_RANGE.

+
+

Parameters

+
+++++ + + + + + +

list

A list.

[transfer none]
+
+

Returns

+

A list. Free it +with g_list_free_full() with g_free().

+

[transfer full][element-type GValue]

+
+
+ +
+

Types and Values

- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21 \ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/gupnp-dlna-GUPnP-DLNA-Values.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/gupnp-dlna-GUPnP-DLNA-Values.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/gupnp-dlna-GUPnP-DLNA-Values.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/gupnp-dlna-GUPnP-DLNA-Values.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,30 +2,26 @@ -GUPnP DLNA Values - +GUPnP DLNA Reference Manual: GUPnP DLNA Values + - + - - - - - - - - - - + + + + + + +
@@ -33,86 +29,132 @@

GUPnP DLNA Values

GUPnP DLNA Values — State values for metadata attributes.

- +
-
-

Synopsis

-
enum                GUPnPDLNAValueState;
-                    GUPnPDLNABoolValue;
-#define             GUPNP_DLNA_BOOL_VALUE_UNSET
-#define             GUPNP_DLNA_BOOL_VALUE_UNSUPPORTED
-                    GUPnPDLNAFractionValue;
-#define             GUPNP_DLNA_FRACTION_VALUE_UNSET
-#define             GUPNP_DLNA_FRACTION_VALUE_UNSUPPORTED
-                    GUPnPDLNAIntValue;
-#define             GUPNP_DLNA_INT_VALUE_UNSET
-#define             GUPNP_DLNA_INT_VALUE_UNSUPPORTED
-                    GUPnPDLNAStringValue;
-#define             GUPNP_DLNA_STRING_VALUE_UNSET
-#define             GUPNP_DLNA_STRING_VALUE_UNSUPPORTED
-
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
enumGUPnPDLNAValueState
 GUPnPDLNABoolValue
#defineGUPNP_DLNA_BOOL_VALUE_UNSET
#defineGUPNP_DLNA_BOOL_VALUE_UNSUPPORTED
 GUPnPDLNAFractionValue
#defineGUPNP_DLNA_FRACTION_VALUE_UNSET
#defineGUPNP_DLNA_FRACTION_VALUE_UNSUPPORTED
 GUPnPDLNAIntValue
#defineGUPNP_DLNA_INT_VALUE_UNSET
#defineGUPNP_DLNA_INT_VALUE_UNSUPPORTED
 GUPnPDLNAStringValue
#defineGUPNP_DLNA_STRING_VALUE_UNSET
#defineGUPNP_DLNA_STRING_VALUE_UNSUPPORTED

Description

-

-The GUPnPDLNABoolValue, GUPnPDLNAFractionValue, +

The GUPnPDLNABoolValue, GUPnPDLNAFractionValue, GUPnPDLNAIntValue and GUPnPDLNAStringValue hold respectively -boolean, fraction, integer and string values. -

-

-The value can be in one of three possible states - set, unset or +boolean, fraction, integer and string values.

+

The value can be in one of three possible states - set, unset or unsupported. When value is in set state it is possible to use the underlying value it holds. In other states using such value is -undefined. -

-

-Main difference between unset state and unsupported state is that +undefined.

+

Main difference between unset state and unsupported state is that the former is set when metadata extractor is capable of extracting some attribute in general, but current media file does not have such attribute, while the latter means that metadata extractor has -no idea how to extract such attribute at all. -

-

-One note on GUPnPDLNAStringValue - it holds a string that has to -be allocated with g_malloc() (that is - g_strdup() and others are -fine as well as they use g_malloc() internally). The string is -freed by consumer. -

+no idea how to extract such attribute at all.

+

One note on GUPnPDLNAStringValue - it holds a string that has to +be allocated with g_malloc() (that is - g_strdup() and others are +fine as well as they use g_malloc() internally). The string is +freed by consumer.

-

Details

+

Functions

+
+
+

Types and Values

enum GUPnPDLNAValueState

-
typedef enum {
-        GUPNP_DLNA_VALUE_STATE_SET,
-        GUPNP_DLNA_VALUE_STATE_UNSET,
-        GUPNP_DLNA_VALUE_STATE_UNSUPPORTED
-} GUPnPDLNAValueState;
-
-

-Flags describing a state of GUPnP DLNA Value. -

-
-+

Flags describing a state of GUPnP DLNA Value.

+
+

Members

+
+++++ - - + + - - + + - - + +

GUPNP_DLNA_VALUE_STATE_SET

Value is set. +

GUPNP_DLNA_VALUE_STATE_SET

 +

Value is set.

 

GUPNP_DLNA_VALUE_STATE_UNSET

Value is unset. +

GUPNP_DLNA_VALUE_STATE_UNSET

 +

Value is unset.

 

GUPNP_DLNA_VALUE_STATE_UNSUPPORTED

Value is unsupported. +

GUPNP_DLNA_VALUE_STATE_UNSUPPORTED

 +

Value is unsupported.

 
+

GUPnPDLNABoolValue

@@ -121,106 +163,61 @@ GUPnPDLNAValueState state; } GUPnPDLNABoolValue; -

-GUPnP DLNA Value representing a boolean value of some metadata attribute. -

-
-+

GUPnP DLNA Value representing a boolean value of some metadata attribute.

+
+

Members

+
+++++ - - + + + - - + + +

gboolean value;

The boolean value.

gboolean value;

The boolean value.

 

GUPnPDLNAValueState state;

The state of GUPnPDLNABoolValue.

GUPnPDLNAValueState state;

The state of GUPnPDLNABoolValue.

 
+

GUPNP_DLNA_BOOL_VALUE_UNSET

#define             GUPNP_DLNA_BOOL_VALUE_UNSET
-

-Static initializer for unset GUPnPDLNABoolValue. Can be used in -two ways: -

-

-

-
- - - - - - - - 
1
GUPnPDLNABoolValue value = GUPNP_DLNA_BOOL_VALUE_UNSET;
-
- -

-

-

-or -

-

-

-
- - - - - - - - 
1
return GUPNP_DLNA_BOOL_VALUE_UNSET;
-
- -

-

+

Static initializer for unset GUPnPDLNABoolValue. Can be used in +two ways:

+
+  GUPnPDLNABoolValue value = GUPNP_DLNA_BOOL_VALUE_UNSET;
+
+

+

or

+
+  return GUPNP_DLNA_BOOL_VALUE_UNSET;
+
+

GUPNP_DLNA_BOOL_VALUE_UNSUPPORTED

#define             GUPNP_DLNA_BOOL_VALUE_UNSUPPORTED
-

-Static initializer for unsupported GUPnPDLNABoolValue. Can be used -in two ways: -

-

-

-
- - - - - - - - 
1
GUPnPDLNABoolValue value = GUPNP_DLNA_BOOL_VALUE_UNSUPPORTED;
-
- -

-

-

-or -

-

-

-
- - - - - - - - 
1
return GUPNP_DLNA_BOOL_VALUE_UNSUPPORTED;
-
- -

-

+

Static initializer for unsupported GUPnPDLNABoolValue. Can be used +in two ways:

+
+  GUPnPDLNABoolValue value = GUPNP_DLNA_BOOL_VALUE_UNSUPPORTED;
+
+

+

or

+
+  return GUPNP_DLNA_BOOL_VALUE_UNSUPPORTED;
+
+

@@ -231,110 +228,66 @@ GUPnPDLNAValueState state; } GUPnPDLNAFractionValue; -

-GUPnP DLNA Value representing a fraction value of some metadata attribute. -

-
-+

GUPnP DLNA Value representing a fraction value of some metadata attribute.

+
+

Members

+
+++++ - - + + + - - + + + - - + + +

gint numerator;

The numerator of fraction.

gint numerator;

The numerator of fraction.

 

gint denominator;

The denominator of fraction.

gint denominator;

The denominator of fraction.

 

GUPnPDLNAValueState state;

The state of GUPnPDLNAFractionValue.

GUPnPDLNAValueState state;

The state of GUPnPDLNAFractionValue.

 
+

GUPNP_DLNA_FRACTION_VALUE_UNSET

#define             GUPNP_DLNA_FRACTION_VALUE_UNSET
-

-Static initializer for unset GUPnPDLNAFractionValue. Can be used -in two ways: -

-

-

-
- - - - - - - - 
1
GUPnPDLNAFractionValue value = GUPNP_DLNA_FRACTION_VALUE_UNSET;
-
- -

-

-

-or -

-

-

-
- - - - - - - - 
1
return GUPNP_DLNA_FRACTION_VALUE_UNSET;
-
- -

-

+

Static initializer for unset GUPnPDLNAFractionValue. Can be used +in two ways:

+
+  GUPnPDLNAFractionValue value = GUPNP_DLNA_FRACTION_VALUE_UNSET;
+
+

+

or

+
+  return GUPNP_DLNA_FRACTION_VALUE_UNSET;
+
+

GUPNP_DLNA_FRACTION_VALUE_UNSUPPORTED

#define             GUPNP_DLNA_FRACTION_VALUE_UNSUPPORTED
-

-Static initializer for unsupported GUPnPDLNAFractionValue. Can be -used in two ways: -

-

-

-
- - - - - - - - 
1
GUPnPDLNAFractionValue value = GUPNP_DLNA_FRACTION_VALUE_UNSUPPORTED;
-
- -

-

-

-or -

-

-

-
- - - - - - - - 
1
return GUPNP_DLNA_FRACTION_VALUE_UNSUPPORTED;
-
- -

-

+

Static initializer for unsupported GUPnPDLNAFractionValue. Can be +used in two ways:

+
+  GUPnPDLNAFractionValue value = GUPNP_DLNA_FRACTION_VALUE_UNSUPPORTED;
+
+

+

or

+
+  return GUPNP_DLNA_FRACTION_VALUE_UNSUPPORTED;
+
+

@@ -344,106 +297,61 @@ GUPnPDLNAValueState state; } GUPnPDLNAIntValue; -

-GUPnP DLNA Value representing an integer value of some metadata attribute. -

-
-+

GUPnP DLNA Value representing an integer value of some metadata attribute.

+
+

Members

+
+++++ - - + + + - - + + +

gint value;

The integer value.

gint value;

The integer value.

 

GUPnPDLNAValueState state;

The state of GUPnPDLNAIntValue.

GUPnPDLNAValueState state;

The state of GUPnPDLNAIntValue.

 
+

GUPNP_DLNA_INT_VALUE_UNSET

#define             GUPNP_DLNA_INT_VALUE_UNSET
-

-Static initializer for unset GUPnPDLNAIntValue. Can be used in -two ways: -

-

-

-
- - - - - - - - 
1
GUPnPDLNAIntValue value = GUPNP_DLNA_INT_VALUE_UNSET;
-
- -

-

-

-or -

-

-

-
- - - - - - - - 
1
return GUPNP_DLNA_INT_VALUE_UNSET;
-
- -

-

+

Static initializer for unset GUPnPDLNAIntValue. Can be used in +two ways:

+
+  GUPnPDLNAIntValue value = GUPNP_DLNA_INT_VALUE_UNSET;
+
+

+

or

+
+  return GUPNP_DLNA_INT_VALUE_UNSET;
+
+

GUPNP_DLNA_INT_VALUE_UNSUPPORTED

#define             GUPNP_DLNA_INT_VALUE_UNSUPPORTED
-

-Static initializer for unsupported GUPnPDLNAIntValue. Can be used in -two ways: -

-

-

-
- - - - - - - - 
1
GUPnPDLNAIntValue value = GUPNP_DLNA_INT_VALUE_UNSUPPORTED;
-
- -

-

-

-or -

-

-

-
- - - - - - - - 
1
return GUPNP_DLNA_INT_VALUE_UNSUPPORTED;
-
- -

-

+

Static initializer for unsupported GUPnPDLNAIntValue. Can be used in +two ways:

+
+  GUPnPDLNAIntValue value = GUPNP_DLNA_INT_VALUE_UNSUPPORTED;
+
+

+

or

+
+  return GUPNP_DLNA_INT_VALUE_UNSUPPORTED;
+
+

@@ -453,112 +361,67 @@ GUPnPDLNAValueState state; } GUPnPDLNAStringValue; -

-GUPnP DLNA Value representing a string value of some metadata -attribute. -

-
-+

GUPnP DLNA Value representing a string value of some metadata +attribute.

+
+

Members

+
+++++ - - + + + - - + + +

gchar *value;

The string value.

gchar *value;

The string value.

 

GUPnPDLNAValueState state;

The state of GUPnPDLNAStringValue.

GUPnPDLNAValueState state;

The state of GUPnPDLNAStringValue.

 
+

GUPNP_DLNA_STRING_VALUE_UNSET

#define             GUPNP_DLNA_STRING_VALUE_UNSET
-

-Static initializer for unset GUPnPDLNAStringValue. Can be used in -two ways: -

-

-

-
- - - - - - - - 
1
GUPnPDLNAStringValue value = GUPNP_DLNA_STRING_VALUE_UNSET;
-
- -

-

-

-or -

-

-

-
- - - - - - - - 
1
return GUPNP_DLNA_STRING_VALUE_UNSET;
-
- -

-

+

Static initializer for unset GUPnPDLNAStringValue. Can be used in +two ways:

+
+  GUPnPDLNAStringValue value = GUPNP_DLNA_STRING_VALUE_UNSET;
+
+

+

or

+
+  return GUPNP_DLNA_STRING_VALUE_UNSET;
+
+

GUPNP_DLNA_STRING_VALUE_UNSUPPORTED

#define             GUPNP_DLNA_STRING_VALUE_UNSUPPORTED
-

-Static initializer for unsupported GUPnPDLNAStringValue. Can be -used in two ways: -

-

-

-
- - - - - - - - 
1
GUPnPDLNAStringValue value = GUPNP_DLNA_STRING_VALUE_UNSUPPORTED;
-
- -

-

-

-or -

-

-

-
- - - - - - - - 
1
return GUPNP_DLNA_STRING_VALUE_UNSUPPORTED;
-
- -

-

+

Static initializer for unsupported GUPnPDLNAStringValue. Can be +used in two ways:

+
+  GUPnPDLNAStringValue value = GUPNP_DLNA_STRING_VALUE_UNSUPPORTED;
+
+

+

or

+
+  return GUPNP_DLNA_STRING_VALUE_UNSUPPORTED;
+
+

- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21 \ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAImageInformation.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAImageInformation.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAImageInformation.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAImageInformation.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,32 +2,27 @@ -GUPnPDLNAImageInformation - +GUPnP DLNA Reference Manual: GUPnPDLNAImageInformation + - + - - - - - - - - - - + + + + + + +
@@ -36,61 +31,200 @@

GUPnPDLNAImageInformation — Base class representing image metadata needed for DLNA profiles matching.

- +
-
-

Synopsis

-
                    GUPnPDLNAImageInformation;
-                    GUPnPDLNAImageInformationClass;
-GUPnPDLNAIntValue   gupnp_dlna_image_information_get_depth
-                                                        (GUPnPDLNAImageInformation *info);
-GUPnPDLNAIntValue   gupnp_dlna_image_information_get_height
-                                                        (GUPnPDLNAImageInformation *info);
-GUPnPDLNAIntValue   gupnp_dlna_image_information_get_width
-                                                        (GUPnPDLNAImageInformation *info);
-GUPnPDLNAStringValue gupnp_dlna_image_information_get_mime
-                                                        (GUPnPDLNAImageInformation *info);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + +
+GUPnPDLNAIntValue + +gupnp_dlna_image_information_get_depth () +
+GUPnPDLNAIntValue + +gupnp_dlna_image_information_get_height () +
+GUPnPDLNAIntValue + +gupnp_dlna_image_information_get_width () +
+GUPnPDLNAStringValue + +gupnp_dlna_image_information_get_mime () +
+
+
+

Types and Values

+
++++ + + + + +
 GUPnPDLNAImageInformationClass

Object Hierarchy

-
-  GObject
-   +----GUPnPDLNAImageInformation
+
    GObject
+    ╰── GUPnPDLNAImageInformation

Description

-

-GUPnPDLNAImageInformation holds all image metadatas important for +

GUPnPDLNAImageInformation holds all image metadatas important for matching profiles. Note that it does not mean all data should be provided for every image file as in some cases it does not make -sense. -

-

-For metadata attributes that do not exist in current image file an +sense.

+

For metadata attributes that do not exist in current image file an unset value should be returned. For metadata attributes that do exist a set value with proper underlying value should be returned. In case metadata extractor has completely no clue how to extract some metadata attribute at all, an unsupported value should be returned. Note that unsupported values should be a temporary mean before fixing the multimedia framework to be able to extract -such attribute. -

-

-Note that gupnp_dlna_image_information_get_mime() should always +such attribute.

+

Note that gupnp_dlna_image_information_get_mime() should always return a set value. Otherwise it is highly probably that the file -will not match against any DLNA profile. -

+will not match against any DLNA profile.

-

Details

+

Functions

-

GUPnPDLNAImageInformation

-
typedef struct _GUPnPDLNAImageInformation GUPnPDLNAImageInformation;
+

gupnp_dlna_image_information_get_depth ()

+
GUPnPDLNAIntValue
+gupnp_dlna_image_information_get_depth
+                               (GUPnPDLNAImageInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAImageInformation object.

 
+
+
+

Returns

+

A depth of an image.

+

+
+

gupnp_dlna_image_information_get_height ()

+
GUPnPDLNAIntValue
+gupnp_dlna_image_information_get_height
+                               (GUPnPDLNAImageInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAImageInformation object.

 
+
+
+

Returns

+

A height of an image.

+

+
+
+
+
+

gupnp_dlna_image_information_get_width ()

+
GUPnPDLNAIntValue
+gupnp_dlna_image_information_get_width
+                               (GUPnPDLNAImageInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAImageInformation object.

 
+
+
+

Returns

+

A width of an image.

+

+
+
+
+
+

gupnp_dlna_image_information_get_mime ()

+
GUPnPDLNAStringValue
+gupnp_dlna_image_information_get_mime (GUPnPDLNAImageInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAImageInformation object.

 
+
+
+

Returns

+

A MIME type of an image.

+

+
+
+
+
+

Types and Values

+

GUPnPDLNAImageInformationClass

typedef struct {
         GObjectClass parent_class;
@@ -110,125 +244,62 @@
         gpointer _reserved[12];
 } GUPnPDLNAImageInformationClass;
-
-+
+

Members

+
+++++ - - - - - - + + + - - + + + - - + + + - - + + + - - - - -

GObjectClass parent_class;

Parent class.

get_depth ()

This is called by GUPnPDLNAProfileGuesser to get a -depth.

GObjectClass parent_class;

Parent class.

 

get_height ()

This is called by GUPnPDLNAProfileGuesser to get a -height.

get_depth ()

This is called by GUPnPDLNAProfileGuesser to get a +depth.

 

get_width ()

This is called by GUPnPDLNAProfileGuesser to get a -width.

get_height ()

This is called by GUPnPDLNAProfileGuesser to get a +height.

 

get_mime ()

This is called by GUPnPDLNAProfileGuesser to get a MIME -type.

get_width ()

This is called by GUPnPDLNAProfileGuesser to get a +width.

 

gpointer _reserved[12];

Padding. Ignore it.
-
-
-
-

gupnp_dlna_image_information_get_depth ()

-
GUPnPDLNAIntValue   gupnp_dlna_image_information_get_depth
-                                                        (GUPnPDLNAImageInformation *info);
-
-- - - - + + + - - + + +

info :

A GUPnPDLNAImageInformation object.

get_mime ()

This is called by GUPnPDLNAProfileGuesser to get a MIME +type.

 

Returns :

A depth of an image.

gpointer _reserved[12];

Padding. Ignore it.

 
-
-
-

gupnp_dlna_image_information_get_height ()

-
GUPnPDLNAIntValue   gupnp_dlna_image_information_get_height
-                                                        (GUPnPDLNAImageInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAImageInformation object.

Returns :

A height of an image.
-
-
-
-

gupnp_dlna_image_information_get_width ()

-
GUPnPDLNAIntValue   gupnp_dlna_image_information_get_width
-                                                        (GUPnPDLNAImageInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAImageInformation object.

Returns :

A width of an image.
-
-
-
-

gupnp_dlna_image_information_get_mime ()

-
GUPnPDLNAStringValue gupnp_dlna_image_information_get_mime
-                                                        (GUPnPDLNAImageInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAImageInformation object.

Returns :

A MIME type of an image.

See Also

-GUPnPDLNABoolValue, GUPnPDLNAFractionValue, -GUPnPDLNAIntValue, GUPnPDLNAStringValue +

GUPnPDLNABoolValue, GUPnPDLNAFractionValue, +GUPnPDLNAIntValue, GUPnPDLNAStringValue

- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAInformation.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAInformation.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAInformation.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAInformation.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,34 +2,28 @@ -GUPnPDLNAInformation - +GUPnP DLNA Reference Manual: GUPnPDLNAInformation + - + - - - - - - - - - - + + + + + + +
@@ -38,62 +32,308 @@

GUPnPDLNAInformation — Base class for storing various types of metadata informations.

- +
-
-

Synopsis

-
                    GUPnPDLNAInformation;
-                    GUPnPDLNAInformationClass;
-GUPnPDLNAAudioInformation * gupnp_dlna_information_get_audio_information
-                                                        (GUPnPDLNAInformation *info);
-GUPnPDLNAContainerInformation * gupnp_dlna_information_get_container_information
-                                                        (GUPnPDLNAInformation *info);
-GUPnPDLNAImageInformation * gupnp_dlna_information_get_image_information
-                                                        (GUPnPDLNAInformation *info);
-GUPnPDLNAVideoInformation * gupnp_dlna_information_get_video_information
-                                                        (GUPnPDLNAInformation *info);
-const gchar *       gupnp_dlna_information_get_profile_name
-                                                        (GUPnPDLNAInformation *info);
-const gchar *       gupnp_dlna_information_get_uri      (GUPnPDLNAInformation *info);
-
-
-

Object Hierarchy

-
-  GObject
-   +----GUPnPDLNAInformation
-
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+GUPnPDLNAAudioInformation * + +gupnp_dlna_information_get_audio_information () +
+GUPnPDLNAContainerInformation * + +gupnp_dlna_information_get_container_information () +
+GUPnPDLNAImageInformation * + +gupnp_dlna_information_get_image_information () +
+GUPnPDLNAVideoInformation * + +gupnp_dlna_information_get_video_information () +
const gchar * + +gupnp_dlna_information_get_profile_name () +
const gchar * + +gupnp_dlna_information_get_uri () +

Properties

-
-  "audio-information"        GUPnPDLNAAudioInformation*  : Read
-  "container-information"    GUPnPDLNAContainerInformation*  : Read
-  "image-information"        GUPnPDLNAImageInformation*  : Read
-  "uri"                      gchar*                : Read / Write / Construct Only
-  "video-information"        GUPnPDLNAVideoInformation*  : Read
+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+






+GUPnPDLNAAudioInformation *audio-informationRead

+GUPnPDLNAContainerInformation *container-informationRead

+GUPnPDLNAImageInformation *image-informationRead

+gchar *uriRead / Write / Construct Only

+GUPnPDLNAVideoInformation *video-informationRead

+
+
+

Types and Values

+
++++ + + + + +
 GUPnPDLNAInformationClass
+
+
+

Object Hierarchy

+
    GObject
+    ╰── GUPnPDLNAInformation

Description

-

-Subclasses of GUPnPDLNAInformation should override all virtual +

Subclasses of GUPnPDLNAInformation should override all virtual functions provided by this class. The overrides should return a -subclasses of specific information base classes. -

-

-When instantiating a subclass of GUPnPDLNAInformation make sure -that "uri" with a URI to media file is passed to g_object_new(). -

+subclasses of specific information base classes.

+

When instantiating a subclass of GUPnPDLNAInformation make sure +that "uri" with a URI to media file is passed to g_object_new().

-

Details

+

Functions

+
+

gupnp_dlna_information_get_audio_information ()

+
GUPnPDLNAAudioInformation *
+gupnp_dlna_information_get_audio_information
+                               (GUPnPDLNAInformation *info);
+

Get an audio information of media file if applicable (e.g. for +video and audio files).

+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAInformation object.

 
+
+
+

Returns

+

A GUPnPDLNAAudioInformation object or NULL.

+

[transfer none]

+
+
+
+
+

gupnp_dlna_information_get_container_information ()

+
GUPnPDLNAContainerInformation *
+gupnp_dlna_information_get_container_information
+                               (GUPnPDLNAInformation *info);
+

Get an container information of media file if applicable (e.g. for +video and audio files).

+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAInformation object.

 
+
+
+

Returns

+

A GUPnPDLNAContainerInformation object or NULL.

+

[transfer none]

+
+
+
+
+

gupnp_dlna_information_get_image_information ()

+
GUPnPDLNAImageInformation *
+gupnp_dlna_information_get_image_information
+                               (GUPnPDLNAInformation *info);
+

Get an container information of media file if applicable (e.g. for +image files).

+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAInformation object.

 
+
+
+

Returns

+

A GUPnPDLNAImageInformation object or NULL.

+

[transfer none]

+
+
+
+
+

gupnp_dlna_information_get_video_information ()

+
GUPnPDLNAVideoInformation *
+gupnp_dlna_information_get_video_information
+                               (GUPnPDLNAInformation *info);
+

Get an container information of media file if applicable (e.g. for +video files).

+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAInformation object.

 
+
+
+

Returns

+

A GUPnPDLNAVideoInformation object or NULL.

+

[transfer none]

+
+
+
-

GUPnPDLNAInformation

-
typedef struct _GUPnPDLNAInformation GUPnPDLNAInformation;
+

gupnp_dlna_information_get_profile_name ()

+
const gchar *
+gupnp_dlna_information_get_profile_name
+                               (GUPnPDLNAInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAInformation object.

 
+
+
+

Returns

+

The name of a DLNA profile or NULL.

+

[transfer none]

+
+

gupnp_dlna_information_get_uri ()

+
const gchar *
+gupnp_dlna_information_get_uri (GUPnPDLNAInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAInformation object.

 
+
+
+

Returns

+

An URI of a file.

+

[transfer none]

+
+
+
+
+

Types and Values

+

GUPnPDLNAInformationClass

typedef struct {
         GObjectClass parent_class;
@@ -116,227 +356,101 @@
         gpointer _reserved[11];
 } GUPnPDLNAInformationClass;
-
-+
+

Members

+
+++++ - - + + + - - + + + - - + + + - - - - - - - - - - - - - - - - -

GObjectClass parent_class;

Parent class.

GObjectClass parent_class;

Parent class.

 

get_audio_information ()

This is called by GUPnPDLNAProfileGuesser -to get an audio information.

get_audio_information ()

This is called by GUPnPDLNAProfileGuesser +to get an audio information.

 

get_container_information ()

This is called by -GUPnPDLNAProfileGuesser to get a container information.

get_container_information ()

This is called by +GUPnPDLNAProfileGuesser to get a container information.

 

get_image_information ()

This is called by GUPnPDLNAProfileGuesser -to get an image information.

get_video_information ()

This is called by GUPnPDLNAProfileGuesser -to get a video information.

get_profile_name ()

This is called by GUPnPDLNAProfileGuesser to -get the name of the DLNA profile assigned with this information.

gpointer _reserved[11];

Padding. Ignore it.
-
-
-
-

gupnp_dlna_information_get_audio_information ()

-
GUPnPDLNAAudioInformation * gupnp_dlna_information_get_audio_information
-                                                        (GUPnPDLNAInformation *info);
-

-Get an audio information of media file if applicable (e.g. for -video and audio files). -

-
-- - - - + + + - - + + + - -

info :

A GUPnPDLNAInformation object.

get_image_information ()

This is called by GUPnPDLNAProfileGuesser +to get an image information.

 

Returns :

A GUPnPDLNAAudioInformation object or NULL. [transfer none] -

get_video_information ()

This is called by GUPnPDLNAProfileGuesser +to get a video information.

 
-
-
-
-

gupnp_dlna_information_get_container_information ()

-
GUPnPDLNAContainerInformation * gupnp_dlna_information_get_container_information
-                                                        (GUPnPDLNAInformation *info);
-

-Get an container information of media file if applicable (e.g. for -video and audio files). -

-
-- - - + + + - - + + +

info :

A GUPnPDLNAInformation object.

get_profile_name ()

This is called by GUPnPDLNAProfileGuesser to +get the name of the DLNA profile assigned with this information.

 

Returns :

A GUPnPDLNAContainerInformation object or NULL. [transfer none] -

gpointer _reserved[11];

Padding. Ignore it.

 
-
-
-

gupnp_dlna_information_get_image_information ()

-
GUPnPDLNAImageInformation * gupnp_dlna_information_get_image_information
-                                                        (GUPnPDLNAInformation *info);
-

-Get an container information of media file if applicable (e.g. for -image files). -

-
-- - - - - - - - - - -

info :

A GUPnPDLNAInformation object.

Returns :

A GUPnPDLNAImageInformation object or NULL. [transfer none] -
-
-
-
-

gupnp_dlna_information_get_video_information ()

-
GUPnPDLNAVideoInformation * gupnp_dlna_information_get_video_information
-                                                        (GUPnPDLNAInformation *info);
-

-Get an container information of media file if applicable (e.g. for -video files). -

-
-- - - - - - - - - - -

info :

A GUPnPDLNAInformation object.

Returns :

A GUPnPDLNAVideoInformation object or NULL. [transfer none] -
-
-
-
-

gupnp_dlna_information_get_profile_name ()

-
const gchar *       gupnp_dlna_information_get_profile_name
-                                                        (GUPnPDLNAInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAInformation object.

Returns :

The name of a DLNA profile or NULL. [transfer none] -
-
-
-
-

gupnp_dlna_information_get_uri ()

-
const gchar *       gupnp_dlna_information_get_uri      (GUPnPDLNAInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAInformation object.

Returns :

An URI of a file. [transfer none] -

Property Details

-

The "audio-information" property

-
  "audio-information"        GUPnPDLNAAudioInformation*  : Read
-

-Audio information of a file. -

+

The “audio-information” property

+
  “audio-information”        GUPnPDLNAAudioInformation *
+

Audio information of a file.

+

Flags: Read

-

The "container-information" property

-
  "container-information"    GUPnPDLNAContainerInformation*  : Read
-

-Container information of a file. -

+

The “container-information” property

+
  “container-information”    GUPnPDLNAContainerInformation *
+

Container information of a file.

+

Flags: Read

-

The "image-information" property

-
  "image-information"        GUPnPDLNAImageInformation*  : Read
-

-Image information of a file. -

+

The “image-information” property

+
  “image-information”        GUPnPDLNAImageInformation *
+

Image information of a file.

+

Flags: Read

-

The "uri" property

-
  "uri"                      gchar*                : Read / Write / Construct Only
-

-URI of file which metadata this object stores. -

+

The “uri” property

+
  “uri”                      gchar *
+

URI of file which metadata this object stores.

+

Flags: Read / Write / Construct Only

Default value: NULL

-

The "video-information" property

-
  "video-information"        GUPnPDLNAVideoInformation*  : Read
-

-Video information of a file. -

+

The “video-information” property

+
  “video-information”        GUPnPDLNAVideoInformation *
+

Video information of a file.

+

Flags: Read

- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21 \ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAProfileGuesser.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAProfileGuesser.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAProfileGuesser.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAProfileGuesser.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,36 +2,29 @@ -GUPnPDLNAProfileGuesser - +GUPnP DLNA Reference Manual: GUPnPDLNAProfileGuesser + - + - - - - - - - - - - + + + + + + +
@@ -40,415 +33,586 @@

GUPnPDLNAProfileGuesser — Utility API for discovering DLNA profile for given media.

- +
-
-

Synopsis

-
                    GUPnPDLNAProfileGuesser;
-                    GUPnPDLNAProfileGuesserClass;
-GUPnPDLNAProfileGuesser * gupnp_dlna_profile_guesser_new
-                                                        (gboolean relaxed_mode,
-                                                         gboolean extended_mode);
-gboolean            gupnp_dlna_profile_guesser_guess_profile_async
-                                                        (GUPnPDLNAProfileGuesser *guesser,
-                                                         const gchar *uri,
-                                                         guint timeout_in_ms,
-                                                         GError **error);
-GUPnPDLNAProfile *  gupnp_dlna_profile_guesser_guess_profile_sync
-                                                        (GUPnPDLNAProfileGuesser *guesser,
-                                                         const gchar *uri,
-                                                         guint timeout_in_ms,
-                                                         GUPnPDLNAInformation **dlna_info,
-                                                         GError **error);
-GUPnPDLNAProfile *  gupnp_dlna_profile_guesser_guess_profile_from_info
-                                                        (GUPnPDLNAProfileGuesser *guesser,
-                                                         GUPnPDLNAInformation *info);
-GUPnPDLNAProfile *  gupnp_dlna_profile_guesser_get_profile
-                                                        (GUPnPDLNAProfileGuesser *guesser,
-                                                         const gchar *name);
-GList *             gupnp_dlna_profile_guesser_list_profiles
-                                                        (GUPnPDLNAProfileGuesser *guesser);
-gboolean            gupnp_dlna_profile_guesser_get_relaxed_mode
-                                                        (GUPnPDLNAProfileGuesser *guesser);
-gboolean            gupnp_dlna_profile_guesser_get_extended_mode
-                                                        (GUPnPDLNAProfileGuesser *guesser);
-void                gupnp_dlna_profile_guesser_cleanup  (void);
-
-
-
-

Object Hierarchy

-
-  GObject
-   +----GUPnPDLNAProfileGuesser
-
-
-
-

Properties

-
-  "extended-mode"            gboolean              : Read / Write / Construct Only
-  "relaxed-mode"             gboolean              : Read / Write / Construct Only
-
-
-

Signals

-
-  "done"                                           : Run Last
-
-
-
-

Description

-

-The API provides synchronous and asynchronous guessing of DLNA -profile. The asynchronous mode requires a running GMainLoop in the -default GMainContext. -

-
-
-

Details

-
-

GUPnPDLNAProfileGuesser

-
typedef struct _GUPnPDLNAProfileGuesser GUPnPDLNAProfileGuesser;
-

-The top-level object used to for DLNA profile guessing. -

-
-
-
-

GUPnPDLNAProfileGuesserClass

-
typedef struct {
-        GObjectClass parent_class;
-} GUPnPDLNAProfileGuesserClass;
-
-
-- - - - -

GObjectClass parent_class;

A GObjectClass - parent of this class.
-
-
-
-

gupnp_dlna_profile_guesser_new ()

-
GUPnPDLNAProfileGuesser * gupnp_dlna_profile_guesser_new
-                                                        (gboolean relaxed_mode,
-                                                         gboolean extended_mode);
-

-Creates a new guesser that will use specific DLNA profiles for -matching - i.e. which profiles will be used depends on -relaxed_mode and extended_mode. -

-
-+

Functions

+
++++ - - + + - - + + - - + + + + + + - -

relaxed_mode :

 -TRUE to enable relaxed mode support. FALSE otherwise. +GUPnPDLNAProfileGuesser * + +gupnp_dlna_profile_guesser_new () +

extended_mode :

 -TRUE to enable extended mode support. FALSE otherwise. +gboolean + +gupnp_dlna_profile_guesser_guess_profile_async () +

Returns :

A new GUPnPDLNAProfileGuesser object. +GUPnPDLNAProfile * + +gupnp_dlna_profile_guesser_guess_profile_sync () +
+GUPnPDLNAProfile * + +gupnp_dlna_profile_guesser_guess_profile_from_info () +
-
-
-
-

gupnp_dlna_profile_guesser_guess_profile_async ()

-
gboolean            gupnp_dlna_profile_guesser_guess_profile_async
-                                                        (GUPnPDLNAProfileGuesser *guesser,
-                                                         const gchar *uri,
-                                                         guint timeout_in_ms,
-                                                         GError **error);
-

-Asynchronously guesses DLNA profile for given uri. When guessing -is done, ::done signal is emitted on guesser. -

-
-- - - + + - - + + - - + + - - + + - - + +

guesser :

 -GUPnPDLNAProfileGuesser object to use for guessing. +GUPnPDLNAProfile * + +gupnp_dlna_profile_guesser_get_profile () +

uri :

URI of media. +GList * + +gupnp_dlna_profile_guesser_list_profiles () +

timeout_in_ms :

Timeout of guessing in miliseconds. +gboolean + +gupnp_dlna_profile_guesser_get_relaxed_mode () +

error :

 -GError object or NULL. +gboolean + +gupnp_dlna_profile_guesser_get_extended_mode () +

Returns :

 -TRUE if uri was successfully queued, FALSE otherwise. +void + +gupnp_dlna_profile_guesser_cleanup () +
-
-
-

gupnp_dlna_profile_guesser_guess_profile_sync ()

-
GUPnPDLNAProfile *  gupnp_dlna_profile_guesser_guess_profile_sync
-                                                        (GUPnPDLNAProfileGuesser *guesser,
-                                                         const gchar *uri,
-                                                         guint timeout_in_ms,
-                                                         GUPnPDLNAInformation **dlna_info,
-                                                         GError **error);
-

-Synchronously guesses DLNA profile for given uri. -

-
-+
+

Properties

+
+++++ - - + + + - - + + + + +

guesser :

 -GUPnPDLNAProfileGuesser object to use for guessing.gbooleanextended-modeRead / Write / Construct Only

uri :

URI of media.gbooleanrelaxed-modeRead / Write / Construct Only
+
+
+

Signals

+
+++++ + + + + + +
voiddoneRun Last
+
+
+

Types and Values

+
++++ + - - + + - - + + + +

timeout_in_ms :

Timeout of guessing in miliseconds. GUPnPDLNAProfileGuesser

dlna_info :

A place where to -store DLNA information or NULL. [allow-none][transfer full][out] - GUPnPDLNAProfileGuesserClass
+
+
+

Object Hierarchy

+
    GObject
+    ╰── GUPnPDLNAProfileGuesser
+
+
+
+

Description

+

The API provides synchronous and asynchronous guessing of DLNA +profile. The asynchronous mode requires a running GMainLoop in the +default GMainContext.

+
+
+

Functions

+
+

gupnp_dlna_profile_guesser_new ()

+
GUPnPDLNAProfileGuesser *
+gupnp_dlna_profile_guesser_new (gboolean relaxed_mode,
+                                gboolean extended_mode);
+

Creates a new guesser that will use specific DLNA profiles for +matching - i.e. which profiles will be used depends on +relaxed_mode + and extended_mode +.

+
+

Parameters

+
+++++ + - - + + + - - + + +

error :

 -GError object or NULL. [allow-none] -

relaxed_mode

TRUE to enable relaxed mode support. FALSE otherwise.

 

Returns :

DLNA profile if any had matched, NULL otherwise. [transfer none] -

extended_mode

TRUE to enable extended mode support. FALSE otherwise.

 
+
+

Returns

+

A new GUPnPDLNAProfileGuesser object.

+

+
+
-

gupnp_dlna_profile_guesser_guess_profile_from_info ()

-
GUPnPDLNAProfile *  gupnp_dlna_profile_guesser_guess_profile_from_info
-                                                        (GUPnPDLNAProfileGuesser *guesser,
-                                                         GUPnPDLNAInformation *info);
-

-Guesses the profile which fits to passed info. -

-
-+

gupnp_dlna_profile_guesser_guess_profile_async ()

+
gboolean
+gupnp_dlna_profile_guesser_guess_profile_async
+                               (GUPnPDLNAProfileGuesser *guesser,
+                                const gchar *uri,
+                                guint timeout_in_ms,
+                                GError **error);
+

Asynchronously guesses DLNA profile for given uri +. When guessing +is done, ::done signal is emitted on guesser +.

+
+

Parameters

+
+++++ - - + + + - - + + + - - + + + + + + + +

guesser :

The GUPnPDLNAProfileGuesser object.

guesser

GUPnPDLNAProfileGuesser object to use for guessing.

 

info :

The GUPnPDLNAInformation object.

uri

URI of media.

 

Returns :

A GUPnPDLNAProfile object on success, -NULL otherwise. [transfer none] -

timeout_in_ms

Timeout of guessing in miliseconds.

 

error

GError object or NULL.

 
+
+

Returns

+

TRUE if uri +was successfully queued, FALSE otherwise.

+

+
+
-

gupnp_dlna_profile_guesser_get_profile ()

-
GUPnPDLNAProfile *  gupnp_dlna_profile_guesser_get_profile
-                                                        (GUPnPDLNAProfileGuesser *guesser,
-                                                         const gchar *name);
-

-Lookups for GUPnPDLNAProfile with given name. -

-
-+

gupnp_dlna_profile_guesser_guess_profile_sync ()

+
GUPnPDLNAProfile *
+gupnp_dlna_profile_guesser_guess_profile_sync
+                               (GUPnPDLNAProfileGuesser *guesser,
+                                const gchar *uri,
+                                guint timeout_in_ms,
+                                GUPnPDLNAInformation **dlna_info,
+                                GError **error);
+

Synchronously guesses DLNA profile for given uri +.

+
+

Parameters

+
+++++ - - + + + - - + + + - - + + + - -

guesser :

The GUPnPDLNAProfileGuesser object.

guesser

GUPnPDLNAProfileGuesser object to use for guessing.

 

name :

The name of the DLNA profile to be retrieved.

uri

URI of media.

 

Returns :

A GUPnPDLNAProfile object on success, -NULL otherwise. [transfer none] -

timeout_in_ms

Timeout of guessing in miliseconds.

 
-
-
-
-

gupnp_dlna_profile_guesser_list_profiles ()

-
GList *             gupnp_dlna_profile_guesser_list_profiles
-                                                        (GUPnPDLNAProfileGuesser *guesser);
-

-Gets a list of the all DLNA profiles supported by guesser. -

-
-- - - + + + - - + + +

guesser :

The GUPnPDLNAProfileGuesser whose profile list is required.

dlna_info

A place where to +store DLNA information or NULL.

[allow-none][transfer full][out]

Returns :

A GList -of GUPnPDLNAProfile on success, NULL otherwise. [transfer none][element-type GUPnPDLNAProfile] -

error

GError object or NULL.

[allow-none]
+
+

Returns

+

DLNA profile if any had matched, NULL otherwise.

+

[transfer none]

+
+
-

gupnp_dlna_profile_guesser_get_relaxed_mode ()

-
gboolean            gupnp_dlna_profile_guesser_get_relaxed_mode
-                                                        (GUPnPDLNAProfileGuesser *guesser);
-
-+

gupnp_dlna_profile_guesser_guess_profile_from_info ()

+
GUPnPDLNAProfile *
+gupnp_dlna_profile_guesser_guess_profile_from_info
+                               (GUPnPDLNAProfileGuesser *guesser,
+                                GUPnPDLNAInformation *info);
+

Guesses the profile which fits to passed info +.

+
+

Parameters

+
+++++ - - + + + - - + + +

guesser :

The GUPnPDLNAProfileGuesser object.

guesser

The GUPnPDLNAProfileGuesser object.

 

Returns :

 -TRUE if guesser is in relaxed mode, FALSE otherwise.

info

The GUPnPDLNAInformation object.

 
+
+

Returns

+

A GUPnPDLNAProfile object on success, +NULL otherwise.

+

[transfer none]

+
+
-

gupnp_dlna_profile_guesser_get_extended_mode ()

-
gboolean            gupnp_dlna_profile_guesser_get_extended_mode
-                                                        (GUPnPDLNAProfileGuesser *guesser);
-
-+

gupnp_dlna_profile_guesser_get_profile ()

+
GUPnPDLNAProfile *
+gupnp_dlna_profile_guesser_get_profile
+                               (GUPnPDLNAProfileGuesser *guesser,
+                                const gchar *name);
+

Lookups for GUPnPDLNAProfile with given name +.

+
+

Parameters

+
+++++ - - + + + - - + + +

guesser :

The GUPnPDLNAProfileGuesser object.

guesser

The GUPnPDLNAProfileGuesser object.

 

Returns :

 -TRUE if guesser is in extended mode, FALSE otherwise.

name

The name of the DLNA profile to be retrieved.

 
+
+

Returns

+

A GUPnPDLNAProfile object on success, +NULL otherwise.

+

[transfer none]

+
+ +
+
+

gupnp_dlna_profile_guesser_list_profiles ()

+
GList *
+gupnp_dlna_profile_guesser_list_profiles
+                               (GUPnPDLNAProfileGuesser *guesser);
+

Gets a list of the all DLNA profiles supported by guesser +.

+
+

Parameters

+
+++++ + + + + + +

guesser

The GUPnPDLNAProfileGuesser whose profile list is required.

 
+
+
+

Returns

+

A GList +of GUPnPDLNAProfile on success, NULL otherwise.

+

[transfer none][element-type GUPnPDLNAProfile]

+
+
+
+
+

gupnp_dlna_profile_guesser_get_relaxed_mode ()

+
gboolean
+gupnp_dlna_profile_guesser_get_relaxed_mode
+                               (GUPnPDLNAProfileGuesser *guesser);
+
+

Parameters

+
+++++ + + + + + +

guesser

The GUPnPDLNAProfileGuesser object.

 
+
+
+

Returns

+

TRUE if guesser +is in relaxed mode, FALSE otherwise.

+

+
+
-

gupnp_dlna_profile_guesser_cleanup ()

-
void                gupnp_dlna_profile_guesser_cleanup  (void);
-

-Cleans up the DLNA profiles. Provided to remove Valgrind noise. Not +

gupnp_dlna_profile_guesser_get_extended_mode ()

+
gboolean
+gupnp_dlna_profile_guesser_get_extended_mode
+                               (GUPnPDLNAProfileGuesser *guesser);
+
+

Parameters

+
+++++ + + + + + +

guesser

The GUPnPDLNAProfileGuesser object.

 
+
+
+

Returns

+

TRUE if guesser +is in extended mode, FALSE otherwise.

+

+
+
+
+
+

gupnp_dlna_profile_guesser_cleanup ()

+
void
+gupnp_dlna_profile_guesser_cleanup (void);
+

Cleans up the DLNA profiles. Provided to remove Valgrind noise. Not thread-safe. Do not call it if there is even a slightest chance that profile guessing will be performed during process -lifetime. The profiles are not reloaded after cleanup. -

+lifetime. The profiles are not reloaded after cleanup.

+
+ +
+

Types and Values

+
+

GUPnPDLNAProfileGuesser

+
typedef struct _GUPnPDLNAProfileGuesser GUPnPDLNAProfileGuesser;
+

The top-level object used to for DLNA profile guessing.

+
+
+
+

GUPnPDLNAProfileGuesserClass

+
typedef struct {
+        GObjectClass parent_class;
+} GUPnPDLNAProfileGuesserClass;
+
+
+

Members

+
+++++ + + + + + +

GObjectClass parent_class;

A GObjectClass - parent of this class.

 
+

Property Details

-

The "extended-mode" property

-
  "extended-mode"            gboolean              : Read / Write / Construct Only
-

-Whether profile matching should be done also against DLNA -profiles not being a part of DLNA specification. -

+

The “extended-mode” property

+
  “extended-mode”            gboolean
+

Whether profile matching should be done also against DLNA +profiles not being a part of DLNA specification.

+

Flags: Read / Write / Construct Only

Default value: FALSE

-

The "relaxed-mode" property

-
  "relaxed-mode"             gboolean              : Read / Write / Construct Only
-

-Whether profile matching should not be strictly compliant -with the DLNA specification. -

+

The “relaxed-mode” property

+
  “relaxed-mode”             gboolean
+

Whether profile matching should not be strictly compliant +with the DLNA specification.

+

Flags: Read / Write / Construct Only

Default value: FALSE

Signal Details

-

The "done" signal

-
void                user_function                      (GUPnPDLNAProfileGuesser *profile_guesser,
-                                                        GUPnPDLNAInformation    *info,
-                                                        GUPnPDLNAProfile        *dlna,
-                                                        GError                  *error,
-                                                        gpointer                 user_data)            : Run Last
-

-Will be emitted when guessing DLNA profile for a URI has finished. -

-
-+

The “done” signal

+
void
+user_function (GUPnPDLNAProfileGuesser *profile_guesser,
+               GUPnPDLNAInformation    *info,
+               GUPnPDLNAProfile        *dlna,
+               GError                  *error,
+               gpointer                 user_data)
+

Will be emitted when guessing DLNA profile for a URI has finished.

+
+

Parameters

+
+++++ - - + + + - - + + + - - + + + - - + + + - - + + +

profile_guesser :

The GUPnPDLNAProfileGuesser.

profile_guesser

The GUPnPDLNAProfileGuesser.

 

info :

URI metadata as GUPnPDLNAInformation. [transfer none] -

info

URI metadata as GUPnPDLNAInformation.

[transfer none]

dlna :

The results as GUPnPDLNAProfile. [allow-none][transfer none] -

dlna

The results as GUPnPDLNAProfile.

[allow-none][transfer none]

error :

Contains details of the error if discovery failed, -else is NULL. [allow-none] -

error

Contains details of the error if discovery failed, +else is NULL.

[allow-none]

user_data :

user data set when the signal handler was connected.

user_data

user data set when the signal handler was connected.

 
+

Flags: Run Last

+
- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21 \ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAProfile.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAProfile.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAProfile.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAProfile.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,34 +2,28 @@ -GUPnPDLNAProfile - +GUPnP DLNA Reference Manual: GUPnPDLNAProfile + - + - - - - - - - - - - + + + + + + +
@@ -37,293 +31,443 @@

GUPnPDLNAProfile

GUPnPDLNAProfile — Object representing a DLNA profile

- +
-
-

Synopsis

-
                    GUPnPDLNAProfile;
-                    GUPnPDLNAProfileClass;
-const gchar *       gupnp_dlna_profile_get_name         (GUPnPDLNAProfile *profile);
-const gchar *       gupnp_dlna_profile_get_mime         (GUPnPDLNAProfile *profile);
-gboolean            gupnp_dlna_profile_get_extended     (GUPnPDLNAProfile *profile);
-GList *             gupnp_dlna_profile_get_container_restrictions
-                                                        (GUPnPDLNAProfile *profile);
-GList *             gupnp_dlna_profile_get_audio_restrictions
-                                                        (GUPnPDLNAProfile *profile);
-GList *             gupnp_dlna_profile_get_image_restrictions
-                                                        (GUPnPDLNAProfile *profile);
-GList *             gupnp_dlna_profile_get_video_restrictions
-                                                        (GUPnPDLNAProfile *profile);
-
-
-

Object Hierarchy

-
-  GObject
-   +----GUPnPDLNAProfile
-
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
const gchar * + +gupnp_dlna_profile_get_name () +
const gchar * + +gupnp_dlna_profile_get_mime () +
+gboolean + +gupnp_dlna_profile_get_extended () +
+GList * + +gupnp_dlna_profile_get_container_restrictions () +
+GList * + +gupnp_dlna_profile_get_audio_restrictions () +
+GList * + +gupnp_dlna_profile_get_image_restrictions () +
+GList * + +gupnp_dlna_profile_get_video_restrictions () +

Properties

-
-  "audio-restrictions"       gpointer              : Read / Write / Construct Only
-  "container-restrictions"   gpointer              : Read / Write / Construct Only
-  "extended"                 gboolean              : Read / Write / Construct Only
-  "image-restrictions"       gpointer              : Read / Write / Construct Only
-  "mime"                     gchar*                : Read / Write / Construct Only
-  "name"                     gchar*                : Read / Write / Construct Only
-  "video-restrictions"       gpointer              : Read / Write / Construct Only
+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





gpointeraudio-restrictionsRead / Write / Construct Only
gpointercontainer-restrictionsRead / Write / Construct Only
gbooleanextendedRead / Write / Construct Only
gpointerimage-restrictionsRead / Write / Construct Only

+gchar *mimeRead / Write / Construct Only

+gchar *nameRead / Write / Construct Only
gpointervideo-restrictionsRead / Write / Construct Only

+
+
+

Types and Values

+
++++ + + + + + + + + + + +
 GUPnPDLNAProfile
 GUPnPDLNAProfileClass
+
+
+

Object Hierarchy

+
    GObject
+    ╰── GUPnPDLNAProfile

Description

-

-The GUPnPDLNAProfileGuesser object provides a few APIs that return +

The GUPnPDLNAProfileGuesser object provides a few APIs that return GUPnPDLNAProfile objects. These represent a single DLNA profile. Each GUPnPDLNAProfile has a name (the name of the DLNA -profile) and the corresponding MIME type. -

-

-Public representation of the various audio/container/image/video -restrictions specified for that DLNA profile is to be added. -

+profile) and the corresponding MIME type.

+

Public representation of the various audio/container/image/video +restrictions specified for that DLNA profile is to be added.

-

Details

+

Functions

-

GUPnPDLNAProfile

-
typedef struct _GUPnPDLNAProfile GUPnPDLNAProfile;
-

-The top-level object used for the in-memory representation of the -DLNA Profiles. -

+

gupnp_dlna_profile_get_name ()

+
const gchar *
+gupnp_dlna_profile_get_name (GUPnPDLNAProfile *profile);
+
+

Parameters

+
+++++ + + + + + +

profile

The GUPnPDLNAProfile object.

 
+
+
+

Returns

+

The name of the DLNA profile represented by profile +.

+

+
-

GUPnPDLNAProfileClass

-
typedef struct {
-        GObjectClass parent_class;
-} GUPnPDLNAProfileClass;
-
-
-+

gupnp_dlna_profile_get_mime ()

+
const gchar *
+gupnp_dlna_profile_get_mime (GUPnPDLNAProfile *profile);
+
+

Parameters

+
+++++ - - + + +

GObjectClass parent_class;

A GObjectClass - parent of this class.

profile

The GUPnPDLNAProfile object.

 
+
+

Returns

+

The DLNA MIME type of the DLNA profile represented by profile +.

+

+
+
-

gupnp_dlna_profile_get_name ()

-
const gchar *       gupnp_dlna_profile_get_name         (GUPnPDLNAProfile *profile);
-
-- - - - - - - - - - +

gupnp_dlna_profile_get_extended ()

+
gboolean
+gupnp_dlna_profile_get_extended (GUPnPDLNAProfile *profile);
+
+

Parameters

+

profile :

The GUPnPDLNAProfile object.

Returns :

The name of the DLNA profile represented by profile.
+++++ + + + + +

profile

The GUPnPDLNAProfile object.

 
+
+

Returns

+

TRUE if profile +is extended one and FALSE otherwise.

+

+
+
-

gupnp_dlna_profile_get_mime ()

-
const gchar *       gupnp_dlna_profile_get_mime         (GUPnPDLNAProfile *profile);
-
-- - - - - - - - - - +

gupnp_dlna_profile_get_container_restrictions ()

+
GList *
+gupnp_dlna_profile_get_container_restrictions
+                               (GUPnPDLNAProfile *profile);
+

Gets a list of container restrictions.

+
+

Parameters

+

profile :

The GUPnPDLNAProfile object.

Returns :

The DLNA MIME type of the DLNA profile represented by profile.
+++++ + + + + +

profile

A profile.

[transfer none]
+
+

Returns

+

Container restrictions. Do not modify.

+

[transfer none][element-type GUPnPDLNARestriction]

+
+
-

gupnp_dlna_profile_get_extended ()

-
gboolean            gupnp_dlna_profile_get_extended     (GUPnPDLNAProfile *profile);
-
-- - - - - - - - - - +

gupnp_dlna_profile_get_audio_restrictions ()

+
GList *
+gupnp_dlna_profile_get_audio_restrictions
+                               (GUPnPDLNAProfile *profile);
+

Gets a list of audio restrictions.

+
+

Parameters

+

profile :

The GUPnPDLNAProfile object.

Returns :

 -TRUE if profile is extended one and FALSE otherwise.
+++++ + + + + +

profile

A profile.

[transfer none]
+
+

Returns

+

Audio +restrictions. Do not modify.

+

[transfer none][element-type GUPnPDLNARestriction]

+
+
-

gupnp_dlna_profile_get_container_restrictions ()

-
GList *             gupnp_dlna_profile_get_container_restrictions
-                                                        (GUPnPDLNAProfile *profile);
-

-Gets a list of container restrictions. -

-
-- - - - - - - - - - +

gupnp_dlna_profile_get_image_restrictions ()

+
GList *
+gupnp_dlna_profile_get_image_restrictions
+                               (GUPnPDLNAProfile *profile);
+

Gets a list of image restrictions.

+
+

Parameters

+

profile :

A profile. [transfer none] -

Returns :

Container restrictions. Do not modify. [transfer none][element-type GUPnPDLNARestriction] -
+++++ + + + + +

profile

A profile.

[transfer none]
+
+

Returns

+

Image +restrictions. Do not modify.

+

[transfer none][element-type GUPnPDLNARestriction]

+
+
-

gupnp_dlna_profile_get_audio_restrictions ()

-
GList *             gupnp_dlna_profile_get_audio_restrictions
-                                                        (GUPnPDLNAProfile *profile);
-

-Gets a list of audio restrictions. -

-
-- - - - - - - - - - +

gupnp_dlna_profile_get_video_restrictions ()

+
GList *
+gupnp_dlna_profile_get_video_restrictions
+                               (GUPnPDLNAProfile *profile);
+

Gets a list of video restrictions.

+
+

Parameters

+

profile :

A profile. [transfer none] -

Returns :

Audio -restrictions. Do not modify. [transfer none][element-type GUPnPDLNARestriction] -
+++++ + + + + +

profile

A profile.

[transfer none]
-
+
+

Returns

+

Video +restrictions. Do not modify.

+

[transfer none][element-type GUPnPDLNARestriction]

+
+ + +
+

Types and Values

-

gupnp_dlna_profile_get_image_restrictions ()

-
GList *             gupnp_dlna_profile_get_image_restrictions
-                                                        (GUPnPDLNAProfile *profile);
-

-Gets a list of image restrictions. -

-
-- - - - - - - - - - -

profile :

A profile. [transfer none] -

Returns :

Image -restrictions. Do not modify. [transfer none][element-type GUPnPDLNARestriction] -
+

GUPnPDLNAProfile

+
typedef struct _GUPnPDLNAProfile GUPnPDLNAProfile;
+

The top-level object used for the in-memory representation of the +DLNA Profiles.

-

gupnp_dlna_profile_get_video_restrictions ()

-
GList *             gupnp_dlna_profile_get_video_restrictions
-                                                        (GUPnPDLNAProfile *profile);
-

-Gets a list of video restrictions. -

-
-- - - - - - - - - - +

GUPnPDLNAProfileClass

+
typedef struct {
+        GObjectClass parent_class;
+} GUPnPDLNAProfileClass;
+
+
+

Members

+

profile :

A profile. [transfer none] -

Returns :

Video -restrictions. Do not modify. [transfer none][element-type GUPnPDLNARestriction] -
+++++ + + + + +

GObjectClass parent_class;

A GObjectClass - parent of this class.

 
+

Property Details

-

The "audio-restrictions" property

-
  "audio-restrictions"       gpointer              : Read / Write / Construct Only
+

The “audio-restrictions” property

+
  “audio-restrictions”       gpointer

Audio restrictions for the DLNA Profile.

+

Flags: Read / Write / Construct Only

-

The "container-restrictions" property

-
  "container-restrictions"   gpointer              : Read / Write / Construct Only
+

The “container-restrictions” property

+
  “container-restrictions”   gpointer

Container restrictions for the DLNA Profile.

+

Flags: Read / Write / Construct Only

-

The "extended" property

-
  "extended"                 gboolean              : Read / Write / Construct Only
-

-Whether the DLNA profile is not a part of DLNA specification. -

+

The “extended” property

+
  “extended”                 gboolean
+

Whether the DLNA profile is not a part of DLNA specification.

+

Flags: Read / Write / Construct Only

Default value: FALSE

-

The "image-restrictions" property

-
  "image-restrictions"       gpointer              : Read / Write / Construct Only
+

The “image-restrictions” property

+
  “image-restrictions”       gpointer

Image restrictions for the DLNA Profile.

+

Flags: Read / Write / Construct Only

-

The "mime" property

-
  "mime"                     gchar*                : Read / Write / Construct Only
-

-MIME type of the DLNA profile. -

+

The “mime” property

+
  “mime”                     gchar *
+

MIME type of the DLNA profile.

+

Flags: Read / Write / Construct Only

Default value: NULL

-

The "name" property

-
  "name"                     gchar*                : Read / Write / Construct Only
-

-Name of the DLNA profile. -

+

The “name” property

+
  “name”                     gchar *
+

Name of the DLNA profile.

+

Flags: Read / Write / Construct Only

Default value: NULL

-

The "video-restrictions" property

-
  "video-restrictions"       gpointer              : Read / Write / Construct Only
+

The “video-restrictions” property

+
  “video-restrictions”       gpointer

Video restrictions for the DLNA Profile.

+

Flags: Read / Write / Construct Only

- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21 \ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAVideoInformation.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAVideoInformation.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/GUPnPDLNAVideoInformation.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/GUPnPDLNAVideoInformation.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,32 +2,27 @@ -GUPnPDLNAVideoInformation - +GUPnP DLNA Reference Manual: GUPnPDLNAVideoInformation + - + - - - - - - - - - - + + + + + + +
@@ -36,75 +31,445 @@

GUPnPDLNAVideoInformation — Base class representing video metadata needed for DLNA profiles matching.

- +
-
-

Synopsis

-
                    GUPnPDLNAVideoInformation;
-                    GUPnPDLNAVideoInformationClass;
-GUPnPDLNAIntValue   gupnp_dlna_video_information_get_bitrate
-                                                        (GUPnPDLNAVideoInformation *info);
-GUPnPDLNAFractionValue gupnp_dlna_video_information_get_framerate
-                                                        (GUPnPDLNAVideoInformation *info);
-GUPnPDLNAIntValue   gupnp_dlna_video_information_get_height
-                                                        (GUPnPDLNAVideoInformation *info);
-GUPnPDLNABoolValue  gupnp_dlna_video_information_is_interlaced
-                                                        (GUPnPDLNAVideoInformation *info);
-GUPnPDLNAStringValue gupnp_dlna_video_information_get_level
-                                                        (GUPnPDLNAVideoInformation *info);
-GUPnPDLNAIntValue   gupnp_dlna_video_information_get_mpeg_version
-                                                        (GUPnPDLNAVideoInformation *info);
-GUPnPDLNAFractionValue gupnp_dlna_video_information_get_pixel_aspect_ratio
-                                                        (GUPnPDLNAVideoInformation *info);
-GUPnPDLNAStringValue gupnp_dlna_video_information_get_profile
-                                                        (GUPnPDLNAVideoInformation *info);
-GUPnPDLNABoolValue  gupnp_dlna_video_information_is_system_stream
-                                                        (GUPnPDLNAVideoInformation *info);
-GUPnPDLNAIntValue   gupnp_dlna_video_information_get_width
-                                                        (GUPnPDLNAVideoInformation *info);
-GUPnPDLNAStringValue gupnp_dlna_video_information_get_mime
-                                                        (GUPnPDLNAVideoInformation *info);
-
+
+

Functions

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+GUPnPDLNAIntValue + +gupnp_dlna_video_information_get_bitrate () +
+GUPnPDLNAFractionValue + +gupnp_dlna_video_information_get_framerate () +
+GUPnPDLNAIntValue + +gupnp_dlna_video_information_get_height () +
+GUPnPDLNABoolValue + +gupnp_dlna_video_information_is_interlaced () +
+GUPnPDLNAStringValue + +gupnp_dlna_video_information_get_level () +
+GUPnPDLNAIntValue + +gupnp_dlna_video_information_get_mpeg_version () +
+GUPnPDLNAFractionValue + +gupnp_dlna_video_information_get_pixel_aspect_ratio () +
+GUPnPDLNAStringValue + +gupnp_dlna_video_information_get_profile () +
+GUPnPDLNABoolValue + +gupnp_dlna_video_information_is_system_stream () +
+GUPnPDLNAIntValue + +gupnp_dlna_video_information_get_width () +
+GUPnPDLNAStringValue + +gupnp_dlna_video_information_get_mime () +
+
+
+

Types and Values

+
++++ + + + + +
 GUPnPDLNAVideoInformationClass

Object Hierarchy

-
-  GObject
-   +----GUPnPDLNAVideoInformation
+
    GObject
+    ╰── GUPnPDLNAVideoInformation

Description

-

-GUPnPDLNAVideoInformation holds all video metadatas important for +

GUPnPDLNAVideoInformation holds all video metadatas important for matching profiles. Note that it does not mean all data should be provided for every video file as in some cases it does not make sense (e.g. MPEG version does not make sense for Quicktime video -files). -

-

-For metadata attributes that do not exist in current video file an +files).

+

For metadata attributes that do not exist in current video file an unset value should be returned. For metadata attributes that do exist a set value with proper underlying value should be returned. In case metadata extractor has completely no clue how to extract some metadata attribute at all, an unsupported value should be returned. Note that unsupported values should be a temporary mean before fixing the multimedia framework to be able to extract -such attribute. -

-

-Note that gupnp_dlna_video_information_get_mime() should always +such attribute.

+

Note that gupnp_dlna_video_information_get_mime() should always return a set value. Otherwise it is highly probably that the file -will not match against any DLNA profile. -

+will not match against any DLNA profile.

-

Details

+

Functions

-

GUPnPDLNAVideoInformation

-
typedef struct _GUPnPDLNAVideoInformation GUPnPDLNAVideoInformation;
+

gupnp_dlna_video_information_get_bitrate ()

+
GUPnPDLNAIntValue
+gupnp_dlna_video_information_get_bitrate
+                               (GUPnPDLNAVideoInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAVideoInformation object.

 
+
+
+

Returns

+

A bitrate.

+

+
+
+
+
+

gupnp_dlna_video_information_get_framerate ()

+
GUPnPDLNAFractionValue
+gupnp_dlna_video_information_get_framerate
+                               (GUPnPDLNAVideoInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAVideoInformation object.

 
+
+
+

Returns

+

A framerate.

+

+
+
+
+
+

gupnp_dlna_video_information_get_height ()

+
GUPnPDLNAIntValue
+gupnp_dlna_video_information_get_height
+                               (GUPnPDLNAVideoInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAVideoInformation object.

 
+
+
+

Returns

+

A height.

+

+
+
+
+
+

gupnp_dlna_video_information_is_interlaced ()

+
GUPnPDLNABoolValue
+gupnp_dlna_video_information_is_interlaced
+                               (GUPnPDLNAVideoInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAVideoInformation object.

 
+
+
+

Returns

+

Whether video is interlaced.

+

+
+
+
+
+

gupnp_dlna_video_information_get_level ()

+
GUPnPDLNAStringValue
+gupnp_dlna_video_information_get_level
+                               (GUPnPDLNAVideoInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAVideoInformation object.

 
+
+
+

Returns

+

A level.

+

+
+
+
+
+

gupnp_dlna_video_information_get_mpeg_version ()

+
GUPnPDLNAIntValue
+gupnp_dlna_video_information_get_mpeg_version
+                               (GUPnPDLNAVideoInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAVideoInformation object.

 
+
+
+

Returns

+

An MPEG version.

+

+
+
+
+
+

gupnp_dlna_video_information_get_pixel_aspect_ratio ()

+
GUPnPDLNAFractionValue
+gupnp_dlna_video_information_get_pixel_aspect_ratio
+                               (GUPnPDLNAVideoInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAVideoInformation object.

 
+
+
+

Returns

+

A pixel-aspect-ratio.

+

+
+
+
+
+

gupnp_dlna_video_information_get_profile ()

+
GUPnPDLNAStringValue
+gupnp_dlna_video_information_get_profile
+                               (GUPnPDLNAVideoInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAVideoInformation object.

 
+
+
+

Returns

+

A profile.

+

+
+
+
+
+

gupnp_dlna_video_information_is_system_stream ()

+
GUPnPDLNABoolValue
+gupnp_dlna_video_information_is_system_stream
+                               (GUPnPDLNAVideoInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAVideoInformation object.

 
+
+
+

Returns

+

Whether it is a system stream.

+

+
+
+
+
+

gupnp_dlna_video_information_get_width ()

+
GUPnPDLNAIntValue
+gupnp_dlna_video_information_get_width
+                               (GUPnPDLNAVideoInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAVideoInformation object.

 
+
+
+

Returns

+

A width.

+

+
+
+
+
+

gupnp_dlna_video_information_get_mime ()

+
GUPnPDLNAStringValue
+gupnp_dlna_video_information_get_mime (GUPnPDLNAVideoInformation *info);
+
+

Parameters

+
+++++ + + + + + +

info

A GUPnPDLNAVideoInformation object.

 
+
+
+

Returns

+

A MIME type.

+

-
+
+
+
+

Types and Values

GUPnPDLNAVideoInformationClass

typedef struct {
@@ -146,293 +511,104 @@
         gpointer _reserved[12];
 } GUPnPDLNAVideoInformationClass;
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

GObjectClass parent_class;

Parent class.

get_bitrate ()

This is called by GUPnPDLNAProfileGuesser to get a -bitrate.

get_framerate ()

This is called by GUPnPDLNAProfileGuesser to get a -framerate.

get_height ()

This is called by GUPnPDLNAProfileGuesser to get a -height.

is_interlaced ()

This is called by GUPnPDLNAProfileGuesser to get -whether it is interlaced.

get_level ()

This is called by GUPnPDLNAProfileGuesser to get a -level.

get_mpeg_version ()

This is called by GUPnPDLNAProfileGuesser to -get an MPEG version.

get_pixel_aspect_ratio ()

This is called by GUPnPDLNAProfileGuesser -to get a pixel-aspect-ratio.

get_profile ()

This is called by GUPnPDLNAProfileGuesser to get a -profile.

is_system_stream ()

This is called by GUPnPDLNAProfileGuesser to -get whether it is a system stream.

get_width ()

This is called by GUPnPDLNAProfileGuesser to get a -width.

get_mime ()

This is called by GUPnPDLNAProfileGuesser to get a MIME -type.

gpointer _reserved[12];

Padding. Ignore it.
-
-
-
-

gupnp_dlna_video_information_get_bitrate ()

-
GUPnPDLNAIntValue   gupnp_dlna_video_information_get_bitrate
-                                                        (GUPnPDLNAVideoInformation *info);
-
-+
+

Members

+
+++++ - - + + + - - + + + - -

info :

A GUPnPDLNAVideoInformation object.

GObjectClass parent_class;

Parent class.

 

Returns :

A bitrate.

get_bitrate ()

This is called by GUPnPDLNAProfileGuesser to get a +bitrate.

 
-
-
-
-

gupnp_dlna_video_information_get_framerate ()

-
GUPnPDLNAFractionValue gupnp_dlna_video_information_get_framerate
-                                                        (GUPnPDLNAVideoInformation *info);
-
-- - - + + + - - + + + - -

info :

A GUPnPDLNAVideoInformation object.

get_framerate ()

This is called by GUPnPDLNAProfileGuesser to get a +framerate.

 

Returns :

A framerate.

get_height ()

This is called by GUPnPDLNAProfileGuesser to get a +height.

 
-
-
-
-

gupnp_dlna_video_information_get_height ()

-
GUPnPDLNAIntValue   gupnp_dlna_video_information_get_height
-                                                        (GUPnPDLNAVideoInformation *info);
-
-- - - + + + - - + + + - -

info :

A GUPnPDLNAVideoInformation object.

is_interlaced ()

This is called by GUPnPDLNAProfileGuesser to get +whether it is interlaced.

 

Returns :

A height.

get_level ()

This is called by GUPnPDLNAProfileGuesser to get a +level.

 
-
-
-
-

gupnp_dlna_video_information_is_interlaced ()

-
GUPnPDLNABoolValue  gupnp_dlna_video_information_is_interlaced
-                                                        (GUPnPDLNAVideoInformation *info);
-
-- - - + + + - - + + + - -

info :

A GUPnPDLNAVideoInformation object.

get_mpeg_version ()

This is called by GUPnPDLNAProfileGuesser to +get an MPEG version.

 

Returns :

Whether video is interlaced.

get_pixel_aspect_ratio ()

This is called by GUPnPDLNAProfileGuesser +to get a pixel-aspect-ratio.

 
-
-
-
-

gupnp_dlna_video_information_get_level ()

-
GUPnPDLNAStringValue gupnp_dlna_video_information_get_level
-                                                        (GUPnPDLNAVideoInformation *info);
-
-- - - + + + - - + + + - -

info :

A GUPnPDLNAVideoInformation object.

get_profile ()

This is called by GUPnPDLNAProfileGuesser to get a +profile.

 

Returns :

A level.

is_system_stream ()

This is called by GUPnPDLNAProfileGuesser to +get whether it is a system stream.

 
-
-
-
-

gupnp_dlna_video_information_get_mpeg_version ()

-
GUPnPDLNAIntValue   gupnp_dlna_video_information_get_mpeg_version
-                                                        (GUPnPDLNAVideoInformation *info);
-
-- - - + + + - - + + + - -

info :

A GUPnPDLNAVideoInformation object.

get_width ()

This is called by GUPnPDLNAProfileGuesser to get a +width.

 

Returns :

An MPEG version.

get_mime ()

This is called by GUPnPDLNAProfileGuesser to get a MIME +type.

 
-
-
-
-

gupnp_dlna_video_information_get_pixel_aspect_ratio ()

-
GUPnPDLNAFractionValue gupnp_dlna_video_information_get_pixel_aspect_ratio
-                                                        (GUPnPDLNAVideoInformation *info);
-
-- - - - - - - + + +

info :

A GUPnPDLNAVideoInformation object.

Returns :

A pixel-aspect-ratio.

gpointer _reserved[12];

Padding. Ignore it.

 
-
-
-

gupnp_dlna_video_information_get_profile ()

-
GUPnPDLNAStringValue gupnp_dlna_video_information_get_profile
-                                                        (GUPnPDLNAVideoInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAVideoInformation object.

Returns :

A profile.
-
-
-
-

gupnp_dlna_video_information_is_system_stream ()

-
GUPnPDLNABoolValue  gupnp_dlna_video_information_is_system_stream
-                                                        (GUPnPDLNAVideoInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAVideoInformation object.

Returns :

Whether it is a system stream.
-
-
-
-

gupnp_dlna_video_information_get_width ()

-
GUPnPDLNAIntValue   gupnp_dlna_video_information_get_width
-                                                        (GUPnPDLNAVideoInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAVideoInformation object.

Returns :

A width.
-
-
-
-

gupnp_dlna_video_information_get_mime ()

-
GUPnPDLNAStringValue gupnp_dlna_video_information_get_mime
-                                                        (GUPnPDLNAVideoInformation *info);
-
-- - - - - - - - - - -

info :

A GUPnPDLNAVideoInformation object.

Returns :

A MIME type.

See Also

-GUPnPDLNABoolValue, GUPnPDLNAFractionValue, -GUPnPDLNAIntValue, GUPnPDLNAStringValue +

GUPnPDLNABoolValue, GUPnPDLNAFractionValue, +GUPnPDLNAIntValue, GUPnPDLNAStringValue

- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21
\ No newline at end of file Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna/html/home.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna/html/home.png differ diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/index.html gupnp-dlna-0.10.3/doc/gupnp-dlna/html/index.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/index.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/index.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,11 +2,11 @@ -GUPnP DLNA Reference Manual - +GUPnP DLNA Reference Manual: GUPnP DLNA Reference Manual + - + @@ -14,14 +14,14 @@
-

Version 0.10.2 +

Version 0.10.3

Copyright © 2010 Arun Raghavan <arun.raghavan@collabora.co.uk>

Copyright © 2010 Collabora Multimedia

Copyright © 2010 Nokia Corporation

Copyright © 2012 Intel Corporation

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later @@ -45,7 +45,7 @@

-
+
GUPnP DLNA
@@ -93,6 +93,6 @@
- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/index.sgml gupnp-dlna-0.10.3/doc/gupnp-dlna/html/index.sgml --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/index.sgml 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/index.sgml 2015-06-30 22:54:32.000000000 +0000 @@ -1,12 +1,11 @@ - - + + + - - - + @@ -16,19 +15,21 @@ + + + - - + + + - - - + @@ -36,6 +37,9 @@ + + + @@ -45,19 +49,20 @@ - - + + + - - - + + + @@ -65,13 +70,11 @@ - + - + + - - - @@ -85,12 +88,11 @@ - + + - - - + @@ -103,40 +105,43 @@ + + - + + - - - + + + - + + - - - + + + - + + - - - + @@ -148,40 +153,42 @@ + + - + - + - + - + - + - + - - + + - + @@ -194,11 +201,9 @@ - - - - + + Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna/html/left-insensitive.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna/html/left-insensitive.png differ Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna/html/left.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna/html/left.png differ Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna/html/right-insensitive.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna/html/right-insensitive.png differ Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna/html/right.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna/html/right.png differ diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/html/style.css gupnp-dlna-0.10.3/doc/gupnp-dlna/html/style.css --- gupnp-dlna-0.10.2/doc/gupnp-dlna/html/style.css 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/html/style.css 2015-06-30 22:54:32.000000000 +0000 @@ -1,15 +1,23 @@ +body +{ + font-family: cantarell, sans-serif; +} .synopsis, .classsynopsis { /* tango:aluminium 1/2 */ background: #eeeeec; - border: solid 1px #d3d7cf; + background: rgba(238, 238, 236, 0.5); + border: solid 1px rgb(238, 238, 236); padding: 0.5em; } .programlisting { /* tango:sky blue 0/1 */ + /* fallback for no rgba support */ background: #e6f3ff; border: solid 1px #729fcf; + background: rgba(114, 159, 207, 0.1); + border: solid 1px rgba(114, 159, 207, 0.2); padding: 0.5em; } .variablelist @@ -22,89 +30,6 @@ vertical-align: top; } -@media screen { - sup a.footnote - { - position: relative; - top: 0em ! important; - - } - /* this is needed so that the local anchors are displayed below the naviagtion */ - div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] - { - display: inline-block; - position: relative; - top:-5em; - } - /* this seems to be a bug in the xsl style sheets when generating indexes */ - div.index div.index - { - top: 0em; - } - /* make space for the fixed navigation bar and add space at the bottom so that - * link targets appear somewhat close to top - */ - body - { - padding-top: 3.2em; - padding-bottom: 20em; - } - /* style and size the navigation bar */ - table.navigation#top - { - position: fixed; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; - margin-top: 0; - margin-bottom: 0; - top: 0; - left: 0; - height: 3em; - z-index: 10; - } - .navigation a, .navigation a:visited - { - /* tango:scarlet red 3 */ - color: #a40000; - } - .navigation a:hover - { - /* tango:scarlet red 1 */ - color: #ef2929; - } - td.shortcuts - { - /* tango:scarlet red 1 */ - color: #ef2929; - font-size: 80%; - white-space: nowrap; - } -} -@media print { - table.navigation { - visibility: collapse; - display: none; - } - div.titlepage table.navigation { - visibility: visible; - display: table; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; - margin-top: 0; - margin-bottom: 0; - top: 0; - left: 0; - height: 3em; - } -} - -.navigation .title -{ - font-size: 200%; -} - div.gallery-float { float: left; @@ -132,6 +57,72 @@ color: #729fcf; } +div.informaltable table +{ + border-collapse: separate; + border-spacing: 1em 0.5em; + border: none; +} + +div.informaltable table td, div.informaltable table th +{ + vertical-align: top; +} + +.function_type, +.variable_type, +.property_type, +.signal_type, +.parameter_name, +.struct_member_name, +.union_member_name, +.define_keyword, +.datatype_keyword, +.typedef_keyword +{ + text-align: right; +} + +/* dim non-primary columns */ +.c_punctuation, +.function_type, +.variable_type, +.property_type, +.signal_type, +.define_keyword, +.datatype_keyword, +.typedef_keyword, +.property_flags, +.signal_flags, +.parameter_annotations, +.enum_member_annotations, +.struct_member_annotations, +.union_member_annotations +{ + color: #888a85; +} + +.function_type a, +.function_type a:visited, +.function_type a:hover, +.property_type a, +.property_type a:visited, +.property_type a:hover, +.signal_type a, +.signal_type a:visited, +.signal_type a:hover, +.signal_flags a, +.signal_flags a:visited, +.signal_flags a:hover +{ + color: #729fcf; +} + +td p +{ + margin: 0.25em; +} + div.table table { border-collapse: collapse; @@ -154,14 +145,43 @@ background-color: #d3d7cf; } +h4 +{ + color: #555753; +} + hr { - /* tango:aluminium 3 */ - color: #babdb6; - background: #babdb6; + /* tango:aluminium 1 */ + color: #d3d7cf; + background: #d3d7cf; border: none 0px; height: 1px; clear: both; + margin: 2.0em 0em 2.0em 0em; +} + +dl.toc dt +{ + padding-bottom: 0.25em; +} + +dl.toc > dd > dl > dt +{ + padding-top: 0.25em; + padding-bottom: 0.25em; +} + +dl.toc > dt +{ + padding-top: 1em; + padding-bottom: 0.5em; + font-weight: bold; +} + +.parameter +{ + font-style: normal; } .footer @@ -173,31 +193,70 @@ font-size: 80%; } +.informalfigure, +.figure +{ + margin: 1em; +} + +.informalexample, +.example +{ + margin-top: 1em; + margin-bottom: 1em; +} + .warning { /* tango:orange 0/1 */ background: #ffeed9; + background: rgba(252, 175, 62, 0.1); border-color: #ffb04f; + border-color: rgba(252, 175, 62, 0.2); } .note { /* tango:chameleon 0/0.5 */ background: #d8ffb2; + background: rgba(138, 226, 52, 0.1); border-color: #abf562; + border-color: rgba(138, 226, 52, 0.2); +} +div.blockquote +{ + border-color: #eeeeec; } -.note, .warning +.note, .warning, div.blockquote { padding: 0.5em; border-width: 1px; border-style: solid; + margin: 2em; } -.note h3, .warning h3 +.note p, .warning p { - margin-top: 0.0em + margin: 0; } -.note p, .warning p + +div.warning h3.title, +div.note h3.title +{ + display: none; +} + +p + div.section { - margin-bottom: 0.0em + margin-top: 1em; +} + +div.refnamediv, +div.refsynopsisdiv, +div.refsect1, +div.refsect2, +div.toc, +div.section +{ + margin-bottom: 1em; } /* blob links */ @@ -210,33 +269,52 @@ font-weight: normal; } +.lineart +{ + color: #d3d7cf; + font-weight: normal; +} + .annotation { /* tango:aluminium 5 */ color: #555753; - font-size: 80%; font-weight: normal; } +.structfield +{ + font-style: normal; + font-weight: normal; +} + +acronym,abbr +{ + border-bottom: 1px dotted gray; +} + /* code listings */ -.listing_code .programlisting .cbracket { color: #a40000; } /* tango: scarlet red 3 */ -.listing_code .programlisting .comment { color: #a1a39d; } /* tango: aluminium 4 */ -.listing_code .programlisting .function { color: #000000; font-weight: bold; } -.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */ -.listing_code .programlisting .keyword { color: #4e9a06; } /* tango: chameleon 3 */ +.listing_code .programlisting .normal, +.listing_code .programlisting .normal a, +.listing_code .programlisting .number, +.listing_code .programlisting .cbracket, +.listing_code .programlisting .symbol { color: #555753; } +.listing_code .programlisting .comment, .listing_code .programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */ -.listing_code .programlisting .normal { color: #000000; } -.listing_code .programlisting .number { color: #75507b; } /* tango: plum 2 */ +.listing_code .programlisting .function, +.listing_code .programlisting .function a, .listing_code .programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */ -.listing_code .programlisting .string { color: #c17d11; } /* tango: chocolate 2 */ -.listing_code .programlisting .type { color: #000000; } -.listing_code .programlisting .type a { color: #11326b; } /* tango: sky blue 4 */ -.listing_code .programlisting .symbol { color: #ce5c00; } /* tango: orange 3 */ +.listing_code .programlisting .string { color: #ad7fa8; } /* tango: plum */ +.listing_code .programlisting .keyword, +.listing_code .programlisting .usertype, +.listing_code .programlisting .type, +.listing_code .programlisting .type a { color: #4e9a06; } /* tango: chameleon 3 */ .listing_frame { /* tango:sky blue 1 */ border: solid 1px #729fcf; + border: solid 1px rgba(114, 159, 207, 0.2); padding: 0px; } @@ -248,19 +326,151 @@ .listing_lines { /* tango:sky blue 0.5 */ background: #a6c5e3; + background: rgba(114, 159, 207, 0.2); /* tango:aluminium 6 */ color: #2e3436; } .listing_code { /* tango:sky blue 0 */ background: #e6f3ff; + background: rgba(114, 159, 207, 0.1); } .listing_code .programlisting { /* override from previous */ border: none 0px; padding: 0px; + background: none; } .listing_lines pre, .listing_code pre { margin: 0px; } +@media screen { + sup a.footnote + { + position: relative; + top: 0em ! important; + } + /* this is needed so that the local anchors are displayed below the naviagtion */ + div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] + { + display: inline-block; + position: relative; + top:-5em; + } + /* this seems to be a bug in the xsl style sheets when generating indexes */ + div.index div.index + { + top: 0em; + } + /* make space for the fixed navigation bar and add space at the bottom so that + * link targets appear somewhat close to top + */ + body + { + padding-top: 2.5em; + padding-bottom: 500px; + max-width: 60em; + } + p + { + max-width: 60em; + } + /* style and size the navigation bar */ + table.navigation#top + { + position: fixed; + background: #e2e2e2; + border-bottom: solid 1px #babdb6; + border-spacing: 5px; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + z-index: 10; + } + table.navigation#top td + { + padding-left: 6px; + padding-right: 6px; + } + .navigation a, .navigation a:visited + { + /* tango:sky blue 3 */ + color: #204a87; + } + .navigation a:hover + { + /* tango:sky blue 2 */ + color: #3465a4; + } + td.shortcuts + { + /* tango:sky blue 2 */ + color: #3465a4; + font-size: 80%; + white-space: nowrap; + } + td.shortcuts .dim + { + color: #babdb6; + } + .navigation .title + { + font-size: 80%; + max-width: none; + margin: 0px; + font-weight: normal; + } +} +@media screen and (min-width: 60em) { + /* screen larger than 60em */ + body { margin: auto; } +} +@media screen and (max-width: 60em) { + /* screen less than 60em */ + #nav_hierarchy { display: none; } + #nav_interfaces { display: none; } + #nav_prerequisites { display: none; } + #nav_derived_interfaces { display: none; } + #nav_implementations { display: none; } + #nav_child_properties { display: none; } + #nav_style_properties { display: none; } + #nav_index { display: none; } + #nav_glossary { display: none; } + .gallery_image { display: none; } + .property_flags { display: none; } + .signal_flags { display: none; } + .parameter_annotations { display: none; } + .enum_member_annotations { display: none; } + .struct_member_annotations { display: none; } + .union_member_annotations { display: none; } + /* now that a column is hidden, optimize space */ + col.parameters_name { width: auto; } + col.parameters_description { width: auto; } + col.struct_members_name { width: auto; } + col.struct_members_description { width: auto; } + col.enum_members_name { width: auto; } + col.enum_members_description { width: auto; } + col.union_members_name { width: auto; } + col.union_members_description { width: auto; } + .listing_lines { display: none; } +} +@media print { + table.navigation { + visibility: collapse; + display: none; + } + div.titlepage table.navigation { + visibility: visible; + display: table; + background: #e2e2e2; + border: solid 1px #babdb6; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + height: 3em; + } +} + Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna/html/up-insensitive.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna/html/up-insensitive.png differ Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna/html/up.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna/html/up.png differ diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/Makefile.am gupnp-dlna-0.10.3/doc/gupnp-dlna/Makefile.am --- gupnp-dlna-0.10.2/doc/gupnp-dlna/Makefile.am 2013-04-18 10:40:24.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/Makefile.am 2015-06-21 19:30:43.000000000 +0000 @@ -90,7 +90,7 @@ # signals and properties. # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES=-I$(top_srcdir) +GTKDOC_FLAGS=-I$(top_srcdir) GTKDOC_LIBS=$(top_builddir)/libgupnp-dlna/libgupnp-dlna-2.0.la # This includes the standard gtk-doc make rules, copied by gtkdocize. diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna/Makefile.in gupnp-dlna-0.10.3/doc/gupnp-dlna/Makefile.in --- gupnp-dlna-0.10.2/doc/gupnp-dlna/Makefile.in 2013-05-30 17:01:36.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna/Makefile.in 2015-06-30 22:53:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -21,23 +20,51 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,27 +83,43 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gtk-doc.make +DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am subdir = doc/gupnp-dlna ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -84,6 +127,7 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -130,6 +174,7 @@ GST_PBU_LEGACY_LIBS = @GST_PBU_LEGACY_LIBS@ GST_PBU_LIBS = @GST_PBU_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -189,6 +234,9 @@ STRIP = @STRIP@ VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -335,7 +383,7 @@ # signals and properties. # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES = -I$(top_srcdir) +GTKDOC_FLAGS = -I$(top_srcdir) GTKDOC_LIBS = $(top_builddir)/libgupnp-dlna/libgupnp-dlna-2.0.la @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -377,11 +425,11 @@ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test +@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp #### setup #### GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) @@ -459,11 +507,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -501,6 +549,7 @@ dist-hook check-am: all-am check: check-am +@ENABLE_GTK_DOC_FALSE@all-local: all-am: Makefile all-local installdirs: install: install-am @@ -605,22 +654,29 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local -@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_GTK_DOC_FALSE@all-local: +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @@ -631,14 +687,16 @@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ fi $(AM_V_at)touch setup-build.stamp -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @@ -727,6 +785,9 @@ clean-local: @rm -f *~ *.bak @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @@ -771,12 +832,14 @@ # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs -@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" -@ENABLE_GTK_DOC_FALSE@ @false +@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc: +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc is needed to run 'make dist'. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc was not found when 'configure' ran. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** please install gtk-doc and rerun 'configure'. ***" +@HAVE_GTK_DOC_FALSE@ @false -dist-hook: dist-check-gtkdoc dist-hook-local +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local @mkdir $(distdir)/html @cp ./html/* $(distdir)/html @-cp ./$(DOC_MODULE).pdf $(distdir)/ diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/annotation-glossary.html gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/annotation-glossary.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/annotation-glossary.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/annotation-glossary.html 2015-06-30 22:54:33.000000000 +0000 @@ -2,35 +2,31 @@ -Annotation Glossary - +GUPnP DLNA Gstreamer Reference Manual: Annotation Glossary + - + - - - - - - - - - - + + + + + + +
-

-Annotation Glossary

+

+Annotation Glossary

T

-
-transfer full
-

Free data after the code is done.

+
transfer full
+

Free data after the code is done.

- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/ch01.html gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/ch01.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/ch01.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/ch01.html 2015-06-30 22:54:33.000000000 +0000 @@ -2,30 +2,27 @@ -GUPnP DLNA Gstreamer - +GUPnP DLNA Gstreamer Reference Manual: GUPnP DLNA Gstreamer + - + - - - - - - - - - - + + + + + + +
-

-GUPnP DLNA Gstreamer

-
+

+GUPnP DLNA Gstreamer

+
gupnp-dlna-gst-utils

@@ -33,12 +30,12 @@

D

-gupnp_dlna_gst_utils_information_from_discoverer_info, function in gupnp-dlna-gst-utils +gupnp_dlna_gst_utils_information_from_discoverer_info, function in gupnp-dlna-gst-utils
- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/gupnp-dlna-gst.devhelp2 gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/gupnp-dlna-gst.devhelp2 --- gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/gupnp-dlna-gst.devhelp2 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/gupnp-dlna-gst.devhelp2 2015-06-30 22:54:33.000000000 +0000 @@ -8,6 +8,6 @@ - + diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/gupnp-dlna-gst-gupnp-dlna-gst-utils.html gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/gupnp-dlna-gst-gupnp-dlna-gst-utils.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/gupnp-dlna-gst-gupnp-dlna-gst-utils.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/gupnp-dlna-gst-gupnp-dlna-gst-utils.html 2015-06-30 22:54:33.000000000 +0000 @@ -2,30 +2,26 @@ -gupnp-dlna-gst-utils - +GUPnP DLNA Gstreamer Reference Manual: gupnp-dlna-gst-utils + - + - - - - - - - - - - + + + + + + +
@@ -33,50 +29,70 @@

gupnp-dlna-gst-utils

gupnp-dlna-gst-utils

- +
-
-

Synopsis

-
GUPnPDLNAInformation * gupnp_dlna_gst_utils_information_from_discoverer_info
-                                                        (GstDiscovererInfo *info);
-
+
+

Functions

+
++++ + + + + +
+GUPnPDLNAInformation * + +gupnp_dlna_gst_utils_information_from_discoverer_info () +

Description

-

Details

+

Functions

-

gupnp_dlna_gst_utils_information_from_discoverer_info ()

-
GUPnPDLNAInformation * gupnp_dlna_gst_utils_information_from_discoverer_info
-                                                        (GstDiscovererInfo *info);
-

-This utility function creates a GUPnPDLNAInformation from +

gupnp_dlna_gst_utils_information_from_discoverer_info ()

+
GUPnPDLNAInformation *
+gupnp_dlna_gst_utils_information_from_discoverer_info
+                               (GstDiscovererInfo *info);
+

This utility function creates a GUPnPDLNAInformation from GstDiscovererInfo. Its purpose is mainly to pass its result to -gupnp_dlna_profile_guesser_guess_profile_from_info() to avoid -rediscovering of a URI. Created GUPnPDLNAInformation takes a -reference on info. -

-
-- - - - - - - - - - +gupnp_dlna_profile_guesser_guess_profile_from_info() to avoid +rediscovering of a URI. Created GUPnPDLNAInformation takes a +reference on info +.

+
+

Parameters

+

info :

A GstDiscovererInfo object.

Returns :

A GUPnPDLNAInformation. Unref it when -done with it. [transfer full] -
+++++ + + + + +

info

A GstDiscovererInfo object.

 
+
+

Returns

+

A GUPnPDLNAInformation. Unref it when +done with it.

+

[transfer full]

+
+
+
+
+

Types and Values

- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21
\ No newline at end of file Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/home.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/home.png differ diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/index.html gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/index.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/index.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/index.html 2015-06-30 22:54:33.000000000 +0000 @@ -2,11 +2,11 @@ -GUPnP DLNA Gstreamer Reference Manual - +GUPnP DLNA Gstreamer Reference Manual: GUPnP DLNA Gstreamer Reference Manual + - + @@ -14,11 +14,11 @@
-

Version 0.10.2 +

Version 0.10.3

Copyright © 2013 Intel Corporation

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later @@ -42,7 +42,7 @@

-
+
GUPnP DLNA Gstreamer
gupnp-dlna-gst-utils @@ -52,6 +52,6 @@
- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/index.sgml gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/index.sgml --- gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/index.sgml 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/index.sgml 2015-06-30 22:54:33.000000000 +0000 @@ -1,6 +1,7 @@ - + - + + Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/left-insensitive.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/left-insensitive.png differ Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/left.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/left.png differ Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/right-insensitive.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/right-insensitive.png differ Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/right.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/right.png differ diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/style.css gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/style.css --- gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/style.css 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/style.css 2015-06-30 22:54:33.000000000 +0000 @@ -1,15 +1,23 @@ +body +{ + font-family: cantarell, sans-serif; +} .synopsis, .classsynopsis { /* tango:aluminium 1/2 */ background: #eeeeec; - border: solid 1px #d3d7cf; + background: rgba(238, 238, 236, 0.5); + border: solid 1px rgb(238, 238, 236); padding: 0.5em; } .programlisting { /* tango:sky blue 0/1 */ + /* fallback for no rgba support */ background: #e6f3ff; border: solid 1px #729fcf; + background: rgba(114, 159, 207, 0.1); + border: solid 1px rgba(114, 159, 207, 0.2); padding: 0.5em; } .variablelist @@ -22,89 +30,6 @@ vertical-align: top; } -@media screen { - sup a.footnote - { - position: relative; - top: 0em ! important; - - } - /* this is needed so that the local anchors are displayed below the naviagtion */ - div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] - { - display: inline-block; - position: relative; - top:-5em; - } - /* this seems to be a bug in the xsl style sheets when generating indexes */ - div.index div.index - { - top: 0em; - } - /* make space for the fixed navigation bar and add space at the bottom so that - * link targets appear somewhat close to top - */ - body - { - padding-top: 3.2em; - padding-bottom: 20em; - } - /* style and size the navigation bar */ - table.navigation#top - { - position: fixed; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; - margin-top: 0; - margin-bottom: 0; - top: 0; - left: 0; - height: 3em; - z-index: 10; - } - .navigation a, .navigation a:visited - { - /* tango:scarlet red 3 */ - color: #a40000; - } - .navigation a:hover - { - /* tango:scarlet red 1 */ - color: #ef2929; - } - td.shortcuts - { - /* tango:scarlet red 1 */ - color: #ef2929; - font-size: 80%; - white-space: nowrap; - } -} -@media print { - table.navigation { - visibility: collapse; - display: none; - } - div.titlepage table.navigation { - visibility: visible; - display: table; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; - margin-top: 0; - margin-bottom: 0; - top: 0; - left: 0; - height: 3em; - } -} - -.navigation .title -{ - font-size: 200%; -} - div.gallery-float { float: left; @@ -132,6 +57,72 @@ color: #729fcf; } +div.informaltable table +{ + border-collapse: separate; + border-spacing: 1em 0.5em; + border: none; +} + +div.informaltable table td, div.informaltable table th +{ + vertical-align: top; +} + +.function_type, +.variable_type, +.property_type, +.signal_type, +.parameter_name, +.struct_member_name, +.union_member_name, +.define_keyword, +.datatype_keyword, +.typedef_keyword +{ + text-align: right; +} + +/* dim non-primary columns */ +.c_punctuation, +.function_type, +.variable_type, +.property_type, +.signal_type, +.define_keyword, +.datatype_keyword, +.typedef_keyword, +.property_flags, +.signal_flags, +.parameter_annotations, +.enum_member_annotations, +.struct_member_annotations, +.union_member_annotations +{ + color: #888a85; +} + +.function_type a, +.function_type a:visited, +.function_type a:hover, +.property_type a, +.property_type a:visited, +.property_type a:hover, +.signal_type a, +.signal_type a:visited, +.signal_type a:hover, +.signal_flags a, +.signal_flags a:visited, +.signal_flags a:hover +{ + color: #729fcf; +} + +td p +{ + margin: 0.25em; +} + div.table table { border-collapse: collapse; @@ -154,14 +145,43 @@ background-color: #d3d7cf; } +h4 +{ + color: #555753; +} + hr { - /* tango:aluminium 3 */ - color: #babdb6; - background: #babdb6; + /* tango:aluminium 1 */ + color: #d3d7cf; + background: #d3d7cf; border: none 0px; height: 1px; clear: both; + margin: 2.0em 0em 2.0em 0em; +} + +dl.toc dt +{ + padding-bottom: 0.25em; +} + +dl.toc > dd > dl > dt +{ + padding-top: 0.25em; + padding-bottom: 0.25em; +} + +dl.toc > dt +{ + padding-top: 1em; + padding-bottom: 0.5em; + font-weight: bold; +} + +.parameter +{ + font-style: normal; } .footer @@ -173,31 +193,70 @@ font-size: 80%; } +.informalfigure, +.figure +{ + margin: 1em; +} + +.informalexample, +.example +{ + margin-top: 1em; + margin-bottom: 1em; +} + .warning { /* tango:orange 0/1 */ background: #ffeed9; + background: rgba(252, 175, 62, 0.1); border-color: #ffb04f; + border-color: rgba(252, 175, 62, 0.2); } .note { /* tango:chameleon 0/0.5 */ background: #d8ffb2; + background: rgba(138, 226, 52, 0.1); border-color: #abf562; + border-color: rgba(138, 226, 52, 0.2); +} +div.blockquote +{ + border-color: #eeeeec; } -.note, .warning +.note, .warning, div.blockquote { padding: 0.5em; border-width: 1px; border-style: solid; + margin: 2em; } -.note h3, .warning h3 +.note p, .warning p { - margin-top: 0.0em + margin: 0; } -.note p, .warning p + +div.warning h3.title, +div.note h3.title +{ + display: none; +} + +p + div.section { - margin-bottom: 0.0em + margin-top: 1em; +} + +div.refnamediv, +div.refsynopsisdiv, +div.refsect1, +div.refsect2, +div.toc, +div.section +{ + margin-bottom: 1em; } /* blob links */ @@ -210,33 +269,52 @@ font-weight: normal; } +.lineart +{ + color: #d3d7cf; + font-weight: normal; +} + .annotation { /* tango:aluminium 5 */ color: #555753; - font-size: 80%; font-weight: normal; } +.structfield +{ + font-style: normal; + font-weight: normal; +} + +acronym,abbr +{ + border-bottom: 1px dotted gray; +} + /* code listings */ -.listing_code .programlisting .cbracket { color: #a40000; } /* tango: scarlet red 3 */ -.listing_code .programlisting .comment { color: #a1a39d; } /* tango: aluminium 4 */ -.listing_code .programlisting .function { color: #000000; font-weight: bold; } -.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */ -.listing_code .programlisting .keyword { color: #4e9a06; } /* tango: chameleon 3 */ +.listing_code .programlisting .normal, +.listing_code .programlisting .normal a, +.listing_code .programlisting .number, +.listing_code .programlisting .cbracket, +.listing_code .programlisting .symbol { color: #555753; } +.listing_code .programlisting .comment, .listing_code .programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */ -.listing_code .programlisting .normal { color: #000000; } -.listing_code .programlisting .number { color: #75507b; } /* tango: plum 2 */ +.listing_code .programlisting .function, +.listing_code .programlisting .function a, .listing_code .programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */ -.listing_code .programlisting .string { color: #c17d11; } /* tango: chocolate 2 */ -.listing_code .programlisting .type { color: #000000; } -.listing_code .programlisting .type a { color: #11326b; } /* tango: sky blue 4 */ -.listing_code .programlisting .symbol { color: #ce5c00; } /* tango: orange 3 */ +.listing_code .programlisting .string { color: #ad7fa8; } /* tango: plum */ +.listing_code .programlisting .keyword, +.listing_code .programlisting .usertype, +.listing_code .programlisting .type, +.listing_code .programlisting .type a { color: #4e9a06; } /* tango: chameleon 3 */ .listing_frame { /* tango:sky blue 1 */ border: solid 1px #729fcf; + border: solid 1px rgba(114, 159, 207, 0.2); padding: 0px; } @@ -248,19 +326,151 @@ .listing_lines { /* tango:sky blue 0.5 */ background: #a6c5e3; + background: rgba(114, 159, 207, 0.2); /* tango:aluminium 6 */ color: #2e3436; } .listing_code { /* tango:sky blue 0 */ background: #e6f3ff; + background: rgba(114, 159, 207, 0.1); } .listing_code .programlisting { /* override from previous */ border: none 0px; padding: 0px; + background: none; } .listing_lines pre, .listing_code pre { margin: 0px; } +@media screen { + sup a.footnote + { + position: relative; + top: 0em ! important; + } + /* this is needed so that the local anchors are displayed below the naviagtion */ + div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] + { + display: inline-block; + position: relative; + top:-5em; + } + /* this seems to be a bug in the xsl style sheets when generating indexes */ + div.index div.index + { + top: 0em; + } + /* make space for the fixed navigation bar and add space at the bottom so that + * link targets appear somewhat close to top + */ + body + { + padding-top: 2.5em; + padding-bottom: 500px; + max-width: 60em; + } + p + { + max-width: 60em; + } + /* style and size the navigation bar */ + table.navigation#top + { + position: fixed; + background: #e2e2e2; + border-bottom: solid 1px #babdb6; + border-spacing: 5px; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + z-index: 10; + } + table.navigation#top td + { + padding-left: 6px; + padding-right: 6px; + } + .navigation a, .navigation a:visited + { + /* tango:sky blue 3 */ + color: #204a87; + } + .navigation a:hover + { + /* tango:sky blue 2 */ + color: #3465a4; + } + td.shortcuts + { + /* tango:sky blue 2 */ + color: #3465a4; + font-size: 80%; + white-space: nowrap; + } + td.shortcuts .dim + { + color: #babdb6; + } + .navigation .title + { + font-size: 80%; + max-width: none; + margin: 0px; + font-weight: normal; + } +} +@media screen and (min-width: 60em) { + /* screen larger than 60em */ + body { margin: auto; } +} +@media screen and (max-width: 60em) { + /* screen less than 60em */ + #nav_hierarchy { display: none; } + #nav_interfaces { display: none; } + #nav_prerequisites { display: none; } + #nav_derived_interfaces { display: none; } + #nav_implementations { display: none; } + #nav_child_properties { display: none; } + #nav_style_properties { display: none; } + #nav_index { display: none; } + #nav_glossary { display: none; } + .gallery_image { display: none; } + .property_flags { display: none; } + .signal_flags { display: none; } + .parameter_annotations { display: none; } + .enum_member_annotations { display: none; } + .struct_member_annotations { display: none; } + .union_member_annotations { display: none; } + /* now that a column is hidden, optimize space */ + col.parameters_name { width: auto; } + col.parameters_description { width: auto; } + col.struct_members_name { width: auto; } + col.struct_members_description { width: auto; } + col.enum_members_name { width: auto; } + col.enum_members_description { width: auto; } + col.union_members_name { width: auto; } + col.union_members_description { width: auto; } + .listing_lines { display: none; } +} +@media print { + table.navigation { + visibility: collapse; + display: none; + } + div.titlepage table.navigation { + visibility: visible; + display: table; + background: #e2e2e2; + border: solid 1px #babdb6; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + height: 3em; + } +} + Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/up-insensitive.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/up-insensitive.png differ Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/html/up.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/html/up.png differ diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/Makefile.am gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/Makefile.am --- gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/Makefile.am 2013-04-18 10:40:24.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/Makefile.am 2015-06-21 19:30:43.000000000 +0000 @@ -78,7 +78,7 @@ # signals and properties. # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES=-I$(top_srcdir) +GTKDOC_CFLAGS=-I$(top_srcdir) GTKDOC_LIBS= \ $(top_builddir)/libgupnp-dlna/libgupnp-dlna-2.0.la \ $(top_builddir)/libgupnp-dlna/metadata-backends/gstreamer/libgupnp-dlna-gst-2.0.la diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/Makefile.in gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/Makefile.in --- gupnp-dlna-0.10.2/doc/gupnp-dlna-gst/Makefile.in 2013-05-30 17:01:36.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-gst/Makefile.in 2015-06-30 22:53:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -21,23 +20,51 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,27 +83,43 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gtk-doc.make +DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am subdir = doc/gupnp-dlna-gst ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -84,6 +127,7 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -130,6 +174,7 @@ GST_PBU_LEGACY_LIBS = @GST_PBU_LEGACY_LIBS@ GST_PBU_LIBS = @GST_PBU_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -189,6 +234,9 @@ STRIP = @STRIP@ VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -323,7 +371,7 @@ # signals and properties. # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES = -I$(top_srcdir) +GTKDOC_CFLAGS = -I$(top_srcdir) GTKDOC_LIBS = \ $(top_builddir)/libgupnp-dlna/libgupnp-dlna-2.0.la \ $(top_builddir)/libgupnp-dlna/metadata-backends/gstreamer/libgupnp-dlna-gst-2.0.la @@ -368,11 +416,11 @@ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test +@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp #### setup #### GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) @@ -450,11 +498,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -492,6 +540,7 @@ dist-hook check-am: all-am check: check-am +@ENABLE_GTK_DOC_FALSE@all-local: all-am: Makefile all-local installdirs: install: install-am @@ -596,22 +645,29 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local -@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_GTK_DOC_FALSE@all-local: +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @@ -622,14 +678,16 @@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ fi $(AM_V_at)touch setup-build.stamp -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @@ -718,6 +776,9 @@ clean-local: @rm -f *~ *.bak @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @@ -762,12 +823,14 @@ # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs -@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" -@ENABLE_GTK_DOC_FALSE@ @false +@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc: +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc is needed to run 'make dist'. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc was not found when 'configure' ran. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** please install gtk-doc and rerun 'configure'. ***" +@HAVE_GTK_DOC_FALSE@ @false -dist-hook: dist-check-gtkdoc dist-hook-local +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local @mkdir $(distdir)/html @cp ./html/* $(distdir)/html @-cp ./$(DOC_MODULE).pdf $(distdir)/ diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/annotation-glossary.html gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/annotation-glossary.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/annotation-glossary.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/annotation-glossary.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,43 +2,36 @@ -Annotation Glossary - +GUPnP DLNA Reference Manual: Annotation Glossary + - + - - - - - - - - - - + + + + + + +
-

-Annotation Glossary

+

+Annotation Glossary

A

-
-allow-none
-

NULL is ok, both for passing and for returning.

+
allow-none
+

NULL is OK, both for passing and for returning.

T

-
-transfer none
-

Don't free data after the code is done.

+
transfer none
+

Don't free data after the code is done.

- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/ch01.html gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/ch01.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/ch01.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/ch01.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,30 +2,27 @@ -GUPnP DLNA Metadata - +GUPnP DLNA Reference Manual: GUPnP DLNA Metadata + - + - - - - - - - - - - + + + + + + +
-

-GUPnP DLNA Metadata

-
+

+GUPnP DLNA Metadata

+
GUPnPDLNAMetadataExtractor — Base class for extracting metadata for given media.
@@ -40,7 +37,7 @@
-GUPnPDLNAMetadataExtractor::done, object signal in GUPnPDLNAMetadataExtractor +GUPnPDLNAMetadataExtractor::done, object signal in GUPnPDLNAMetadataExtractor
@@ -48,20 +45,20 @@
-gupnp_dlna_metadata_extractor_emit_done, function in GUPnPDLNAMetadataExtractor +gupnp_dlna_metadata_extractor_emit_done, function in GUPnPDLNAMetadataExtractor
-gupnp_dlna_metadata_extractor_extract_async, function in GUPnPDLNAMetadataExtractor +gupnp_dlna_metadata_extractor_extract_async, function in GUPnPDLNAMetadataExtractor
-gupnp_dlna_metadata_extractor_extract_sync, function in GUPnPDLNAMetadataExtractor +gupnp_dlna_metadata_extractor_extract_sync, function in GUPnPDLNAMetadataExtractor
- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/gupnp-dlna-metadata.devhelp2 gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/gupnp-dlna-metadata.devhelp2 --- gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/gupnp-dlna-metadata.devhelp2 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/gupnp-dlna-metadata.devhelp2 2015-06-30 22:54:32.000000000 +0000 @@ -8,11 +8,11 @@ + + + - - - - + diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/GUPnPDLNAMetadataExtractor.html gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/GUPnPDLNAMetadataExtractor.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/GUPnPDLNAMetadataExtractor.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/GUPnPDLNAMetadataExtractor.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,34 +2,28 @@ -GUPnPDLNAMetadataExtractor - +GUPnP DLNA Reference Manual: GUPnPDLNAMetadataExtractor + - + - - - - - - - - - - + + + + + + +
@@ -38,292 +32,373 @@

GUPnPDLNAMetadataExtractor — Base class for extracting metadata for given media.

- +
-
-

Synopsis

-
                    GUPnPDLNAMetadataExtractor;
-                    GUPnPDLNAMetadataExtractorClass;
-gboolean            gupnp_dlna_metadata_extractor_extract_async
-                                                        (GUPnPDLNAMetadataExtractor *extractor,
-                                                         const gchar *uri,
-                                                         guint timeout_in_ms,
-                                                         GError **error);
-GUPnPDLNAInformation * gupnp_dlna_metadata_extractor_extract_sync
-                                                        (GUPnPDLNAMetadataExtractor *extractor,
-                                                         const gchar *uri,
-                                                         guint timeout_in_ms,
-                                                         GError **error);
-void                gupnp_dlna_metadata_extractor_emit_done
-                                                        (GUPnPDLNAMetadataExtractor *extractor,
-                                                         GUPnPDLNAInformation *info,
-                                                         GError *error);
-
-
-

Object Hierarchy

-
-  GObject
-   +----GUPnPDLNAMetadataExtractor
-
+

Functions

+
++++ + + + + + + + + + + + + + + +
+gboolean + +gupnp_dlna_metadata_extractor_extract_async () +
+GUPnPDLNAInformation * + +gupnp_dlna_metadata_extractor_extract_sync () +
+void + +gupnp_dlna_metadata_extractor_emit_done () +

Signals

-
-  "done"                                           : Run Last
+

+++++
+
+
+
+
+
+





voiddoneRun Last

+
+
+

Types and Values

+
++++ + + + + + + + + + + +
 GUPnPDLNAMetadataExtractor
 GUPnPDLNAMetadataExtractorClass
+
+
+

Object Hierarchy

+
    GObject
+    ╰── GUPnPDLNAMetadataExtractor

Description

-

-GUPnPDLNAMetadataExtractor is used by GUPnPDLNAProfileGuesser to +

GUPnPDLNAMetadataExtractor is used by GUPnPDLNAProfileGuesser to get needed metadata for profile matching. This class itself does not implement any metadata extraction features. For that it is -expected to provide a plugin which: -

-
-

Details

-
-

GUPnPDLNAMetadataExtractor

-
typedef struct _GUPnPDLNAMetadataExtractor GUPnPDLNAMetadataExtractor;
-

-The top-level object used to for metadata extraction. -

-
-
+

Functions

-

GUPnPDLNAMetadataExtractorClass

-
typedef struct {
-        GObjectClass parent_class;
-
-        /* virtuals */
-        gboolean
-        (* extract_async) (GUPnPDLNAMetadataExtractor  *extractor,
-                           const gchar                 *uri,
-                           guint                        timeout_in_ms,
-                           GError                     **error);
-
-        GUPnPDLNAInformation *
-        (* extract_sync) (GUPnPDLNAMetadataExtractor  *extractor,
-                          const gchar                 *uri,
-                          guint                        timeout_in_ms,
-                          GError                     **error);
-
-        gpointer _reserved[12];
-} GUPnPDLNAMetadataExtractorClass;
-
-
-+

gupnp_dlna_metadata_extractor_extract_async ()

+
gboolean
+gupnp_dlna_metadata_extractor_extract_async
+                               (GUPnPDLNAMetadataExtractor *extractor,
+                                const gchar *uri,
+                                guint timeout_in_ms,
+                                GError **error);
+

Queues uri + for metadata discovery. When discovery is completed, +the ::done signal is emitted on extractor +.

+
+

Parameters

+
+++++ - - + + + - - + + + - - + + + - - + + +

GObjectClass parent_class;

Parent class.

extractor

GUPnPDLNAMetadataExtractor object to use for discovery

 

extract_async ()

This is called by GUPnPDLNAProfileGuesser to get a -information about media file asynchronously.

uri

URI to gather metadata for

 

extract_sync ()

This is called by GUPnPDLNAProfileGuesser to get a -information about media file synchronously.

timeout_in_ms

Timeout in miliseconds.

 

gpointer _reserved[12];

Padding. Ignore it.

error

A GError.

 
+
+

Returns

+

TRUE if uri +was successfully queued, FALSE otherwise.

+

+
+
-

gupnp_dlna_metadata_extractor_extract_async ()

-
gboolean            gupnp_dlna_metadata_extractor_extract_async
-                                                        (GUPnPDLNAMetadataExtractor *extractor,
-                                                         const gchar *uri,
-                                                         guint timeout_in_ms,
-                                                         GError **error);
-

-Queues uri for metadata discovery. When discovery is completed, -the ::done signal is emitted on extractor. -

-
-+

gupnp_dlna_metadata_extractor_extract_sync ()

+
GUPnPDLNAInformation *
+gupnp_dlna_metadata_extractor_extract_sync
+                               (GUPnPDLNAMetadataExtractor *extractor,
+                                const gchar *uri,
+                                guint timeout_in_ms,
+                                GError **error);
+

Discovers synchronously metadata of given uri +.

+
+

Parameters

+
+++++ - - - - - - + + + - - + + + - - + + + - - + + +

extractor :

 -GUPnPDLNAMetadataExtractor object to use for discovery

uri :

URI to gather metadata for

extractor

GUPnPDLNAMetadataExtractor object to use for discovery

 

timeout_in_ms :

Timeout in miliseconds.

uri

URI to gather metadata for

 

error :

A GError.

timeout_in_ms

Timeout in miliseconds.

 

Returns :

 -TRUE if uri was successfully queued, FALSE otherwise.

error

A GError.

 
+
+

Returns

+

A GUPnPDLNAInformation object if discovery succeeded, +otherwise NULL.

+

+
+
-

gupnp_dlna_metadata_extractor_extract_sync ()

-
GUPnPDLNAInformation * gupnp_dlna_metadata_extractor_extract_sync
-                                                        (GUPnPDLNAMetadataExtractor *extractor,
-                                                         const gchar *uri,
-                                                         guint timeout_in_ms,
-                                                         GError **error);
-

-Discovers synchronously metadata of given uri. -

-
-+

gupnp_dlna_metadata_extractor_emit_done ()

+
void
+gupnp_dlna_metadata_extractor_emit_done
+                               (GUPnPDLNAMetadataExtractor *extractor,
+                                GUPnPDLNAInformation *info,
+                                GError *error);
+

Emits ::done signal. This function is intended to be used by +subclasses of GUPnPDLNAMetadataExtractor. It is required to always +pass a meaningful info +, even in case of error. That way a receiver +of this signal can know which URI discovery failed by using +gupnp_dlna_information_get_uri().

+
+

Parameters

+
+++++ - - - - - - + + + - - + + + - - - - - - + + +

extractor :

 -GUPnPDLNAMetadataExtractor object to use for discovery

uri :

URI to gather metadata for

extractor

A GUPnPDLNAMetadataExtractor object.

 

timeout_in_ms :

Timeout in miliseconds.

info

A GUPnPDLNAInformation about discovered URI.

[transfer none]

error :

A GError.

Returns :

A GUPnPDLNAInformation object if discovery succeeded, -otherwise NULL.

error

A GError.

[allow-none][transfer none]
+
+
+
+

Types and Values

+
+

GUPnPDLNAMetadataExtractor

+
typedef struct _GUPnPDLNAMetadataExtractor GUPnPDLNAMetadataExtractor;
+

The top-level object used to for metadata extraction.

+
-

gupnp_dlna_metadata_extractor_emit_done ()

-
void                gupnp_dlna_metadata_extractor_emit_done
-                                                        (GUPnPDLNAMetadataExtractor *extractor,
-                                                         GUPnPDLNAInformation *info,
-                                                         GError *error);
-

-Emits ::done signal. This function is intended to be used by -subclasses of GUPnPDLNAMetadataExtractor. It is required to always -pass a meaningful info, even in case of error. That way a receiver -of this signal can know which URI discovery failed by using -gupnp_dlna_information_get_uri(). -

-
-+

GUPnPDLNAMetadataExtractorClass

+
typedef struct {
+        GObjectClass parent_class;
+
+        /* virtuals */
+        gboolean
+        (* extract_async) (GUPnPDLNAMetadataExtractor  *extractor,
+                           const gchar                 *uri,
+                           guint                        timeout_in_ms,
+                           GError                     **error);
+
+        GUPnPDLNAInformation *
+        (* extract_sync) (GUPnPDLNAMetadataExtractor  *extractor,
+                          const gchar                 *uri,
+                          guint                        timeout_in_ms,
+                          GError                     **error);
+
+        gpointer _reserved[12];
+} GUPnPDLNAMetadataExtractorClass;
+
+
+

Members

+
+++++ - - + + + - - + + + - - + + + + + + + +

extractor :

A GUPnPDLNAMetadataExtractor object.

GObjectClass parent_class;

Parent class.

 

info :

A GUPnPDLNAInformation about discovered URI. [transfer none] -

extract_async ()

This is called by GUPnPDLNAProfileGuesser to get a +information about media file asynchronously.

 

error :

A GError. [allow-none][transfer none] -

extract_sync ()

This is called by GUPnPDLNAProfileGuesser to get a +information about media file synchronously.

 

gpointer _reserved[12];

Padding. Ignore it.

 
+

Signal Details

-

The "done" signal

-
void                user_function                      (GUPnPDLNAMetadataExtractor *extractor,
-                                                        GUPnPDLNAInformation       *info,
-                                                        GError                     *error,
-                                                        gpointer                    user_data)      : Run Last
-

-Will be emitted when all information on a URI could be -discovered. -

-
-+

The “done” signal

+
void
+user_function (GUPnPDLNAMetadataExtractor *extractor,
+               GUPnPDLNAInformation       *info,
+               GError                     *error,
+               gpointer                    user_data)
+

Will be emitted when all information on a URI could be +discovered.

+
+

Parameters

+
+++++ - - + + + - - + + + - - + + + - - + + +

extractor :

The GUPnPDLNAMetadataExtractor.

extractor

The GUPnPDLNAMetadataExtractor.

 

info :

The results as GUPnPDLNAInformation. [transfer none] -

info

The results as GUPnPDLNAInformation.

[transfer none]

error :

Contains details of -the error if discovery fails, otherwise is NULL. [allow-none][transfer none] -

error

Contains details of +the error if discovery fails, otherwise is NULL.

[allow-none][transfer none]

user_data :

user data set when the signal handler was connected.

user_data

user data set when the signal handler was connected.

 
+

Flags: Run Last

+
- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21 \ No newline at end of file Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/home.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/home.png differ diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/index.html gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/index.html --- gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/index.html 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/index.html 2015-06-30 22:54:32.000000000 +0000 @@ -2,11 +2,11 @@ -GUPnP DLNA Reference Manual - +GUPnP DLNA Reference Manual: GUPnP DLNA Reference Manual + - + @@ -14,11 +14,11 @@
-

Version 0.10.2 +

Version 0.10.3

Copyright © 2012 Intel Corporation

-

+

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later @@ -42,7 +42,7 @@

-
+
GUPnP DLNA Metadata
GUPnPDLNAMetadataExtractor — Base class for extracting metadata for given @@ -53,6 +53,6 @@
- Generated by GTK-Doc V1.18.1
+ Generated by GTK-Doc V1.21
\ No newline at end of file diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/index.sgml gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/index.sgml --- gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/index.sgml 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/index.sgml 2015-06-30 22:54:32.000000000 +0000 @@ -1,14 +1,16 @@ - - + + + - - - + + + + Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/left-insensitive.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/left-insensitive.png differ Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/left.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/left.png differ Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/right-insensitive.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/right-insensitive.png differ Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/right.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/right.png differ diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/style.css gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/style.css --- gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/style.css 2013-05-30 17:03:27.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/style.css 2015-06-30 22:54:32.000000000 +0000 @@ -1,15 +1,23 @@ +body +{ + font-family: cantarell, sans-serif; +} .synopsis, .classsynopsis { /* tango:aluminium 1/2 */ background: #eeeeec; - border: solid 1px #d3d7cf; + background: rgba(238, 238, 236, 0.5); + border: solid 1px rgb(238, 238, 236); padding: 0.5em; } .programlisting { /* tango:sky blue 0/1 */ + /* fallback for no rgba support */ background: #e6f3ff; border: solid 1px #729fcf; + background: rgba(114, 159, 207, 0.1); + border: solid 1px rgba(114, 159, 207, 0.2); padding: 0.5em; } .variablelist @@ -22,89 +30,6 @@ vertical-align: top; } -@media screen { - sup a.footnote - { - position: relative; - top: 0em ! important; - - } - /* this is needed so that the local anchors are displayed below the naviagtion */ - div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] - { - display: inline-block; - position: relative; - top:-5em; - } - /* this seems to be a bug in the xsl style sheets when generating indexes */ - div.index div.index - { - top: 0em; - } - /* make space for the fixed navigation bar and add space at the bottom so that - * link targets appear somewhat close to top - */ - body - { - padding-top: 3.2em; - padding-bottom: 20em; - } - /* style and size the navigation bar */ - table.navigation#top - { - position: fixed; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; - margin-top: 0; - margin-bottom: 0; - top: 0; - left: 0; - height: 3em; - z-index: 10; - } - .navigation a, .navigation a:visited - { - /* tango:scarlet red 3 */ - color: #a40000; - } - .navigation a:hover - { - /* tango:scarlet red 1 */ - color: #ef2929; - } - td.shortcuts - { - /* tango:scarlet red 1 */ - color: #ef2929; - font-size: 80%; - white-space: nowrap; - } -} -@media print { - table.navigation { - visibility: collapse; - display: none; - } - div.titlepage table.navigation { - visibility: visible; - display: table; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; - margin-top: 0; - margin-bottom: 0; - top: 0; - left: 0; - height: 3em; - } -} - -.navigation .title -{ - font-size: 200%; -} - div.gallery-float { float: left; @@ -132,6 +57,72 @@ color: #729fcf; } +div.informaltable table +{ + border-collapse: separate; + border-spacing: 1em 0.5em; + border: none; +} + +div.informaltable table td, div.informaltable table th +{ + vertical-align: top; +} + +.function_type, +.variable_type, +.property_type, +.signal_type, +.parameter_name, +.struct_member_name, +.union_member_name, +.define_keyword, +.datatype_keyword, +.typedef_keyword +{ + text-align: right; +} + +/* dim non-primary columns */ +.c_punctuation, +.function_type, +.variable_type, +.property_type, +.signal_type, +.define_keyword, +.datatype_keyword, +.typedef_keyword, +.property_flags, +.signal_flags, +.parameter_annotations, +.enum_member_annotations, +.struct_member_annotations, +.union_member_annotations +{ + color: #888a85; +} + +.function_type a, +.function_type a:visited, +.function_type a:hover, +.property_type a, +.property_type a:visited, +.property_type a:hover, +.signal_type a, +.signal_type a:visited, +.signal_type a:hover, +.signal_flags a, +.signal_flags a:visited, +.signal_flags a:hover +{ + color: #729fcf; +} + +td p +{ + margin: 0.25em; +} + div.table table { border-collapse: collapse; @@ -154,14 +145,43 @@ background-color: #d3d7cf; } +h4 +{ + color: #555753; +} + hr { - /* tango:aluminium 3 */ - color: #babdb6; - background: #babdb6; + /* tango:aluminium 1 */ + color: #d3d7cf; + background: #d3d7cf; border: none 0px; height: 1px; clear: both; + margin: 2.0em 0em 2.0em 0em; +} + +dl.toc dt +{ + padding-bottom: 0.25em; +} + +dl.toc > dd > dl > dt +{ + padding-top: 0.25em; + padding-bottom: 0.25em; +} + +dl.toc > dt +{ + padding-top: 1em; + padding-bottom: 0.5em; + font-weight: bold; +} + +.parameter +{ + font-style: normal; } .footer @@ -173,31 +193,70 @@ font-size: 80%; } +.informalfigure, +.figure +{ + margin: 1em; +} + +.informalexample, +.example +{ + margin-top: 1em; + margin-bottom: 1em; +} + .warning { /* tango:orange 0/1 */ background: #ffeed9; + background: rgba(252, 175, 62, 0.1); border-color: #ffb04f; + border-color: rgba(252, 175, 62, 0.2); } .note { /* tango:chameleon 0/0.5 */ background: #d8ffb2; + background: rgba(138, 226, 52, 0.1); border-color: #abf562; + border-color: rgba(138, 226, 52, 0.2); +} +div.blockquote +{ + border-color: #eeeeec; } -.note, .warning +.note, .warning, div.blockquote { padding: 0.5em; border-width: 1px; border-style: solid; + margin: 2em; } -.note h3, .warning h3 +.note p, .warning p { - margin-top: 0.0em + margin: 0; } -.note p, .warning p + +div.warning h3.title, +div.note h3.title +{ + display: none; +} + +p + div.section { - margin-bottom: 0.0em + margin-top: 1em; +} + +div.refnamediv, +div.refsynopsisdiv, +div.refsect1, +div.refsect2, +div.toc, +div.section +{ + margin-bottom: 1em; } /* blob links */ @@ -210,33 +269,52 @@ font-weight: normal; } +.lineart +{ + color: #d3d7cf; + font-weight: normal; +} + .annotation { /* tango:aluminium 5 */ color: #555753; - font-size: 80%; font-weight: normal; } +.structfield +{ + font-style: normal; + font-weight: normal; +} + +acronym,abbr +{ + border-bottom: 1px dotted gray; +} + /* code listings */ -.listing_code .programlisting .cbracket { color: #a40000; } /* tango: scarlet red 3 */ -.listing_code .programlisting .comment { color: #a1a39d; } /* tango: aluminium 4 */ -.listing_code .programlisting .function { color: #000000; font-weight: bold; } -.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */ -.listing_code .programlisting .keyword { color: #4e9a06; } /* tango: chameleon 3 */ +.listing_code .programlisting .normal, +.listing_code .programlisting .normal a, +.listing_code .programlisting .number, +.listing_code .programlisting .cbracket, +.listing_code .programlisting .symbol { color: #555753; } +.listing_code .programlisting .comment, .listing_code .programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */ -.listing_code .programlisting .normal { color: #000000; } -.listing_code .programlisting .number { color: #75507b; } /* tango: plum 2 */ +.listing_code .programlisting .function, +.listing_code .programlisting .function a, .listing_code .programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */ -.listing_code .programlisting .string { color: #c17d11; } /* tango: chocolate 2 */ -.listing_code .programlisting .type { color: #000000; } -.listing_code .programlisting .type a { color: #11326b; } /* tango: sky blue 4 */ -.listing_code .programlisting .symbol { color: #ce5c00; } /* tango: orange 3 */ +.listing_code .programlisting .string { color: #ad7fa8; } /* tango: plum */ +.listing_code .programlisting .keyword, +.listing_code .programlisting .usertype, +.listing_code .programlisting .type, +.listing_code .programlisting .type a { color: #4e9a06; } /* tango: chameleon 3 */ .listing_frame { /* tango:sky blue 1 */ border: solid 1px #729fcf; + border: solid 1px rgba(114, 159, 207, 0.2); padding: 0px; } @@ -248,19 +326,151 @@ .listing_lines { /* tango:sky blue 0.5 */ background: #a6c5e3; + background: rgba(114, 159, 207, 0.2); /* tango:aluminium 6 */ color: #2e3436; } .listing_code { /* tango:sky blue 0 */ background: #e6f3ff; + background: rgba(114, 159, 207, 0.1); } .listing_code .programlisting { /* override from previous */ border: none 0px; padding: 0px; + background: none; } .listing_lines pre, .listing_code pre { margin: 0px; } +@media screen { + sup a.footnote + { + position: relative; + top: 0em ! important; + } + /* this is needed so that the local anchors are displayed below the naviagtion */ + div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] + { + display: inline-block; + position: relative; + top:-5em; + } + /* this seems to be a bug in the xsl style sheets when generating indexes */ + div.index div.index + { + top: 0em; + } + /* make space for the fixed navigation bar and add space at the bottom so that + * link targets appear somewhat close to top + */ + body + { + padding-top: 2.5em; + padding-bottom: 500px; + max-width: 60em; + } + p + { + max-width: 60em; + } + /* style and size the navigation bar */ + table.navigation#top + { + position: fixed; + background: #e2e2e2; + border-bottom: solid 1px #babdb6; + border-spacing: 5px; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + z-index: 10; + } + table.navigation#top td + { + padding-left: 6px; + padding-right: 6px; + } + .navigation a, .navigation a:visited + { + /* tango:sky blue 3 */ + color: #204a87; + } + .navigation a:hover + { + /* tango:sky blue 2 */ + color: #3465a4; + } + td.shortcuts + { + /* tango:sky blue 2 */ + color: #3465a4; + font-size: 80%; + white-space: nowrap; + } + td.shortcuts .dim + { + color: #babdb6; + } + .navigation .title + { + font-size: 80%; + max-width: none; + margin: 0px; + font-weight: normal; + } +} +@media screen and (min-width: 60em) { + /* screen larger than 60em */ + body { margin: auto; } +} +@media screen and (max-width: 60em) { + /* screen less than 60em */ + #nav_hierarchy { display: none; } + #nav_interfaces { display: none; } + #nav_prerequisites { display: none; } + #nav_derived_interfaces { display: none; } + #nav_implementations { display: none; } + #nav_child_properties { display: none; } + #nav_style_properties { display: none; } + #nav_index { display: none; } + #nav_glossary { display: none; } + .gallery_image { display: none; } + .property_flags { display: none; } + .signal_flags { display: none; } + .parameter_annotations { display: none; } + .enum_member_annotations { display: none; } + .struct_member_annotations { display: none; } + .union_member_annotations { display: none; } + /* now that a column is hidden, optimize space */ + col.parameters_name { width: auto; } + col.parameters_description { width: auto; } + col.struct_members_name { width: auto; } + col.struct_members_description { width: auto; } + col.enum_members_name { width: auto; } + col.enum_members_description { width: auto; } + col.union_members_name { width: auto; } + col.union_members_description { width: auto; } + .listing_lines { display: none; } +} +@media print { + table.navigation { + visibility: collapse; + display: none; + } + div.titlepage table.navigation { + visibility: visible; + display: table; + background: #e2e2e2; + border: solid 1px #babdb6; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + height: 3em; + } +} + Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/up-insensitive.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/up-insensitive.png differ Binary files /tmp/imtqDbPfB7/gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/html/up.png and /tmp/fL7j0LDRtz/gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/html/up.png differ diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/Makefile.am gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/Makefile.am --- gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/Makefile.am 2013-04-18 10:40:24.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/Makefile.am 2015-06-21 19:30:43.000000000 +0000 @@ -78,7 +78,7 @@ # signals and properties. # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES=-I$(top_srcdir) +GTKDOC_CFLAGS=-I$(top_srcdir) GTKDOC_LIBS=$(top_builddir)/libgupnp-dlna/libgupnp-dlna-2.0.la # This includes the standard gtk-doc make rules, copied by gtkdocize. diff -Nru gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/Makefile.in gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/Makefile.in --- gupnp-dlna-0.10.2/doc/gupnp-dlna-metadata/Makefile.in 2013-05-30 17:01:36.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/gupnp-dlna-metadata/Makefile.in 2015-06-30 22:53:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -21,23 +20,51 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,27 +83,43 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/gtk-doc.make +DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am subdir = doc/gupnp-dlna-metadata ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -84,6 +127,7 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -130,6 +174,7 @@ GST_PBU_LEGACY_LIBS = @GST_PBU_LEGACY_LIBS@ GST_PBU_LIBS = @GST_PBU_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -189,6 +234,9 @@ STRIP = @STRIP@ VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -324,7 +372,7 @@ # signals and properties. # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -INCLUDES = -I$(top_srcdir) +GTKDOC_CFLAGS = -I$(top_srcdir) GTKDOC_LIBS = $(top_builddir)/libgupnp-dlna/libgupnp-dlna-2.0.la @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(GTKDOC_DEPS_CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -366,11 +414,11 @@ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test +@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp #### setup #### GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) @@ -448,11 +496,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -490,6 +538,7 @@ dist-hook check-am: all-am check: check-am +@ENABLE_GTK_DOC_FALSE@all-local: all-am: Makefile all-local installdirs: install: install-am @@ -594,22 +643,29 @@ .MAKE: install-am install-strip .PHONY: all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ + clean-libtool clean-local cscopelist-am ctags-am dist-hook \ + distclean distclean-generic distclean-libtool distclean-local \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-data-local \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-local -@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_GTK_DOC_FALSE@all-local: +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @@ -620,14 +676,16 @@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ fi $(AM_V_at)touch setup-build.stamp -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @@ -716,6 +774,9 @@ clean-local: @rm -f *~ *.bak @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @@ -760,12 +821,14 @@ # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs -@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" -@ENABLE_GTK_DOC_FALSE@ @false +@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc: +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc is needed to run 'make dist'. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc was not found when 'configure' ran. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** please install gtk-doc and rerun 'configure'. ***" +@HAVE_GTK_DOC_FALSE@ @false -dist-hook: dist-check-gtkdoc dist-hook-local +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local @mkdir $(distdir)/html @cp ./html/* $(distdir)/html @-cp ./$(DOC_MODULE).pdf $(distdir)/ diff -Nru gupnp-dlna-0.10.2/doc/Makefile.in gupnp-dlna-0.10.3/doc/Makefile.in --- gupnp-dlna-0.10.2/doc/Makefile.in 2013-05-30 17:01:36.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/Makefile.in 2015-06-30 22:53:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,35 +79,52 @@ host_triplet = @host@ @GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@am__append_1 = gupnp-dlna-gst subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/version.xml.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -88,9 +132,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -164,6 +228,7 @@ GST_PBU_LEGACY_LIBS = @GST_PBU_LEGACY_LIBS@ GST_PBU_LIBS = @GST_PBU_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -223,6 +288,9 @@ STRIP = @STRIP@ VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -322,22 +390,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -352,57 +423,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -418,12 +444,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -435,15 +456,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -452,6 +469,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -612,22 +644,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gupnp-dlna-0.10.2/doc/version.xml gupnp-dlna-0.10.3/doc/version.xml --- gupnp-dlna-0.10.2/doc/version.xml 2013-05-30 17:01:41.000000000 +0000 +++ gupnp-dlna-0.10.3/doc/version.xml 2015-06-30 22:53:51.000000000 +0000 @@ -1 +1 @@ -0.10.2 +0.10.3 diff -Nru gupnp-dlna-0.10.2/gtk-doc.make gupnp-dlna-0.10.3/gtk-doc.make --- gupnp-dlna-0.10.2/gtk-doc.make 2013-05-30 10:22:47.000000000 +0000 +++ gupnp-dlna-0.10.3/gtk-doc.make 2014-10-29 13:32:24.000000000 +0000 @@ -49,9 +49,13 @@ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test -if ENABLE_GTK_DOC if GTK_DOC_BUILD_HTML HTML_BUILD_STAMP=html-build.stamp else @@ -63,9 +67,11 @@ PDF_BUILD_STAMP= endif -all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -else -all-local: +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +if ENABLE_GTK_DOC +all-local: all-gtk-doc endif docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @@ -83,8 +89,10 @@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ fi @@ -101,7 +109,7 @@ GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @@ -212,6 +220,9 @@ clean-local: @rm -f *~ *.bak @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @@ -256,15 +267,17 @@ # # Require gtk-doc when making dist # -if ENABLE_GTK_DOC +if HAVE_GTK_DOC dist-check-gtkdoc: docs else dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" + @echo "*** gtk-doc is needed to run 'make dist'. ***" + @echo "*** gtk-doc was not found when 'configure' ran. ***" + @echo "*** please install gtk-doc and rerun 'configure'. ***" @false endif -dist-hook: dist-check-gtkdoc dist-hook-local +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local @mkdir $(distdir)/html @cp ./html/* $(distdir)/html @-cp ./$(DOC_MODULE).pdf $(distdir)/ diff -Nru gupnp-dlna-0.10.2/INSTALL gupnp-dlna-0.10.3/INSTALL --- gupnp-dlna-0.10.2/INSTALL 2013-05-30 17:01:37.000000000 +0000 +++ gupnp-dlna-0.10.3/INSTALL 2015-06-30 22:53:44.000000000 +0000 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -309,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -367,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff -Nru gupnp-dlna-0.10.2/libgupnp-dlna/gupnp-dlna-metadata-backend.c gupnp-dlna-0.10.3/libgupnp-dlna/gupnp-dlna-metadata-backend.c --- gupnp-dlna-0.10.2/libgupnp-dlna/gupnp-dlna-metadata-backend.c 2013-04-18 10:40:24.000000000 +0000 +++ gupnp-dlna-0.10.3/libgupnp-dlna/gupnp-dlna-metadata-backend.c 2015-06-28 18:46:18.000000000 +0000 @@ -45,7 +45,7 @@ GModule *module; gchar *module_path; gpointer get_default_extractor = NULL; - gsize loaded = 0; + gsize loaded = 1; if (!backend) backend = GUPNP_DLNA_DEFAULT_METADATA_BACKEND; @@ -82,7 +82,7 @@ metadata_backend.module = module; metadata_backend.get_default_extractor = get_default_extractor; module = NULL; - loaded = 1; + loaded = 2; fail: g_free (module_path); if (module) @@ -91,7 +91,7 @@ g_once_init_leave (&backend_chosen, loaded); } - return (backend_chosen != 0); + return (backend_chosen == 2); } GUPnPDLNAMetadataExtractor * diff -Nru gupnp-dlna-0.10.2/libgupnp-dlna/gupnp-dlna-profile-guesser.c gupnp-dlna-0.10.3/libgupnp-dlna/gupnp-dlna-profile-guesser.c --- gupnp-dlna-0.10.2/libgupnp-dlna/gupnp-dlna-profile-guesser.c 2013-04-18 10:40:24.000000000 +0000 +++ gupnp-dlna-0.10.3/libgupnp-dlna/gupnp-dlna-profile-guesser.c 2015-06-30 22:50:47.000000000 +0000 @@ -295,6 +295,8 @@ g_return_val_if_fail (error == NULL || *error == NULL, FALSE); extractor = gupnp_dlna_metadata_backend_get_extractor (); + g_return_val_if_fail (extractor != NULL, FALSE); + extractor_error = NULL; id = g_signal_connect_swapped (extractor, "done", @@ -348,6 +350,8 @@ extraction_error = NULL; extractor = gupnp_dlna_metadata_backend_get_extractor (); + g_return_val_if_fail (extractor != NULL, NULL); + info = gupnp_dlna_metadata_extractor_extract_sync (extractor, uri, timeout_in_ms, diff -Nru gupnp-dlna-0.10.2/libgupnp-dlna/gupnp-dlna-profile-loader.c gupnp-dlna-0.10.3/libgupnp-dlna/gupnp-dlna-profile-loader.c --- gupnp-dlna-0.10.2/libgupnp-dlna/gupnp-dlna-profile-loader.c 2013-04-18 10:40:24.000000000 +0000 +++ gupnp-dlna-0.10.3/libgupnp-dlna/gupnp-dlna-profile-loader.c 2015-06-30 22:50:47.000000000 +0000 @@ -99,6 +99,7 @@ GList *tags_stack; GList *dlna_profile_data_stack; GList *restriction_data_stack; + char *dlna_profile_dir; }; static GUPnPDLNANameValueListPair * @@ -376,6 +377,7 @@ target_list = &data->videos; break; + case GUPNP_DLNA_RESTRICTION_TYPE_INVALID: default: g_assert_not_reached (); } @@ -815,6 +817,7 @@ gupnp_dlna_profile_data_stack_free); g_clear_pointer (&priv->restriction_data_stack, gupnp_dlna_restriction_data_stack_free); + g_clear_pointer (&priv->dlna_profile_dir, g_free); G_OBJECT_CLASS (gupnp_dlna_profile_loader_parent_class)->dispose (object); @@ -1368,7 +1371,7 @@ xmlFree (path); if (!g_path_is_absolute (g_path)) { - gchar *tmp = g_build_filename (DLNA_DATA_DIR, + gchar *tmp = g_build_filename (loader->priv->dlna_profile_dir, g_path, NULL); g_free (g_path); @@ -1432,6 +1435,7 @@ xmlRelaxNGParserCtxtPtr rngp = NULL; xmlRelaxNGPtr rngs = NULL; GUPnPDLNAProfileLoaderPrivate *priv = loader->priv; + char *rng_path = NULL; if (g_hash_table_contains (priv->files_hash, path)) goto out; @@ -1443,9 +1447,12 @@ goto out; /* Load the schema for validation */ - rngp = xmlRelaxNGNewParserCtxt (DLNA_DATA_DIR - G_DIR_SEPARATOR_S - "dlna-profiles.rng"); + rng_path = g_build_filename (loader->priv->dlna_profile_dir, + "dlna-profiles.rng", + NULL); + rngp = xmlRelaxNGNewParserCtxt (rng_path); + g_free (rng_path); + if (!rngp) goto out; rngs = xmlRelaxNGParse (rngp); @@ -1500,11 +1507,13 @@ static GList * gupnp_dlna_profile_loader_get_from_dir (GUPnPDLNAProfileLoader *loader, - gchar *profile_dir) + const gchar *profile_dir) { GDir *dir; GList *profiles = NULL; + g_debug ("Loading DLNA profiles from %s", profile_dir); + if ((dir = g_dir_open (profile_dir, 0, NULL))) { const gchar *entry; @@ -1548,8 +1557,25 @@ g_return_val_if_fail (GUPNP_IS_DLNA_PROFILE_LOADER (loader), NULL); - profiles = gupnp_dlna_profile_loader_get_from_dir (loader, - DLNA_DATA_DIR); + if (loader->priv->dlna_profile_dir == NULL) { + char **env = NULL; + const char *profile_dir = NULL; + + env = g_get_environ (); + profile_dir = g_environ_getenv (env, "GUPNP_DLNA_PROFILE_DIR"); + if (profile_dir != NULL && g_path_is_absolute (profile_dir)) { + loader->priv->dlna_profile_dir = g_strdup (profile_dir); + } else { + loader->priv->dlna_profile_dir = g_strdup (DLNA_DATA_DIR); + } + + + g_strfreev (env); + } + + profiles = gupnp_dlna_profile_loader_get_from_dir + (loader, + loader->priv->dlna_profile_dir); profiles = g_list_reverse (profiles); diff -Nru gupnp-dlna-0.10.2/libgupnp-dlna/gupnp-dlna-value-list.c gupnp-dlna-0.10.3/libgupnp-dlna/gupnp-dlna-value-list.c --- gupnp-dlna-0.10.2/libgupnp-dlna/gupnp-dlna-value-list.c 2013-04-18 10:40:24.000000000 +0000 +++ gupnp-dlna-0.10.3/libgupnp-dlna/gupnp-dlna-value-list.c 2013-07-30 10:59:43.000000000 +0000 @@ -150,27 +150,26 @@ gupnp_dlna_value_list_copy (GUPnPDLNAValueList *list) { GUPnPDLNAValueList *dup; + GList *iter; - if (list) { - GList *iter; + g_return_val_if_fail (list != NULL, NULL); - dup = gupnp_dlna_value_list_new (list->type); - for (iter = list->values; iter != NULL; iter = iter->next) { - GUPnPDLNAValue *base = (GUPnPDLNAValue *) iter->data; - GUPnPDLNAValue *copy; - - if (base == NULL) - continue; - - copy = gupnp_dlna_value_copy (base, list->type); - if (copy != NULL) - dup->values = g_list_prepend (dup->values, - copy); - } - dup->values = g_list_reverse (dup->values); - } else { - dup = NULL; - } + dup = gupnp_dlna_value_list_new (list->type); + + g_return_val_if_fail (dup != NULL, NULL); + + for (iter = list->values; iter != NULL; iter = iter->next) { + GUPnPDLNAValue *base = (GUPnPDLNAValue *) iter->data; + GUPnPDLNAValue *copy; + + if (base == NULL) + continue; + + copy = gupnp_dlna_value_copy (base, list->type); + if (copy != NULL) + dup->values = g_list_prepend (dup->values, copy); + } + dup->values = g_list_reverse (dup->values); return dup; } diff -Nru gupnp-dlna-0.10.2/libgupnp-dlna/gupnp-dlna-value-list-private.h gupnp-dlna-0.10.3/libgupnp-dlna/gupnp-dlna-value-list-private.h --- gupnp-dlna-0.10.2/libgupnp-dlna/gupnp-dlna-value-list-private.h 2013-04-18 10:40:24.000000000 +0000 +++ gupnp-dlna-0.10.3/libgupnp-dlna/gupnp-dlna-value-list-private.h 2015-06-21 19:30:43.000000000 +0000 @@ -33,9 +33,6 @@ GUPnPDLNAValueList * gupnp_dlna_value_list_new (GUPnPDLNAValueType *type); -void -gupnp_dlna_value_list_free (GUPnPDLNAValueList *list); - gboolean gupnp_dlna_value_list_add_range (GUPnPDLNAValueList *list, const gchar *min, diff -Nru gupnp-dlna-0.10.2/libgupnp-dlna/Makefile.am gupnp-dlna-0.10.3/libgupnp-dlna/Makefile.am --- gupnp-dlna-0.10.2/libgupnp-dlna/Makefile.am 2013-04-18 10:40:24.000000000 +0000 +++ gupnp-dlna-0.10.3/libgupnp-dlna/Makefile.am 2015-06-21 19:30:43.000000000 +0000 @@ -85,6 +85,7 @@ $(metadata_cflags) \ $(common_cflags) \ $(LIBXML_CFLAGS) \ + $(WARN_CFLAGS) \ -DDATA_DIR='"$(shareddir)"' libguesser_la_SOURCES = \ @@ -95,7 +96,8 @@ libguesser_la_CFLAGS = \ $(guesser_log_cflags) \ $(metadata_cflags) \ - $(common_cflags) + $(common_cflags) \ + $(WARN_CFLAGS) libmetadata_la_SOURCES = \ gupnp-dlna-metadata-backend.c \ @@ -108,10 +110,13 @@ $(metadata_cflags) \ $(GUPNP_DLNA_METADATA_BACKEND_CFLAGS) \ $(common_cflags) \ - $(GMODULE_CFLAGS) + $(GMODULE_CFLAGS) \ + $(WARN_CFLAGS) +libmetadata_la_LDFLAGS = $(WARN_LDFLAGS) libgupnp_dlna_2_0_la_LDFLAGS = \ - $(gupnp_ldflags) + $(gupnp_ldflags) \ + $(WARN_LDFLAGS) libgupnp_dlna_2_0_la_SOURCES = \ gupnp-dlna-audio-information.c \ gupnp-dlna-container-information.c \ @@ -136,7 +141,8 @@ libgupnp_dlna_2_0_la_CFLAGS = \ $(general_log_cflags) \ $(metadata_cflags) \ - $(gupnp_cflags) + $(gupnp_cflags) \ + $(WARN_CFLAGS) libgupnp_dlna_inc_HEADERS += \ gupnp-dlna-profile-guesser.h \ @@ -215,7 +221,8 @@ GUPnPDLNA_2_0_gir_INCLUDES = GObject-2.0 GUPnPDLNA_2_0_gir_SCANNERFLAGS = \ --symbol-prefix=gupnp_dlna \ - --identifier-prefix=GUPnPDLNA + --identifier-prefix=GUPnPDLNA \ + $(WARN_SCANNERFLAGS) GUPnPDLNA_2_0_gir_CFLAGS = \ -I$(top_srcdir) @@ -233,7 +240,8 @@ GUPnPDLNAGst_2_0_gir_SCANNERFLAGS = \ --symbol-prefix=gupnp_dlna_gst \ --identifier-prefix=GUPnPDLNAGst \ - --add-include-path=. + --add-include-path=. \ + $(WARN_SCANNERFLAGS) GUPnPDLNAGst_2_0_gir_CFLAGS = \ -I$(top_srcdir) endif diff -Nru gupnp-dlna-0.10.2/libgupnp-dlna/Makefile.in gupnp-dlna-0.10.3/libgupnp-dlna/Makefile.in --- gupnp-dlna-0.10.2/libgupnp-dlna/Makefile.in 2013-05-30 17:01:36.000000000 +0000 +++ gupnp-dlna-0.10.3/libgupnp-dlna/Makefile.in 2015-06-30 22:53:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -18,23 +17,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,13 +80,15 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(am__dist_noinst_HEADERS_DIST) \ - $(am__libgupnp_dlna_inc_HEADERS_DIST) \ - $(libgupnp_dlna_metadata_inc_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/common.am \ - $(top_srcdir)/libgupnp-dlna/metadata-backends/gstreamer-legacy/gstreamer.am \ +DIST_COMMON = $(top_srcdir)/common.am \ + $(top_srcdir)/libgupnp-dlna/metadata/metadata.am \ $(top_srcdir)/libgupnp-dlna/metadata-backends/gstreamer/gstreamer.am \ - $(top_srcdir)/libgupnp-dlna/metadata/metadata.am + $(top_srcdir)/libgupnp-dlna/metadata-backends/gstreamer-legacy/gstreamer.am \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp \ + $(am__dist_noinst_HEADERS_DIST) \ + $(am__libgupnp_dlna_inc_HEADERS_DIST) \ + $(libgupnp_dlna_metadata_inc_HEADERS) @GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@am__append_1 = \ @GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@ $(gstreamer_metadata_backend) @@ -100,11 +129,21 @@ @HAVE_INTROSPECTION_TRUE@am__append_10 = $(girs) subdir = libgupnp-dlna ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -154,6 +193,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libguesser_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libguesser_la_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -198,8 +238,8 @@ libmetadata_la_OBJECTS = $(am_libmetadata_la_OBJECTS) libmetadata_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libmetadata_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \ - $@ + $(libmetadata_la_CFLAGS) $(CFLAGS) $(libmetadata_la_LDFLAGS) \ + $(LDFLAGS) -o $@ @GSTREAMER_LEGACY_METADATA_BACKEND_ENABLED_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_2) \ @GSTREAMER_LEGACY_METADATA_BACKEND_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \ @GSTREAMER_LEGACY_METADATA_BACKEND_ENABLED_TRUE@ $(am__DEPENDENCIES_1) \ @@ -294,6 +334,18 @@ $(LDFLAGS) -o $@ @GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@am_metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la_rpath = \ @GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@ -rpath $(libdir) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -306,20 +358,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libguesser_la_SOURCES) $(libgupnp_dlna_2_0_la_SOURCES) \ $(libloader_la_SOURCES) $(libmetadata_la_SOURCES) \ $(metadata_backends_gstreamer_legacy_libgstreamer_legacy_la_SOURCES) \ @@ -372,6 +420,23 @@ gupnp-dlna-information.h gupnp-dlna-values.h gupnp-dlna.h HEADERS = $(dist_noinst_HEADERS) $(libgupnp_dlna_inc_HEADERS) \ $(libgupnp_dlna_metadata_inc_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -420,6 +485,7 @@ GST_PBU_LEGACY_LIBS = @GST_PBU_LEGACY_LIBS@ GST_PBU_LIBS = @GST_PBU_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -479,6 +545,9 @@ STRIP = @STRIP@ VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -722,6 +791,7 @@ $(metadata_cflags) \ $(common_cflags) \ $(LIBXML_CFLAGS) \ + $(WARN_CFLAGS) \ -DDATA_DIR='"$(shareddir)"' libguesser_la_SOURCES = \ @@ -734,7 +804,8 @@ libguesser_la_CFLAGS = \ $(guesser_log_cflags) \ $(metadata_cflags) \ - $(common_cflags) + $(common_cflags) \ + $(WARN_CFLAGS) libmetadata_la_SOURCES = \ gupnp-dlna-metadata-backend.c \ @@ -749,10 +820,13 @@ $(metadata_cflags) \ $(GUPNP_DLNA_METADATA_BACKEND_CFLAGS) \ $(common_cflags) \ - $(GMODULE_CFLAGS) + $(GMODULE_CFLAGS) \ + $(WARN_CFLAGS) +libmetadata_la_LDFLAGS = $(WARN_LDFLAGS) libgupnp_dlna_2_0_la_LDFLAGS = \ - $(gupnp_ldflags) + $(gupnp_ldflags) \ + $(WARN_LDFLAGS) libgupnp_dlna_2_0_la_SOURCES = \ gupnp-dlna-audio-information.c \ @@ -780,7 +854,8 @@ libgupnp_dlna_2_0_la_CFLAGS = \ $(general_log_cflags) \ $(metadata_cflags) \ - $(gupnp_cflags) + $(gupnp_cflags) \ + $(WARN_CFLAGS) libgupnp_dlna_metadata_incdir = \ $(libgupnp_dlna_incdir)/metadata @@ -824,7 +899,8 @@ @HAVE_INTROSPECTION_TRUE@GUPnPDLNA_2_0_gir_INCLUDES = GObject-2.0 @HAVE_INTROSPECTION_TRUE@GUPnPDLNA_2_0_gir_SCANNERFLAGS = \ @HAVE_INTROSPECTION_TRUE@ --symbol-prefix=gupnp_dlna \ -@HAVE_INTROSPECTION_TRUE@ --identifier-prefix=GUPnPDLNA +@HAVE_INTROSPECTION_TRUE@ --identifier-prefix=GUPnPDLNA \ +@HAVE_INTROSPECTION_TRUE@ $(WARN_SCANNERFLAGS) @HAVE_INTROSPECTION_TRUE@GUPnPDLNA_2_0_gir_CFLAGS = \ @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) @@ -839,7 +915,8 @@ @GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@@HAVE_INTROSPECTION_TRUE@GUPnPDLNAGst_2_0_gir_SCANNERFLAGS = \ @GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@@HAVE_INTROSPECTION_TRUE@ --symbol-prefix=gupnp_dlna_gst \ @GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@@HAVE_INTROSPECTION_TRUE@ --identifier-prefix=GUPnPDLNAGst \ -@GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@@HAVE_INTROSPECTION_TRUE@ --add-include-path=. +@GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@@HAVE_INTROSPECTION_TRUE@ --add-include-path=. \ +@GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@@HAVE_INTROSPECTION_TRUE@ $(WARN_SCANNERFLAGS) @GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@@HAVE_INTROSPECTION_TRUE@GUPnPDLNAGst_2_0_gir_CFLAGS = \ @GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@@HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) @@ -884,6 +961,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -910,12 +988,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-metadataLTLIBRARIES: $(metadata_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(metadata_LTLIBRARIES)'; test -n "$(metadatadir)" || list=; \ @@ -942,21 +1023,26 @@ clean-metadataLTLIBRARIES: -test -z "$(metadata_LTLIBRARIES)" || rm -f $(metadata_LTLIBRARIES) - @list='$(metadata_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(metadata_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ @@ -983,16 +1069,21 @@ clean-pkglibLTLIBRARIES: -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(pkglib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libguesser.la: $(libguesser_la_OBJECTS) $(libguesser_la_DEPENDENCIES) $(EXTRA_libguesser_la_DEPENDENCIES) $(AM_V_CCLD)$(libguesser_la_LINK) $(libguesser_la_OBJECTS) $(libguesser_la_LIBADD) $(LIBS) + libgupnp-dlna-2.0.la: $(libgupnp_dlna_2_0_la_OBJECTS) $(libgupnp_dlna_2_0_la_DEPENDENCIES) $(EXTRA_libgupnp_dlna_2_0_la_DEPENDENCIES) $(AM_V_CCLD)$(libgupnp_dlna_2_0_la_LINK) -rpath $(libdir) $(libgupnp_dlna_2_0_la_OBJECTS) $(libgupnp_dlna_2_0_la_LIBADD) $(LIBS) + libloader.la: $(libloader_la_OBJECTS) $(libloader_la_DEPENDENCIES) $(EXTRA_libloader_la_DEPENDENCIES) $(AM_V_CCLD)$(libloader_la_LINK) $(libloader_la_OBJECTS) $(libloader_la_LIBADD) $(LIBS) metadata/$(am__dirstamp): @@ -1003,6 +1094,7 @@ @: > metadata/$(DEPDIR)/$(am__dirstamp) metadata/libmetadata_la-gupnp-dlna-metadata-extractor.lo: \ metadata/$(am__dirstamp) metadata/$(DEPDIR)/$(am__dirstamp) + libmetadata.la: $(libmetadata_la_OBJECTS) $(libmetadata_la_DEPENDENCIES) $(EXTRA_libmetadata_la_DEPENDENCIES) $(AM_V_CCLD)$(libmetadata_la_LINK) $(libmetadata_la_OBJECTS) $(libmetadata_la_LIBADD) $(LIBS) metadata-backends/gstreamer-legacy/$(am__dirstamp): @@ -1017,6 +1109,7 @@ metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgstreamer_legacy_la-gupnp-dlna-gst-metadata-extractor.lo: \ metadata-backends/gstreamer-legacy/$(am__dirstamp) \ metadata-backends/gstreamer-legacy/$(DEPDIR)/$(am__dirstamp) + metadata-backends/gstreamer-legacy/libgstreamer-legacy.la: $(metadata_backends_gstreamer_legacy_libgstreamer_legacy_la_OBJECTS) $(metadata_backends_gstreamer_legacy_libgstreamer_legacy_la_DEPENDENCIES) $(EXTRA_metadata_backends_gstreamer_legacy_libgstreamer_legacy_la_DEPENDENCIES) metadata-backends/gstreamer-legacy/$(am__dirstamp) $(AM_V_CCLD)$(metadata_backends_gstreamer_legacy_libgstreamer_legacy_la_LINK) $(am_metadata_backends_gstreamer_legacy_libgstreamer_legacy_la_rpath) $(metadata_backends_gstreamer_legacy_libgstreamer_legacy_la_OBJECTS) $(metadata_backends_gstreamer_legacy_libgstreamer_legacy_la_LIBADD) $(LIBS) metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-audio-information.lo: \ @@ -1040,6 +1133,7 @@ metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-video-information.lo: \ metadata-backends/gstreamer-legacy/$(am__dirstamp) \ metadata-backends/gstreamer-legacy/$(DEPDIR)/$(am__dirstamp) + metadata-backends/gstreamer-legacy/libgupnp-dlna-gst-legacy-2.0.la: $(metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la_OBJECTS) $(metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la_DEPENDENCIES) $(EXTRA_metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la_DEPENDENCIES) metadata-backends/gstreamer-legacy/$(am__dirstamp) $(AM_V_CCLD)$(metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la_LINK) $(am_metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la_rpath) $(metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la_OBJECTS) $(metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la_LIBADD) $(LIBS) metadata-backends/gstreamer/$(am__dirstamp): @@ -1054,6 +1148,7 @@ metadata-backends/gstreamer/metadata_backends_gstreamer_libgstreamer_la-gupnp-dlna-gst-metadata-extractor.lo: \ metadata-backends/gstreamer/$(am__dirstamp) \ metadata-backends/gstreamer/$(DEPDIR)/$(am__dirstamp) + metadata-backends/gstreamer/libgstreamer.la: $(metadata_backends_gstreamer_libgstreamer_la_OBJECTS) $(metadata_backends_gstreamer_libgstreamer_la_DEPENDENCIES) $(EXTRA_metadata_backends_gstreamer_libgstreamer_la_DEPENDENCIES) metadata-backends/gstreamer/$(am__dirstamp) $(AM_V_CCLD)$(metadata_backends_gstreamer_libgstreamer_la_LINK) $(am_metadata_backends_gstreamer_libgstreamer_la_rpath) $(metadata_backends_gstreamer_libgstreamer_la_OBJECTS) $(metadata_backends_gstreamer_libgstreamer_la_LIBADD) $(LIBS) metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-audio-information.lo: \ @@ -1077,49 +1172,18 @@ metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-video-information.lo: \ metadata-backends/gstreamer/$(am__dirstamp) \ metadata-backends/gstreamer/$(DEPDIR)/$(am__dirstamp) + metadata-backends/gstreamer/libgupnp-dlna-gst-2.0.la: $(metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la_OBJECTS) $(metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la_DEPENDENCIES) $(EXTRA_metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la_DEPENDENCIES) metadata-backends/gstreamer/$(am__dirstamp) $(AM_V_CCLD)$(metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la_LINK) $(am_metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la_rpath) $(metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la_OBJECTS) $(metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgstreamer_legacy_la-gupnp-dlna-gst-metadata-backend.$(OBJEXT) - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgstreamer_legacy_la-gupnp-dlna-gst-metadata-backend.lo - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgstreamer_legacy_la-gupnp-dlna-gst-metadata-extractor.$(OBJEXT) - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgstreamer_legacy_la-gupnp-dlna-gst-metadata-extractor.lo - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-audio-information.$(OBJEXT) - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-audio-information.lo - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-container-information.$(OBJEXT) - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-container-information.lo - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-image-information.$(OBJEXT) - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-image-information.lo - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-info-utils.$(OBJEXT) - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-info-utils.lo - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-information.$(OBJEXT) - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-information.lo - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-utils.$(OBJEXT) - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-utils.lo - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-video-information.$(OBJEXT) - -rm -f metadata-backends/gstreamer-legacy/metadata_backends_gstreamer_legacy_libgupnp_dlna_gst_legacy_2_0_la-gupnp-dlna-gst-video-information.lo - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgstreamer_la-gupnp-dlna-gst-metadata-backend.$(OBJEXT) - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgstreamer_la-gupnp-dlna-gst-metadata-backend.lo - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgstreamer_la-gupnp-dlna-gst-metadata-extractor.$(OBJEXT) - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgstreamer_la-gupnp-dlna-gst-metadata-extractor.lo - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-audio-information.$(OBJEXT) - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-audio-information.lo - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-container-information.$(OBJEXT) - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-container-information.lo - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-image-information.$(OBJEXT) - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-image-information.lo - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-info-utils.$(OBJEXT) - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-info-utils.lo - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-information.$(OBJEXT) - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-information.lo - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-utils.$(OBJEXT) - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-utils.lo - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-video-information.$(OBJEXT) - -rm -f metadata-backends/gstreamer/metadata_backends_gstreamer_libgupnp_dlna_gst_2_0_la-gupnp-dlna-gst-video-information.lo - -rm -f metadata/libmetadata_la-gupnp-dlna-metadata-extractor.$(OBJEXT) - -rm -f metadata/libmetadata_la-gupnp-dlna-metadata-extractor.lo + -rm -f metadata-backends/gstreamer-legacy/*.$(OBJEXT) + -rm -f metadata-backends/gstreamer-legacy/*.lo + -rm -f metadata-backends/gstreamer/*.$(OBJEXT) + -rm -f metadata-backends/gstreamer/*.lo + -rm -f metadata/*.$(OBJEXT) + -rm -f metadata/*.lo distclean-compile: -rm -f *.tab.c @@ -1546,26 +1610,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(libgupnp_dlna_metadata_incdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1577,15 +1630,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1594,6 +1643,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1752,10 +1816,10 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ clean-libLTLIBRARIES clean-libtool clean-metadataLTLIBRARIES \ - clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES ctags \ - distclean distclean-compile distclean-generic \ + clean-noinstLTLIBRARIES clean-pkglibLTLIBRARIES cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -1768,7 +1832,7 @@ install-strip install-typelibDATA installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-girDATA uninstall-libLTLIBRARIES \ uninstall-libgupnp_dlna_incHEADERS \ uninstall-libgupnp_dlna_metadata_incHEADERS \ diff -Nru gupnp-dlna-0.10.2/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-audio-information.c gupnp-dlna-0.10.3/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-audio-information.c --- gupnp-dlna-0.10.2/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-audio-information.c 2013-05-06 10:32:47.000000000 +0000 +++ gupnp-dlna-0.10.3/libgupnp-dlna/metadata-backends/gstreamer/gupnp-dlna-gst-audio-information.c 2015-06-21 19:32:08.000000000 +0000 @@ -73,6 +73,7 @@ adts_hack = (stream_count == g_list_length (iter)) && stream_count == 2; + gst_discoverer_stream_info_list_free (iter); for (iter = priv->stream_list; iter; iter = iter->next) { GstDiscovererStreamInfo *stream = diff -Nru gupnp-dlna-0.10.2/m4/ax_append_compile_flags.m4 gupnp-dlna-0.10.3/m4/ax_append_compile_flags.m4 --- gupnp-dlna-0.10.2/m4/ax_append_compile_flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ gupnp-dlna-0.10.3/m4/ax_append_compile_flags.m4 2015-06-21 19:30:43.000000000 +0000 @@ -0,0 +1,65 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS]) +# +# DESCRIPTION +# +# For every FLAG1, FLAG2 it is checked whether the compiler works with the +# flag. If it does, the flag is added FLAGS-VARIABLE +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. During the check the flag is always added to the +# current language's flags. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# NOTE: This macro depends on the AX_APPEND_FLAG and +# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with +# AX_APPEND_LINK_FLAGS. +# +# LICENSE +# +# Copyright (c) 2011 Maarten Bosmans +# +# 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 . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 4 + +AC_DEFUN([AX_APPEND_COMPILE_FLAGS], +[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) +AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +for flag in $1; do + AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3]) +done +])dnl AX_APPEND_COMPILE_FLAGS diff -Nru gupnp-dlna-0.10.2/m4/ax_append_flag.m4 gupnp-dlna-0.10.3/m4/ax_append_flag.m4 --- gupnp-dlna-0.10.2/m4/ax_append_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ gupnp-dlna-0.10.3/m4/ax_append_flag.m4 2015-06-21 19:30:43.000000000 +0000 @@ -0,0 +1,71 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) +# +# DESCRIPTION +# +# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space +# added in between. +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains +# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly +# FLAG. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# 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 . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AC_DEFUN([AX_APPEND_FLAG], +[dnl +AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF +AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])]) +AS_VAR_SET_IF(FLAGS,[ + AS_CASE([" AS_VAR_GET(FLAGS) "], + [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])], + [ + AS_VAR_APPEND(FLAGS," $1") + AC_RUN_LOG([: FLAGS="$FLAGS"]) + ]) + ], + [ + AS_VAR_SET(FLAGS,[$1]) + AC_RUN_LOG([: FLAGS="$FLAGS"]) + ]) +AS_VAR_POPDEF([FLAGS])dnl +])dnl AX_APPEND_FLAG diff -Nru gupnp-dlna-0.10.2/m4/ax_check_compile_flag.m4 gupnp-dlna-0.10.3/m4/ax_check_compile_flag.m4 --- gupnp-dlna-0.10.2/m4/ax_check_compile_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ gupnp-dlna-0.10.3/m4/ax_check_compile_flag.m4 2015-06-21 19:30:43.000000000 +0000 @@ -0,0 +1,74 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# 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 . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 4 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS diff -Nru gupnp-dlna-0.10.2/m4/ax_check_enable_debug.m4 gupnp-dlna-0.10.3/m4/ax_check_enable_debug.m4 --- gupnp-dlna-0.10.2/m4/ax_check_enable_debug.m4 1970-01-01 00:00:00.000000000 +0000 +++ gupnp-dlna-0.10.3/m4/ax_check_enable_debug.m4 2015-06-21 19:30:43.000000000 +0000 @@ -0,0 +1,113 @@ +# =========================================================================== +# http://autoconf-archive.cryp.to/ax_check_enable_debug.html +# =========================================================================== +# +# SYNOPSIS +# +# Check for the presence of an --enable-debug option to configure and +# allow/avoid compiled debugging flags appropriately. +# +# AX_CHECK_ENABLE_DEBUG([enable by default=yes/info/profile/no], +# [ENABLE DEBUG VARIABLES …], +# [DISABLE DEBUG VARIABLES NDEBUG …]) +# +# DESCRIPTION +# +# Check for the presence of an --enable-debug option to configure, with the +# specified default value used when the option is not present. Return the +# value in the variable $ax_enable_debug. +# +# Specifying 'yes' adds '-g -O0' to the compilation flags for all languages. +# Specifying 'info' adds '-g' to the compilation flags. Specifying 'profile' +# adds '-g -pg' to the compilation flags and '-pg' to the linking flags. +# Otherwise, nothing is added. +# +# Define the variables listed in the second argument if debug is enabled, +# defaulting to no variables. Defines the variables listed in the third +# argument if debug is disabled, defaulting to NDEBUG. All lists of +# variables should be space-separated. +# +# If debug is not enabled, ensure AC_PROG_* will not add debugging flags. +# Should be invoked prior to any AC_PROG_* compiler checks. +# +# LAST MODIFICATION +# +# 2014-05-12 +# +# COPYLEFT +# +# Copyright (c) 2011 Rhys Ulerich +# Copyright © 2014 Philip Withnall +# +# 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. + +AC_DEFUN([AX_CHECK_ENABLE_DEBUG],[ + AC_BEFORE([$0],[AC_PROG_CC])dnl + AC_BEFORE([$0],[AC_PROG_CXX])dnl + AC_BEFORE([$0],[AC_PROG_F77])dnl + AC_BEFORE([$0],[AC_PROG_FC])dnl + + AC_MSG_CHECKING(whether to enable debugging) + + m4_define(ax_enable_debug_default,[m4_tolower(m4_normalize(ifelse([$1],,[no],[$1])))]) + m4_define(ax_enable_debug_vars,[m4_normalize(ifelse([$2],,,[$2]))]) + m4_define(ax_disable_debug_vars,[m4_normalize(ifelse([$3],,[NDEBUG],[$3]))]) + + AC_ARG_ENABLE(debug, + [AS_HELP_STRING([--enable-debug]@<:@=ax_enable_debug_default@:>@,[compile with debugging; one of yes/info/profile/no])], + [],enable_debug=ax_enable_debug_default) + if test "x$enable_debug" = "xyes" || test "x$enable_debug" = "x"; then + AC_MSG_RESULT(yes) + CFLAGS="${CFLAGS} -g -O0" + CXXFLAGS="${CXXFLAGS} -g -O0" + FFLAGS="${FFLAGS} -g -O0" + FCFLAGS="${FCFLAGS} -g -O0" + OBJCFLAGS="${OBJCFLAGS} -g -O0" + + dnl Define various variables if debugging is enabled. + m4_map_args_w(ax_enable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is enabled])]) + else + if test "x$enable_debug" = "xinfo"; then + AC_MSG_RESULT(info) + CFLAGS="${CFLAGS} -g" + CXXFLAGS="${CXXFLAGS} -g" + FFLAGS="${FFLAGS} -g" + FCFLAGS="${FCFLAGS} -g" + OBJCFLAGS="${OBJCFLAGS} -g" + elif test "x$enable_debug" = "xprofile"; then + AC_MSG_RESULT(profile) + CFLAGS="${CFLAGS} -g -pg" + CXXFLAGS="${CXXFLAGS} -g -pg" + FFLAGS="${FFLAGS} -g -pg" + FCFLAGS="${FCFLAGS} -g -pg" + OBJCFLAGS="${OBJCFLAGS} -g -pg" + LDFLAGS="${LDFLAGS} -pg" + else + AC_MSG_RESULT(no) + dnl Ensure AC_PROG_CC/CXX/F77/FC/OBJC will not enable debug flags + dnl by setting any unset environment flag variables + if test "x${CFLAGS+set}" != "xset"; then + CFLAGS="" + fi + if test "x${CXXFLAGS+set}" != "xset"; then + CXXFLAGS="" + fi + if test "x${FFLAGS+set}" != "xset"; then + FFLAGS="" + fi + if test "x${FCFLAGS+set}" != "xset"; then + FCFLAGS="" + fi + if test "x${OBJCFLAGS+set}" != "xset"; then + OBJCFLAGS="" + fi + fi + + dnl Define various variables if debugging is disabled. + dnl assert.h is a NOP if NDEBUG is defined, so define it by default. + m4_map_args_w(ax_disable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is disabled])]) + fi + ax_enable_debug=$enable_debug +]) diff -Nru gupnp-dlna-0.10.2/m4/ax_compiler_flags_cflags.m4 gupnp-dlna-0.10.3/m4/ax_compiler_flags_cflags.m4 --- gupnp-dlna-0.10.2/m4/ax_compiler_flags_cflags.m4 1970-01-01 00:00:00.000000000 +0000 +++ gupnp-dlna-0.10.3/m4/ax_compiler_flags_cflags.m4 2015-06-21 19:30:43.000000000 +0000 @@ -0,0 +1,133 @@ +# ============================================================================ +# http://www.gnu.org/software/autoconf-archive/ax_compiler_flags_cflags.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS_CFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +# +# DESCRIPTION +# +# Add warning flags for the C compiler to VARIABLE, which defaults to +# WARN_CFLAGS. VARIABLE is AC_SUBST-ed by this macro, but must be +# manually added to the CFLAGS variable for each target in the code base. +# +# This macro depends on the environment set up by AX_COMPILER_FLAGS. +# Specifically, it uses the value of $ax_enable_compile_warnings to decide +# which flags to enable. +# +# LICENSE +# +# Copyright (c) 2014, 2015 Philip Withnall +# +# 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. This file is offered as-is, without any +# warranty. + +#serial 11 + +AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[ + AC_REQUIRE([AC_PROG_SED]) + AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS]) + AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) + AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) + + # Variable names + m4_define(ax_warn_cflags_variable, + [m4_normalize(ifelse([$1],,[WARN_CFLAGS],[$1]))]) + + AC_LANG_PUSH([C]) + + # Always pass -Werror=unknown-warning-option to get Clang to fail on bad + # flags, otherwise they are always appended to the warn_cflags variable, and + # Clang warns on them for every compilation unit. + # If this is passed to GCC, it will explode, so the flag must be enabled + # conditionally. + AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[ + ax_compiler_flags_test="-Werror=unknown-warning-option" + ],[ + ax_compiler_flags_test="" + ]) + + # Base flags + AX_APPEND_COMPILE_FLAGS([ dnl + -fno-strict-aliasing dnl + $3 dnl + ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) + + AS_IF([test "$ax_enable_compile_warnings" != "no"],[ + # "yes" flags + AX_APPEND_COMPILE_FLAGS([ dnl + -Wall dnl + -Wextra dnl + -Wundef dnl + -Wnested-externs dnl + -Wwrite-strings dnl + -Wpointer-arith dnl + -Wmissing-declarations dnl + -Wmissing-prototypes dnl + -Wstrict-prototypes dnl + -Wredundant-decls dnl + -Wno-unused-parameter dnl + -Wno-missing-field-initializers dnl + -Wdeclaration-after-statement dnl + -Wformat=2 dnl + -Wold-style-definition dnl + -Wcast-align dnl + -Wformat-nonliteral dnl + -Wformat-security dnl + -Wsign-compare dnl + -Wstrict-aliasing dnl + -Wshadow dnl + -Winline dnl + -Wpacked dnl + -Wmissing-format-attribute dnl + -Wmissing-noreturn dnl + -Winit-self dnl + -Wredundant-decls dnl + -Wmissing-include-dirs dnl + -Wunused-but-set-variable dnl + -Warray-bounds dnl + -Wimplicit-function-declaration dnl + -Wreturn-type dnl + -Wswitch-enum dnl + -Wswitch-default dnl + $4 dnl + $5 dnl + $6 dnl + $7 dnl + ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) + ]) + AS_IF([test "$ax_enable_compile_warnings" = "error"],[ + # "error" flags; -Werror has to be appended unconditionally because + # it's not possible to test for + # + # suggest-attribute=format is disabled because it gives too many false + # positives + AX_APPEND_FLAG([-Werror],ax_warn_cflags_variable) + + AX_APPEND_COMPILE_FLAGS([ dnl + -Wno-suggest-attribute=format dnl + ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) + ]) + + # In the flags below, when disabling specific flags, always add *both* + # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example) + # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall, + # which effectively turns that flag back on again as an error. + for flag in $ax_warn_cflags_variable; do + AS_CASE([$flag], + [-Wno-*=*],[], + [-Wno-*],[ + AX_APPEND_COMPILE_FLAGS([-Wno-error=$(AS_ECHO([$flag]) | $SED 's/^-Wno-//')], + ax_warn_cflags_variable, + [$ax_compiler_flags_test]) + ]) + done + + AC_LANG_POP([C]) + + # Substitute the variables + AC_SUBST(ax_warn_cflags_variable) +])dnl AX_COMPILER_FLAGS diff -Nru gupnp-dlna-0.10.2/m4/ax_compiler_flags_gir.m4 gupnp-dlna-0.10.3/m4/ax_compiler_flags_gir.m4 --- gupnp-dlna-0.10.2/m4/ax_compiler_flags_gir.m4 1970-01-01 00:00:00.000000000 +0000 +++ gupnp-dlna-0.10.3/m4/ax_compiler_flags_gir.m4 2015-06-21 19:30:43.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_compiler_flags_gir.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS_GIR([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +# +# DESCRIPTION +# +# Add warning flags for the g-ir-scanner (from GObject Introspection) to +# VARIABLE, which defaults to WARN_SCANNERFLAGS. VARIABLE is AC_SUBST-ed +# by this macro, but must be manually added to the SCANNERFLAGS variable +# for each GIR target in the code base. +# +# This macro depends on the environment set up by AX_COMPILER_FLAGS. +# Specifically, it uses the value of $ax_enable_compile_warnings to decide +# which flags to enable. +# +# LICENSE +# +# Copyright (c) 2015 Philip Withnall +# +# 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. This file is offered as-is, without any +# warranty. + +#serial 4 + +AC_DEFUN([AX_COMPILER_FLAGS_GIR],[ + AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) + + # Variable names + m4_define(ax_warn_scannerflags_variable, + [m4_normalize(ifelse([$1],,[WARN_SCANNERFLAGS],[$1]))]) + + # Base flags + AX_APPEND_FLAG([$3],ax_warn_scannerflags_variable) + + AS_IF([test "$ax_enable_compile_warnings" != "no"],[ + # "yes" flags + AX_APPEND_FLAG([ dnl + --warn-all dnl + $4 dnl + $5 dnl + $6 dnl + $7 dnl + ],ax_warn_scannerflags_variable) + ]) + AS_IF([test "$ax_enable_compile_warnings" = "error"],[ + # "error" flags + AX_APPEND_FLAG([ dnl + --warn-error dnl + ],ax_warn_scannerflags_variable) + ]) + + # Substitute the variables + AC_SUBST(ax_warn_scannerflags_variable) +])dnl AX_COMPILER_FLAGS diff -Nru gupnp-dlna-0.10.2/m4/ax_compiler_flags_ldflags.m4 gupnp-dlna-0.10.3/m4/ax_compiler_flags_ldflags.m4 --- gupnp-dlna-0.10.2/m4/ax_compiler_flags_ldflags.m4 1970-01-01 00:00:00.000000000 +0000 +++ gupnp-dlna-0.10.3/m4/ax_compiler_flags_ldflags.m4 2015-06-21 19:30:43.000000000 +0000 @@ -0,0 +1,75 @@ +# ============================================================================= +# http://www.gnu.org/software/autoconf-archive/ax_compiler_flags_ldflags.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS_LDFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +# +# DESCRIPTION +# +# Add warning flags for the linker to VARIABLE, which defaults to +# WARN_LDFLAGS. VARIABLE is AC_SUBST-ed by this macro, but must be +# manually added to the LDFLAGS variable for each target in the code base. +# +# This macro depends on the environment set up by AX_COMPILER_FLAGS. +# Specifically, it uses the value of $ax_enable_compile_warnings to decide +# which flags to enable. +# +# LICENSE +# +# Copyright (c) 2014, 2015 Philip Withnall +# +# 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. This file is offered as-is, without any +# warranty. + +#serial 4 + +AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[ + AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS]) + AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) + AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) + + # Variable names + m4_define(ax_warn_ldflags_variable, + [m4_normalize(ifelse([$1],,[WARN_LDFLAGS],[$1]))]) + + # Always pass -Werror=unknown-warning-option to get Clang to fail on bad + # flags, otherwise they are always appended to the warn_ldflags variable, + # and Clang warns on them for every compilation unit. + # If this is passed to GCC, it will explode, so the flag must be enabled + # conditionally. + AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[ + ax_compiler_flags_test="-Werror=unknown-warning-option" + ],[ + ax_compiler_flags_test="" + ]) + + # Base flags + AX_APPEND_COMPILE_FLAGS([ dnl + -Wl,--no-as-needed dnl + $3 dnl + ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) + + AS_IF([test "$ax_enable_compile_warnings" != "no"],[ + # "yes" flags + AX_APPEND_COMPILE_FLAGS([$4 $5 $6 $7], + ax_warn_ldflags_variable, + [$ax_compiler_flags_test]) + ]) + AS_IF([test "$ax_enable_compile_warnings" = "error"],[ + # "error" flags; -Werror has to be appended unconditionally because + # it's not possible to test for + # + # suggest-attribute=format is disabled because it gives too many false + # positives + AX_APPEND_COMPILE_FLAGS([ dnl + -Wl,--fatal-warnings dnl + ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) + ]) + + # Substitute the variables + AC_SUBST(ax_warn_ldflags_variable) +])dnl AX_COMPILER_FLAGS diff -Nru gupnp-dlna-0.10.2/m4/ax_compiler_flags.m4 gupnp-dlna-0.10.3/m4/ax_compiler_flags.m4 --- gupnp-dlna-0.10.2/m4/ax_compiler_flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ gupnp-dlna-0.10.3/m4/ax_compiler_flags.m4 2015-06-21 19:30:43.000000000 +0000 @@ -0,0 +1,158 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS([CFLAGS-VARIABLE], [LDFLAGS-VARIABLE], [IS-RELEASE], [EXTRA-BASE-CFLAGS], [EXTRA-YES-CFLAGS], [UNUSED], [UNUSED], [UNUSED], [EXTRA-BASE-LDFLAGS], [EXTRA-YES-LDFLAGS], [UNUSED], [UNUSED], [UNUSED]) +# +# DESCRIPTION +# +# Check for the presence of an --enable-compile-warnings option to +# configure, defaulting to "error" in normal operation, or "yes" if +# IS-RELEASE is equal to "yes". Return the value in the variable +# $ax_enable_compile_warnings. +# +# Depending on the value of --enable-compile-warnings, different compiler +# warnings are checked to see if they work with the current compiler and, +# if so, are appended to CFLAGS-VARIABLE and LDFLAGS-VARIABLE. This +# allows a consistent set of baseline compiler warnings to be used across +# a code base, irrespective of any warnings enabled locally by individual +# developers. By standardising the warnings used by all developers of a +# project, the project can commit to a zero-warnings policy, using -Werror +# to prevent compilation if new warnings are introduced. This makes +# catching bugs which are flagged by warnings a lot easier. +# +# By providing a consistent --enable-compile-warnings argument across all +# projects using this macro, continuous integration systems can easily be +# configured the same for all projects. Automated systems or build +# systems aimed at beginners may want to pass the --disable-Werror +# argument to unconditionally prevent warnings being fatal. +# +# --enable-compile-warnings can take the values: +# +# * no: Base compiler warnings only; not even -Wall. +# * yes: The above, plus a broad range of useful warnings. +# * error: The above, plus -Werror so that all warnings are fatal. +# Use --disable-Werror to override this and disable fatal +# warnings. +# +# The set of base and enabled flags can be augmented using the +# EXTRA-*-CFLAGS and EXTRA-*-LDFLAGS variables, which are tested and +# appended to the output variable if --enable-compile-warnings is not +# "no". Flags should not be disabled using these arguments, as the entire +# point of AX_COMPILER_FLAGS is to enforce a consistent set of useful +# compiler warnings on code, using warnings which have been chosen for low +# false positive rates. If a compiler emits false positives for a +# warning, a #pragma should be used in the code to disable the warning +# locally. See: +# +# https://gcc.gnu.org/onlinedocs/gcc-4.9.2/gcc/Diagnostic-Pragmas.html#Diagnostic-Pragmas +# +# The EXTRA-* variables should only be used to supply extra warning flags, +# and not general purpose compiler flags, as they are controlled by +# configure options such as --disable-Werror. +# +# IS-RELEASE can be used to disable -Werror when making a release, which +# is useful for those hairy moments when you just want to get the release +# done as quickly as possible. Set it to "yes" to disable -Werror. By +# default, it uses the value of $ax_is_release, so if you are using the +# AX_IS_RELEASE macro, there is no need to pass this parameter. For +# example: +# +# AX_IS_RELEASE([git-directory]) +# AX_COMPILER_FLAGS() +# +# CFLAGS-VARIABLE defaults to WARN_CFLAGS, and LDFLAGS-VARIABLE defaults +# to WARN_LDFLAGS. Both variables are AC_SUBST-ed by this macro, but must +# be manually added to the CFLAGS and LDFLAGS variables for each target in +# the code base. +# +# If C++ language support is enabled with AC_PROG_CXX, which must occur +# before this macro in configure.ac, warning flags for the C++ compiler +# are AC_SUBST-ed as WARN_CXXFLAGS, and must be manually added to the +# CXXFLAGS variables for each target in the code base. EXTRA-*-CFLAGS can +# be used to augment the base and enabled flags. +# +# Warning flags for g-ir-scanner (from GObject Introspection) are +# AC_SUBST-ed as WARN_SCANNERFLAGS. This variable must be manually added +# to the SCANNERFLAGS variable for each GIR target in the code base. If +# extra g-ir-scanner flags need to be enabled, the AX_COMPILER_FLAGS_GIR +# macro must be invoked manually. +# +# AX_COMPILER_FLAGS may add support for other tools in future, in addition +# to the compiler and linker. No extra EXTRA-* variables will be added +# for those tools, and all extra support will still use the single +# --enable-compile-warnings configure option. For finer grained control +# over the flags for individual tools, use AX_COMPILER_FLAGS_CFLAGS, +# AX_COMPILER_FLAGS_LDFLAGS and AX_COMPILER_FLAGS_* for new tools. +# +# The UNUSED variables date from a previous version of this macro, and are +# automatically appended to the preceding non-UNUSED variable. They should +# be left empty in new uses of the macro. +# +# LICENSE +# +# Copyright (c) 2014, 2015 Philip Withnall +# Copyright (c) 2015 David King +# +# 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. This file is offered as-is, without any +# warranty. + +#serial 13 + +# _AX_COMPILER_FLAGS_LANG([LANGNAME]) +m4_defun([_AX_COMPILER_FLAGS_LANG], +[m4_ifdef([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [], + [m4_define([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [])dnl + AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_]$1[FLAGS])])dnl +]) + +AC_DEFUN([AX_COMPILER_FLAGS],[ + # C support is enabled by default. + _AX_COMPILER_FLAGS_LANG([C]) + # Only enable C++ support if AC_PROG_CXX is called. The redefinition of + # AC_PROG_CXX is so that a fatal error is emitted if this macro is called + # before AC_PROG_CXX, which would otherwise cause no C++ warnings to be + # checked. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AX_COMPILER_FLAGS_LANG([CXX])], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AX_COMPILER_FLAGS_LANG([CXX])])]) + AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_LDFLAGS]) + + # Default value for IS-RELEASE is $ax_is_release + ax_compiler_flags_is_release=m4_tolower(m4_normalize(ifelse([$3],, + [$ax_is_release], + [$3]))) + + AC_ARG_ENABLE([compile-warnings], + AS_HELP_STRING([--enable-compile-warnings=@<:@no/yes/error@:>@], + [Enable compiler warnings and errors]),, + [AS_IF([test "$ax_compiler_flags_is_release" = "yes"], + [enable_compile_warnings="yes"], + [enable_compile_warnings="error"])]) + AC_ARG_ENABLE([Werror], + AS_HELP_STRING([--disable-Werror], + [Unconditionally make all compiler warnings non-fatal]),, + [enable_Werror=maybe]) + + # Return the user's chosen warning level + AS_IF([test "$enable_Werror" = "no" -a \ + "$enable_compile_warnings" = "error"],[ + enable_compile_warnings="yes" + ]) + + ax_enable_compile_warnings=$enable_compile_warnings + + AX_COMPILER_FLAGS_CFLAGS([$1],[$ax_compiler_flags_is_release], + [$4],[$5 $6 $7 $8]) + m4_ifdef([_AX_COMPILER_FLAGS_LANG_CXX_enabled], + [AX_COMPILER_FLAGS_CXXFLAGS([WARN_CXXFLAGS], + [$ax_compiler_flags_is_release], + [$4],[$5 $6 $7 $8])]) + AX_COMPILER_FLAGS_LDFLAGS([$2],[$ax_compiler_flags_is_release], + [$9],[$10 $11 $12 $13]) + AX_COMPILER_FLAGS_GIR([WARN_SCANNERFLAGS],[$ax_compiler_flags_is_release]) +])dnl AX_COMPILER_FLAGS diff -Nru gupnp-dlna-0.10.2/m4/ax_is_release.m4 gupnp-dlna-0.10.3/m4/ax_is_release.m4 --- gupnp-dlna-0.10.2/m4/ax_is_release.m4 1970-01-01 00:00:00.000000000 +0000 +++ gupnp-dlna-0.10.3/m4/ax_is_release.m4 2015-06-21 19:30:43.000000000 +0000 @@ -0,0 +1,69 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_is_release.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_IS_RELEASE(POLICY) +# +# DESCRIPTION +# +# Determine whether the code is being configured as a release, or from +# git. Set the ax_is_release variable to 'yes' or 'no'. +# +# If building a release version, it is recommended that the configure +# script disable compiler errors and debug features, by conditionalising +# them on the ax_is_release variable. If building from git, these +# features should be enabled. +# +# The POLICY parameter specifies how ax_is_release is determined. It can +# take the following values: +# +# * git-directory: ax_is_release will be 'no' if a '.git' directory exists +# * minor-version: ax_is_release will be 'no' if the minor version number +# in $PACKAGE_VERSION is odd; this assumes +# $PACKAGE_VERSION follows the 'major.minor.micro' scheme +# * micro-version: ax_is_release will be 'no' if the micro version number +# in $PACKAGE_VERSION is odd; this assumes +# $PACKAGE_VERSION follows the 'major.minor.micro' scheme +# * always: ax_is_release will always be 'yes' +# * never: ax_is_release will always be 'no' +# +# Other policies may be added in future. +# +# LICENSE +# +# Copyright (c) 2015 Philip Withnall +# +# 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. + +#serial 3 + +AC_DEFUN([AX_IS_RELEASE],[ + AC_BEFORE([AC_INIT],[$0]) + + m4_case([$1], + [git-directory],[ + # $is_release = (.git directory does not exist) + AS_IF([test -d .git],[ax_is_release=no],[ax_is_release=yes]) + ], + [minor-version],[ + # $is_release = ($minor_version is even) + minor_version=`echo "$PACKAGE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'` + AS_IF([test "$(( $minor_version % 2 ))" -ne 0], + [ax_is_release=no],[ax_is_release=yes]) + ], + [micro-version],[ + # $is_release = ($micro_version is even) + micro_version=`echo "$PACKAGE_VERSION" | sed 's/[[^.]]*\.[[^.]]*\.\([[^.]]*\).*/\1/'` + AS_IF([test "$(( $micro_version % 2 ))" -ne 0], + [ax_is_release=no],[ax_is_release=yes]) + ], + [always],[ax_is_release=yes], + [never],[ax_is_release=no], + [ + AC_MSG_ERROR([Invalid policy. Valid policies: git-directory, minor-version.]) + ]) +]) diff -Nru gupnp-dlna-0.10.2/m4/ax_require_defined.m4 gupnp-dlna-0.10.3/m4/ax_require_defined.m4 --- gupnp-dlna-0.10.2/m4/ax_require_defined.m4 1970-01-01 00:00:00.000000000 +0000 +++ gupnp-dlna-0.10.3/m4/ax_require_defined.m4 2015-06-21 19:30:43.000000000 +0000 @@ -0,0 +1,37 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_REQUIRE_DEFINED(MACRO) +# +# DESCRIPTION +# +# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have +# been defined and thus are available for use. This avoids random issues +# where a macro isn't expanded. Instead the configure script emits a +# non-fatal: +# +# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found +# +# It's like AC_REQUIRE except it doesn't expand the required macro. +# +# Here's an example: +# +# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +# +# LICENSE +# +# Copyright (c) 2014 Mike Frysinger +# +# 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. This file is offered as-is, without any +# warranty. + +#serial 1 + +AC_DEFUN([AX_REQUIRE_DEFINED], [dnl + m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) +])dnl AX_REQUIRE_DEFINED diff -Nru gupnp-dlna-0.10.2/m4/gtk-doc.m4 gupnp-dlna-0.10.3/m4/gtk-doc.m4 --- gupnp-dlna-0.10.2/m4/gtk-doc.m4 2013-05-30 10:22:47.000000000 +0000 +++ gupnp-dlna-0.10.3/m4/gtk-doc.m4 2014-10-29 13:32:24.000000000 +0000 @@ -1,6 +1,6 @@ dnl -*- mode: autoconf -*- -# serial 1 +# serial 2 dnl Usage: dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) @@ -10,8 +10,24 @@ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) + AC_MSG_CHECKING([for gtk-doc]) + PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) + AC_MSG_RESULT($have_gtk_doc) + + if test "$have_gtk_doc" = "no"; then + AC_MSG_WARN([ + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found.]) + fi + dnl check for tools we added during development - AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that + dnl may not be writable by the user. Currently, automake requires that the + dnl test name must end in '.test'. + dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 + AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) + AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) @@ -28,22 +44,22 @@ [use gtk-doc to build documentation [[default=no]]]),, [enable_gtk_doc=no]) - if test x$enable_gtk_doc = xyes; then - ifelse([$1],[], - [PKG_CHECK_EXISTS([gtk-doc],, - AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], - [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) - dnl don't check for glib if we build glib - if test "x$PACKAGE_NAME" != "xglib"; then - dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) - fi - fi - AC_MSG_CHECKING([whether to build gtk-doc documentation]) AC_MSG_RESULT($enable_gtk_doc) + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + AC_MSG_ERROR([ + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '[$]0'.]) + fi + + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) + fi + dnl enable/disable output formats AC_ARG_ENABLE([gtk-doc-html], AS_HELP_STRING([--enable-gtk-doc-html], @@ -63,6 +79,7 @@ fi AC_SUBST([AM_DEFAULT_VERBOSITY]) + AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) diff -Nru gupnp-dlna-0.10.2/m4/libtool.m4 gupnp-dlna-0.10.3/m4/libtool.m4 --- gupnp-dlna-0.10.2/m4/libtool.m4 2013-05-30 17:01:31.000000000 +0000 +++ gupnp-dlna-0.10.3/m4/libtool.m4 2015-06-30 22:53:37.000000000 +0000 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1333,7 +1333,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1352,7 +1355,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -Nru gupnp-dlna-0.10.2/Makefile.in gupnp-dlna-0.10.3/Makefile.in --- gupnp-dlna-0.10.2/Makefile.in 2013-05-30 17:01:37.000000000 +0000 +++ gupnp-dlna-0.10.3/Makefile.in 2015-06-30 22:53:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,22 +81,37 @@ @GSTREAMER_METADATA_BACKEND_ENABLED_TRUE@am__append_1 = gupnp-dlna-gst-2.0.pc @GSTREAMER_LEGACY_METADATA_BACKEND_ENABLED_TRUE@am__append_2 = gupnp-dlna-gst-legacy-2.0.pc subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/gupnp-dlna-2.0.pc.in \ - $(srcdir)/gupnp-dlna-gst-2.0.pc.in \ - $(srcdir)/gupnp-dlna-gst-legacy-2.0.pc.in \ +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in $(srcdir)/gupnp-dlna-2.0.pc.in \ $(srcdir)/gupnp-dlna-metadata-2.0.pc.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO 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 + $(srcdir)/gupnp-dlna-gst-2.0.pc.in \ + $(srcdir)/gupnp-dlna-gst-legacy-2.0.pc.in COPYING TODO \ + build-aux/compile build-aux/config.guess build-aux/config.sub \ + 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 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -79,21 +121,28 @@ CONFIG_CLEAN_FILES = gupnp-dlna-2.0.pc gupnp-dlna-metadata-2.0.pc \ gupnp-dlna-gst-2.0.pc gupnp-dlna-gst-legacy-2.0.pc CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -130,11 +179,33 @@ DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -145,6 +216,7 @@ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -172,6 +244,7 @@ reldir="$$dir2" GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.xz +DIST_TARGETS = dist-xz distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -221,6 +294,7 @@ GST_PBU_LEGACY_LIBS = @GST_PBU_LEGACY_LIBS@ GST_PBU_LIBS = @GST_PBU_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -280,6 +354,9 @@ STRIP = @STRIP@ VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -382,8 +459,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -435,22 +512,25 @@ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -465,57 +545,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -531,12 +566,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -548,15 +578,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -565,9 +591,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -638,39 +686,41 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives 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__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @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 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -681,8 +731,6 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -694,18 +742,19 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(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 --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -728,7 +777,7 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -867,25 +916,25 @@ uninstall-am: uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-pkgconfigDATA \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-pkgconfigDATA +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkgconfigDATA dist-hook: diff -Nru gupnp-dlna-0.10.2/NEWS gupnp-dlna-0.10.3/NEWS --- gupnp-dlna-0.10.2/NEWS 2013-05-30 17:01:11.000000000 +0000 +++ gupnp-dlna-0.10.3/NEWS 2015-06-30 22:52:23.000000000 +0000 @@ -1,3 +1,29 @@ +0.10.3 +====== +- Fix potential crash if gupnp_dlna_value_list_new failed. +- Fix hang if no meta-data back-end is available. +- Remove use of gnome-common, add compiler warnings and fix const + correctness. +- Fix memory leak in gst-audio-information. +- Fix unit tests for new automake +- Make it possible to override the DLNA profile dir using + GUPNP_DLNA_PROFILE_DIR environment variable +- Fix discoverer testsuite to run completely uninstalled. +- Fix gupnp-dlna-info -a to be stuck if profile guesser does not work. + +Bugs fixed in this release: + - https://bugzilla.gnome.org/show_bug.cgi?id=704096 + - https://bugzilla.gnome.org/show_bug.cgi?id=707909 + - https://bugzilla.gnome.org/show_bug.cgi?id=750929 + - https://bugzilla.gnome.org/show_bug.cgi?id=751295 + - https://bugzilla.gnome.org/show_bug.cgi?id=751634 + +All contributors to this release: + - Jens Georg + - Philip Withnall + - Mark Ryan + - Ludovic Ferrandis + 0.10.2 ====== - Fix vapi generation with GObject-introspection >= 1.36. diff -Nru gupnp-dlna-0.10.2/tests/Makefile.am gupnp-dlna-0.10.3/tests/Makefile.am --- gupnp-dlna-0.10.2/tests/Makefile.am 2013-04-18 11:20:27.000000000 +0000 +++ gupnp-dlna-0.10.3/tests/Makefile.am 2015-06-30 22:50:47.000000000 +0000 @@ -1,9 +1,12 @@ -TESTS_ENVIRONMENT = \ - G_SLICE=debug-blocks \ +AM_TESTS_ENVIRONMENT = \ + export G_SLICE=debug-blocks \ LD_LIBRARY_PATH=$(top_builddir)/libgupnp-dlna/.libs:$(LD_LIBRARY_PATH) \ - MEDIA_DIR="$(srcdir)/media" FILE_LIST="$(srcdir)/media/media-list.txt" ${SHELL} + MEDIA_DIR="$(srcdir)/media" FILE_LIST="$(srcdir)/media/media-list.txt" \ + GUPNP_DLNA_PROFILE_DIR=$(abs_top_srcdir)/data \ + GUPNP_DLNA_METADATA_BACKEND_DIR=$(top_builddir)/libgupnp-dlna/metadata-backends/gstreamer/.libs; TESTS = $(check_PROGRAMS) test-discoverer.sh +check_SCRIPTS = test-discoverer.sh check_PROGRAMS = sets sets_SOURCES = \ @@ -14,12 +17,12 @@ $(LIBXML_LIBS) \ $(GMODULE_LIBS) \ $(top_builddir)/libgupnp-dlna/libgupnp-dlna-2.0.la +sets_LDFLAGS = $(WARN_LDFLAGS) sets_CFLAGS = \ $(GLIB_CFLAGS) \ $(GOBJECT_CFLAGS) \ $(LIBXML_CFLAGS) \ $(GMODULE_CFLAGS) \ + $(WARN_CFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/libgupnp-dlna \ - -I$(top_srcdir)/libgupnp-dlna/profile-backends/native \ - -I$(top_srcdir)/libgupnp-dlna/profile-backends/native/sets + -I$(top_srcdir)/libgupnp-dlna diff -Nru gupnp-dlna-0.10.2/tests/Makefile.in gupnp-dlna-0.10.3/tests/Makefile.in --- gupnp-dlna-0.10.2/tests/Makefile.in 2013-05-30 17:01:36.000000000 +0000 +++ gupnp-dlna-0.10.3/tests/Makefile.in 2015-06-30 22:53:44.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,14 +79,26 @@ host_triplet = @host@ check_PROGRAMS = sets$(EXEEXT) subdir = tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/test-discoverer.sh.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/test-discoverer.sh.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -75,9 +114,22 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = sets_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(sets_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ + $(sets_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -90,20 +142,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(sets_SOURCES) DIST_SOURCES = $(sets_SOURCES) am__can_run_installinfo = \ @@ -111,10 +159,229 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -161,6 +428,7 @@ GST_PBU_LEGACY_LIBS = @GST_PBU_LEGACY_LIBS@ GST_PBU_LIBS = @GST_PBU_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -220,6 +488,9 @@ STRIP = @STRIP@ VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -273,12 +544,15 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -TESTS_ENVIRONMENT = \ - G_SLICE=debug-blocks \ +AM_TESTS_ENVIRONMENT = \ + export G_SLICE=debug-blocks \ LD_LIBRARY_PATH=$(top_builddir)/libgupnp-dlna/.libs:$(LD_LIBRARY_PATH) \ - MEDIA_DIR="$(srcdir)/media" FILE_LIST="$(srcdir)/media/media-list.txt" ${SHELL} + MEDIA_DIR="$(srcdir)/media" FILE_LIST="$(srcdir)/media/media-list.txt" \ + GUPNP_DLNA_PROFILE_DIR=$(abs_top_srcdir)/data \ + GUPNP_DLNA_METADATA_BACKEND_DIR=$(top_builddir)/libgupnp-dlna/metadata-backends/gstreamer/.libs; TESTS = $(check_PROGRAMS) test-discoverer.sh +check_SCRIPTS = test-discoverer.sh sets_SOURCES = \ sets.c @@ -289,20 +563,20 @@ $(GMODULE_LIBS) \ $(top_builddir)/libgupnp-dlna/libgupnp-dlna-2.0.la +sets_LDFLAGS = $(WARN_LDFLAGS) sets_CFLAGS = \ $(GLIB_CFLAGS) \ $(GOBJECT_CFLAGS) \ $(LIBXML_CFLAGS) \ $(GMODULE_CFLAGS) \ + $(WARN_CFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/libgupnp-dlna \ - -I$(top_srcdir)/libgupnp-dlna/profile-backends/native \ - -I$(top_srcdir)/libgupnp-dlna/profile-backends/native/sets + -I$(top_srcdir)/libgupnp-dlna all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -344,6 +618,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + sets$(EXEEXT): $(sets_OBJECTS) $(sets_DEPENDENCIES) $(EXTRA_sets_DEPENDENCIES) @rm -f sets$(EXEEXT) $(AM_V_CCLD)$(sets_LINK) $(sets_OBJECTS) $(sets_LDADD) $(LIBS) @@ -361,14 +636,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -397,26 +672,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -428,15 +692,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -445,102 +705,194 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) $(check_SCRIPTS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +sets.log: sets$(EXEEXT) + @p='sets$(EXEEXT)'; \ + b='sets'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +test-discoverer.sh.log: test-discoverer.sh + @p='test-discoverer.sh'; \ + b='test-discoverer.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -573,7 +925,7 @@ fi; \ done check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile @@ -598,6 +950,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -681,9 +1036,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -693,7 +1048,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gupnp-dlna-0.10.2/tests/test-discoverer.sh.in gupnp-dlna-0.10.3/tests/test-discoverer.sh.in --- gupnp-dlna-0.10.2/tests/test-discoverer.sh.in 2013-04-18 10:40:24.000000000 +0000 +++ gupnp-dlna-0.10.3/tests/test-discoverer.sh.in 2015-06-30 22:50:47.000000000 +0000 @@ -63,6 +63,8 @@ path=$(echo ${line} | cut -f 1 -d ',') profile=$(echo ${line} | cut -f 2 -d ',') mime=$(echo ${line} | cut -f 3 -d ',') + xfail=$(echo ${line} | cut -f 4 -d ',') + bug=$(echo ${line} | cut -f 5 -d ',') # Run discoverer to get profile name/mime out=$(${GUPNP_DLNA_INFO} -a ${@} ${MEDIA_DIR}/${path}) @@ -72,8 +74,12 @@ # Now compare the two echo -n " Testing ${path} ... " if [[ "x${profile}" != "x${out_profile}" || "x${mime}" != "x${out_mime}" ]]; then - ret=1 - echo -e "\e[01;31mFAIL: ${path},${out_profile},${out_mime}\e[0m" + if [[ "x${xfail}" != "x" ]]; then + echo "XFAIL: ${bug}" + else + ret=1 + echo -e "\e[01;31mFAIL: ${path},${out_profile},${out_mime}\e[0m" + fi else echo "PASS" fi diff -Nru gupnp-dlna-0.10.2/tools/gupnp-dlna-info.c gupnp-dlna-0.10.3/tools/gupnp-dlna-info.c --- gupnp-dlna-0.10.2/tools/gupnp-dlna-info.c 2013-04-18 10:40:24.000000000 +0000 +++ gupnp-dlna-0.10.3/tools/gupnp-dlna-info.c 2015-06-30 22:50:47.000000000 +0000 @@ -51,6 +51,7 @@ GUPnPDLNAProfileGuesser *guesser; int argc; char **argv; + GMainLoop *ml; } PrivStruct; static void @@ -212,6 +213,11 @@ for (iter = 1; iter < ps->argc; iter++) process_file (ps->guesser, ps->argv[iter]); + /* No files added to queue, exit program */ + if (files_to_guess == 0) { + g_main_loop_quit (ps->ml); + } + return FALSE; } @@ -266,6 +272,10 @@ guesser = gupnp_dlna_profile_guesser_new (relaxed_mode, extended_mode); + if (guesser == NULL) { + g_print ("Failed to create meta-data guesser\n"); + exit (1); + } if (async == FALSE) { gint iter; @@ -279,6 +289,7 @@ ps->guesser = guesser; ps->argc = argc; ps->argv = argv; + ps->ml = ml; g_idle_add ((GSourceFunc) async_idle_loop, ps); diff -Nru gupnp-dlna-0.10.2/tools/Makefile.am gupnp-dlna-0.10.3/tools/Makefile.am --- gupnp-dlna-0.10.2/tools/Makefile.am 2013-04-18 10:40:24.000000000 +0000 +++ gupnp-dlna-0.10.3/tools/Makefile.am 2015-06-21 19:30:43.000000000 +0000 @@ -7,7 +7,8 @@ $(GLIB_CFLAGS) \ $(GOBJECT_CFLAGS) \ $(LIBXML_CFLAGS) \ - $(GMODULE_CFLAGS) + $(GMODULE_CFLAGS) \ + $(WARN_CFLAGS) LIBS = \ $(GLIB_LIBS) \ $(GOBJECT_LIBS) \ @@ -15,8 +16,10 @@ $(GMODULE_LIBS) \ $(top_builddir)/libgupnp-dlna/libgupnp-dlna-2.0.la +gupnp_dlna_info_2_0_LDFLAGS = $(WARN_LDFLAGS) gupnp_dlna_info_2_0_SOURCES = \ gupnp-dlna-info.c +gupnp_dlna_ls_profiles_2_0_LDFLAGS = $(WARN_LDFLAGS) gupnp_dlna_ls_profiles_2_0_SOURCES = \ gupnp-dlna-ls-profiles.c diff -Nru gupnp-dlna-0.10.2/tools/Makefile.in gupnp-dlna-0.10.3/tools/Makefile.in --- gupnp-dlna-0.10.2/tools/Makefile.in 2013-05-30 17:01:36.000000000 +0000 +++ gupnp-dlna-0.10.3/tools/Makefile.in 2015-06-30 22:53:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,13 +81,24 @@ bin_PROGRAMS = gupnp-dlna-info-2.0$(EXEEXT) \ gupnp-dlna-ls-profiles-2.0$(EXEEXT) subdir = tools -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -75,11 +113,32 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +gupnp_dlna_info_2_0_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(gupnp_dlna_info_2_0_LDFLAGS) \ + $(LDFLAGS) -o $@ am_gupnp_dlna_ls_profiles_2_0_OBJECTS = \ gupnp-dlna-ls-profiles.$(OBJEXT) gupnp_dlna_ls_profiles_2_0_OBJECTS = \ $(am_gupnp_dlna_ls_profiles_2_0_OBJECTS) gupnp_dlna_ls_profiles_2_0_LDADD = $(LDADD) +gupnp_dlna_ls_profiles_2_0_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(gupnp_dlna_ls_profiles_2_0_LDFLAGS) \ + $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -92,20 +151,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(gupnp_dlna_info_2_0_SOURCES) \ $(gupnp_dlna_ls_profiles_2_0_SOURCES) DIST_SOURCES = $(gupnp_dlna_info_2_0_SOURCES) \ @@ -115,6 +170,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -163,6 +235,7 @@ GST_PBU_LEGACY_LIBS = @GST_PBU_LEGACY_LIBS@ GST_PBU_LIBS = @GST_PBU_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -228,6 +301,9 @@ STRIP = @STRIP@ VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -286,11 +362,14 @@ $(GLIB_CFLAGS) \ $(GOBJECT_CFLAGS) \ $(LIBXML_CFLAGS) \ - $(GMODULE_CFLAGS) + $(GMODULE_CFLAGS) \ + $(WARN_CFLAGS) +gupnp_dlna_info_2_0_LDFLAGS = $(WARN_LDFLAGS) gupnp_dlna_info_2_0_SOURCES = \ gupnp-dlna-info.c +gupnp_dlna_ls_profiles_2_0_LDFLAGS = $(WARN_LDFLAGS) gupnp_dlna_ls_profiles_2_0_SOURCES = \ gupnp-dlna-ls-profiles.c @@ -337,10 +416,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -361,7 +442,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -374,12 +456,14 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + gupnp-dlna-info-2.0$(EXEEXT): $(gupnp_dlna_info_2_0_OBJECTS) $(gupnp_dlna_info_2_0_DEPENDENCIES) $(EXTRA_gupnp_dlna_info_2_0_DEPENDENCIES) @rm -f gupnp-dlna-info-2.0$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gupnp_dlna_info_2_0_OBJECTS) $(gupnp_dlna_info_2_0_LDADD) $(LIBS) + $(AM_V_CCLD)$(gupnp_dlna_info_2_0_LINK) $(gupnp_dlna_info_2_0_OBJECTS) $(gupnp_dlna_info_2_0_LDADD) $(LIBS) + gupnp-dlna-ls-profiles-2.0$(EXEEXT): $(gupnp_dlna_ls_profiles_2_0_OBJECTS) $(gupnp_dlna_ls_profiles_2_0_DEPENDENCIES) $(EXTRA_gupnp_dlna_ls_profiles_2_0_DEPENDENCIES) @rm -f gupnp-dlna-ls-profiles-2.0$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gupnp_dlna_ls_profiles_2_0_OBJECTS) $(gupnp_dlna_ls_profiles_2_0_LDADD) $(LIBS) + $(AM_V_CCLD)$(gupnp_dlna_ls_profiles_2_0_LINK) $(gupnp_dlna_ls_profiles_2_0_OBJECTS) $(gupnp_dlna_ls_profiles_2_0_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -395,14 +479,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -417,26 +501,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -448,15 +521,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -465,6 +534,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -608,19 +692,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gupnp-dlna-0.10.2/vala/Makefile.in gupnp-dlna-0.10.3/vala/Makefile.in --- gupnp-dlna-0.10.2/vala/Makefile.in 2013-05-30 17:01:37.000000000 +0000 +++ gupnp-dlna-0.10.3/vala/Makefile.in 2015-06-30 22:53:45.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in 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. @@ -16,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,25 +96,41 @@ @GSTREAMER_LEGACY_METADATA_BACKEND_ENABLED_TRUE@@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $(srcdir)/gupnp-dlna-gst-legacy-2.0.deps subdir = vala -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -124,6 +167,7 @@ } am__installdirs = "$(DESTDIR)$(vapidir)" DATA = $(vapi_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -170,6 +214,7 @@ GST_PBU_LEGACY_LIBS = @GST_PBU_LEGACY_LIBS@ GST_PBU_LIBS = @GST_PBU_LIBS@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -229,6 +274,9 @@ STRIP = @STRIP@ VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ XMLLINT = @XMLLINT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -354,11 +402,11 @@ @list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -498,16 +546,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-vapiDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-vapiDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-vapiDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-vapiDATA @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@gupnp-dlna-2.0.vapi: gupnp-dlna-2.0.stamp @HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ @true