diff -Nru gupnp-av-0.12.6/aclocal.m4 gupnp-av-0.12.7/aclocal.m4 --- gupnp-av-0.12.6/aclocal.m4 2014-06-10 11:38:33.000000000 +0000 +++ gupnp-av-0.12.7/aclocal.m4 2015-01-04 17:12:52.000000000 +0000 @@ -180,6 +180,61 @@ 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-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -733,7 +788,8 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +]) 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 diff -Nru gupnp-av-0.12.6/build-aux/config.guess gupnp-av-0.12.7/build-aux/config.guess --- gupnp-av-0.12.6/build-aux/config.guess 2014-06-10 11:38:35.000000000 +0000 +++ gupnp-av-0.12.7/build-aux/config.guess 2015-01-04 17:12:57.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-06-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 @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 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." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -826,7 +826,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,16 +1260,26 @@ if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - 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 + 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 ;; @@ -1361,154 +1371,6 @@ exit ;; esac -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 <. # @@ -651,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='gupnp-av' PACKAGE_TARNAME='gupnp-av' -PACKAGE_VERSION='0.12.6' -PACKAGE_STRING='gupnp-av 0.12.6' +PACKAGE_VERSION='0.12.7' +PACKAGE_STRING='gupnp-av 0.12.7' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=GUPnP' PACKAGE_URL='http://www.gupnp.org/' @@ -1428,7 +1428,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-av 0.12.6 to adapt to many kinds of systems. +\`configure' configures gupnp-av 0.12.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1498,7 +1498,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gupnp-av 0.12.6:";; + short | recursive ) echo "Configuration of gupnp-av 0.12.7:";; esac cat <<\_ACEOF @@ -1627,7 +1627,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gupnp-av configure 0.12.6 +gupnp-av configure 0.12.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1905,7 +1905,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-av $as_me 0.12.6, which was +It was created by gupnp-av $as_me 0.12.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2777,7 +2777,7 @@ # Define the identity of the package. PACKAGE='gupnp-av' - VERSION='0.12.6' + VERSION='0.12.7' cat >>confdefs.h <<_ACEOF @@ -2986,6 +2986,7 @@ 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. @@ -12535,7 +12536,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - VAPIGEN_MIN_VERSION=0.20 + VAPIGEN_MIN_VERSION=0.22 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -13567,7 +13568,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gupnp-av $as_me 0.12.6, which was +This file was extended by gupnp-av $as_me 0.12.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13634,7 +13635,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-av config.status 0.12.6 +gupnp-av config.status 0.12.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru gupnp-av-0.12.6/configure.ac gupnp-av-0.12.7/configure.ac --- gupnp-av-0.12.6/configure.ac 2014-05-22 18:46:30.000000000 +0000 +++ gupnp-av-0.12.7/configure.ac 2014-12-25 13:07:57.000000000 +0000 @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) AC_INIT([gupnp-av], - [0.12.6], + [0.12.7], [https://bugzilla.gnome.org/enter_bug.cgi?product=GUPnP], [gupnp-av], [http://www.gupnp.org/]) @@ -53,7 +53,7 @@ AS_IF([pkg-config --atleast-version=1.36.0 gobject-introspection-1.0], [ AC_MSG_RESULT([yes]) - VAPIGEN_MIN_VERSION=0.20 + VAPIGEN_MIN_VERSION=0.22 ],[AC_MSG_RESULT([no])] ) GUPNP_PROG_VAPIGEN([$VAPIGEN_MIN_VERSION]) diff -Nru gupnp-av-0.12.6/debian/changelog gupnp-av-0.12.7/debian/changelog --- gupnp-av-0.12.6/debian/changelog 2014-06-23 16:11:33.000000000 +0000 +++ gupnp-av-0.12.7/debian/changelog 2015-07-16 21:39:15.000000000 +0000 @@ -1,3 +1,16 @@ +gupnp-av (0.12.7-1~jensge1~vivid1) vivid; urgency=medium + + * Import debian version + + -- Jens Georg Thu, 16 Jul 2015 23:34:21 +0200 + +gupnp-av (0.12.7-1) unstable; urgency=medium + + * Imported Upstream version 0.12.6 + * Bump build-dependency on valac to >= 0.22 according to configure.ac + + -- Andreas Henriksson Thu, 30 Apr 2015 10:12:30 +0200 + gupnp-av (0.12.6-1) unstable; urgency=medium [ Andreas Henriksson ] diff -Nru gupnp-av-0.12.6/debian/control gupnp-av-0.12.7/debian/control --- gupnp-av-0.12.6/debian/control 2014-06-23 16:09:03.000000000 +0000 +++ gupnp-av-0.12.7/debian/control 2015-04-30 08:13:16.000000000 +0000 @@ -9,7 +9,7 @@ libgupnp-1.0-dev (>= 0.19.0), libgssdp-1.0-dev (>= 0.8.2), libsoup2.4-dev (>= 2.34.0-1~), - valac (>= 0.20), + valac (>= 0.22), gobject-introspection (>= 0.9.12-4~), libgirepository1.0-dev (>= 0.9.12) Standards-Version: 3.9.5 diff -Nru gupnp-av-0.12.6/doc/html/annotation-glossary.html gupnp-av-0.12.7/doc/html/annotation-glossary.html --- gupnp-av-0.12.6/doc/html/annotation-glossary.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/annotation-glossary.html 2015-01-04 17:25:59.000000000 +0000 @@ -7,15 +7,17 @@ - + - + @@ -27,12 +29,18 @@ Annotation Glossary

A

allow-none
-

NULL is ok, both for passing and for returning.

+

NULL is OK, both for passing and for returning.

array

Parameter points to an array of items.

E

element-type

Generics and defining elements of containers and arrays.

+

P

+
Private
+

An interface that can be used within the GNOME stack itself, but that is not +documented for end-users. Such functions should only be used in specified and +documented ways. +

T

transfer container

Free data container after the code is done.

@@ -43,6 +51,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1 \ No newline at end of file diff -Nru gupnp-av-0.12.6/doc/html/ch01.html gupnp-av-0.12.7/doc/html/ch01.html --- gupnp-av-0.12.6/doc/html/ch01.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/ch01.html 2015-01-04 17:25:59.000000000 +0000 @@ -8,11 +8,11 @@ - + - + @@ -76,6 +76,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1 \ No newline at end of file diff -Nru gupnp-av-0.12.6/doc/html/ch02.html gupnp-av-0.12.7/doc/html/ch02.html --- gupnp-av-0.12.6/doc/html/ch02.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/ch02.html 2015-01-04 17:25:59.000000000 +0000 @@ -8,11 +8,11 @@ - + - + @@ -28,6 +28,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1 \ No newline at end of file diff -Nru gupnp-av-0.12.6/doc/html/gupnp-av-Error-codes.html gupnp-av-0.12.7/doc/html/gupnp-av-Error-codes.html --- gupnp-av-0.12.6/doc/html/gupnp-av-Error-codes.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/gupnp-av-Error-codes.html 2015-01-04 17:25:59.000000000 +0000 @@ -8,15 +8,14 @@ - + - + @@ -69,11 +68,6 @@
-

Object Hierarchy

-
-
-
-

Description

@@ -84,7 +78,7 @@

The GQuark uniquely used by GUPnP AV protocol related errors.

-

Returns

+

Returns

a GQuark uniquely used by GUPnP AV protocol related errors.

@@ -102,7 +96,7 @@

GError codes used for errors in the GUPNP_PROTOCOL_ERROR domain, upon any protocol related errors.

-

Members

+

Members

@@ -132,7 +126,7 @@

enum GUPnPSearchCriteriaParserError

-

Members

+

Members

@@ -154,6 +148,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1 \ No newline at end of file diff -Nru gupnp-av-0.12.6/doc/html/gupnp-av-GUPnPDIDLLiteCreateClass.html gupnp-av-0.12.7/doc/html/gupnp-av-GUPnPDIDLLiteCreateClass.html --- gupnp-av-0.12.6/doc/html/gupnp-av-GUPnPDIDLLiteCreateClass.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/gupnp-av-GUPnPDIDLLiteCreateClass.html 2015-01-04 17:25:59.000000000 +0000 @@ -8,15 +8,14 @@ - + -
+ @@ -98,11 +97,6 @@
-

Object Hierarchy

-
-
-
-

Description

GUPnPDIDLLiteCreateClass respresents a DIDL-Lite create class element.

@@ -116,7 +110,7 @@

Get the content of the create_class .

-

Parameters

+

Parameters

@@ -131,7 +125,7 @@
-

Returns

+

Returns

The Content of the create_class , or NULL.

@@ -147,7 +141,7 @@

Set the content of the create_class .

-

Parameters

+

Parameters

@@ -178,7 +172,7 @@

Checks whether create_class can be derived.

-

Parameters

+

Parameters

@@ -193,7 +187,7 @@
-

Returns

+

Returns

TRUE if create_class can be derived.

@@ -208,7 +202,7 @@ gboolean include_derived);

(Un)set the derivability of create_class.

-

Parameters

+

Parameters

@@ -239,7 +233,7 @@

Get the friendly name of the create_class .

-

Parameters

+

Parameters

@@ -254,7 +248,7 @@
-

Returns

+

Returns

The FriendlyName of the create_class , or NULL.

@@ -270,7 +264,7 @@

Set the friendly name of the create_class .

-

Parameters

+

Parameters

@@ -300,7 +294,7 @@ (GUPnPDIDLLiteCreateClass *create_class);

Get the pointer to relevant node in XML document.

-

Parameters

+

Parameters

@@ -315,7 +309,7 @@
-

Returns

+

Returns

The pointer to relevant node in XML document.

[transfer none]

@@ -327,6 +321,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1
\ No newline at end of file diff -Nru gupnp-av-0.12.6/doc/html/GUPnPCDSLastChangeParser.html gupnp-av-0.12.7/doc/html/GUPnPCDSLastChangeParser.html --- gupnp-av-0.12.6/doc/html/GUPnPCDSLastChangeParser.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/GUPnPCDSLastChangeParser.html 2015-01-04 17:25:59.000000000 +0000 @@ -8,14 +8,14 @@ - + - + @@ -112,7 +112,7 @@ - +
@@ -2045,7 +2045,7 @@

The “cleartext-size” property

-
  “cleartext-size”           gint64
+
  “cleartext-size”           gint64

The clear text size (in bytes) of this resource.

Flags: Read / Write

Allowed values: >= -1

@@ -2138,7 +2138,7 @@

The “size64” property

-
  “size64”                   gint64
+
  “size64”                   gint64

The size (in bytes) of this resource.

Flags: Read / Write

Allowed values: >= -1

@@ -2196,11 +2196,14 @@

The “xml-doc” property

-
  “xml-doc”                  GUPnPXMLDoc *
+
  “xml-doc”                  GUPnPXMLDoc *

The reference to XML document containing this object.

Internal property.

Flags: Write / Construct Only

-

Stability Level: Private

+

Stability Level: Private

@@ -2213,6 +2216,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1
\ No newline at end of file diff -Nru gupnp-av-0.12.6/doc/html/GUPnPDIDLLiteWriter.html gupnp-av-0.12.7/doc/html/GUPnPDIDLLiteWriter.html --- gupnp-av-0.12.6/doc/html/GUPnPDIDLLiteWriter.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/GUPnPDIDLLiteWriter.html 2015-01-04 17:25:59.000000000 +0000 @@ -8,15 +8,15 @@ - + - + @@ -173,7 +173,7 @@ - +
@@ -417,6 +417,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1 \ No newline at end of file diff -Nru gupnp-av-0.12.6/doc/html/GUPnPFeature.html gupnp-av-0.12.7/doc/html/GUPnPFeature.html --- gupnp-av-0.12.6/doc/html/GUPnPFeature.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/GUPnPFeature.html 2015-01-04 17:25:59.000000000 +0000 @@ -8,15 +8,15 @@ - + - + @@ -243,6 +243,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1 \ No newline at end of file diff -Nru gupnp-av-0.12.6/doc/html/GUPnPFeatureListParser.html gupnp-av-0.12.7/doc/html/GUPnPFeatureListParser.html --- gupnp-av-0.12.6/doc/html/GUPnPFeatureListParser.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/GUPnPFeatureListParser.html 2015-01-04 17:25:59.000000000 +0000 @@ -8,14 +8,14 @@ - + - + @@ -151,6 +151,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1 \ No newline at end of file diff -Nru gupnp-av-0.12.6/doc/html/GUPnPLastChangeParser.html gupnp-av-0.12.7/doc/html/GUPnPLastChangeParser.html --- gupnp-av-0.12.6/doc/html/GUPnPLastChangeParser.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/GUPnPLastChangeParser.html 2015-01-04 17:25:59.000000000 +0000 @@ -8,14 +8,14 @@ - + - + @@ -227,6 +227,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1 \ No newline at end of file diff -Nru gupnp-av-0.12.6/doc/html/GUPnPMediaCollection.html gupnp-av-0.12.7/doc/html/GUPnPMediaCollection.html --- gupnp-av-0.12.6/doc/html/GUPnPMediaCollection.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/GUPnPMediaCollection.html 2015-01-04 17:25:59.000000000 +0000 @@ -8,15 +8,15 @@ - + - + @@ -489,6 +489,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1 \ No newline at end of file diff -Nru gupnp-av-0.12.6/doc/html/GUPnPProtocolInfo.html gupnp-av-0.12.7/doc/html/GUPnPProtocolInfo.html --- gupnp-av-0.12.6/doc/html/GUPnPProtocolInfo.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/GUPnPProtocolInfo.html 2015-01-04 17:25:59.000000000 +0000 @@ -8,15 +8,15 @@ - + - + @@ -1195,6 +1195,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1 \ No newline at end of file diff -Nru gupnp-av-0.12.6/doc/html/GUPnPSearchCriteriaParser.html gupnp-av-0.12.7/doc/html/GUPnPSearchCriteriaParser.html --- gupnp-av-0.12.6/doc/html/GUPnPSearchCriteriaParser.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/GUPnPSearchCriteriaParser.html 2015-01-04 17:25:59.000000000 +0000 @@ -8,15 +8,15 @@ - + - + @@ -118,7 +118,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── GUPnPSearchCriteriaOp
     GObject
     ╰── GUPnPSearchCriteriaParser
@@ -474,6 +474,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1 \ No newline at end of file Binary files /tmp/GupPRSuIRP/gupnp-av-0.12.6/doc/html/home.png and /tmp/d_GiuJpXwF/gupnp-av-0.12.7/doc/html/home.png differ diff -Nru gupnp-av-0.12.6/doc/html/index.html gupnp-av-0.12.7/doc/html/index.html --- gupnp-av-0.12.6/doc/html/index.html 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/index.html 2015-01-04 17:25:59.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@
-

Version 0.12.6 +

Version 0.12.7

Copyright © 2007,2008 OpenedHand LTD

Copyright © 2007,2008 Zeeshan Ali <zeenix@gmail.com>

@@ -106,6 +106,6 @@
- Generated by GTK-Doc V1.20
+ Generated by GTK-Doc V1.21.1 \ No newline at end of file diff -Nru gupnp-av-0.12.6/doc/html/index.sgml gupnp-av-0.12.7/doc/html/index.sgml --- gupnp-av-0.12.6/doc/html/index.sgml 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/index.sgml 2015-01-04 17:25:59.000000000 +0000 @@ -306,7 +306,6 @@ - @@ -461,7 +460,6 @@ - @@ -472,6 +470,7 @@ + Binary files /tmp/GupPRSuIRP/gupnp-av-0.12.6/doc/html/left-insensitive.png and /tmp/d_GiuJpXwF/gupnp-av-0.12.7/doc/html/left-insensitive.png differ Binary files /tmp/GupPRSuIRP/gupnp-av-0.12.6/doc/html/left.png and /tmp/d_GiuJpXwF/gupnp-av-0.12.7/doc/html/left.png differ Binary files /tmp/GupPRSuIRP/gupnp-av-0.12.6/doc/html/right-insensitive.png and /tmp/d_GiuJpXwF/gupnp-av-0.12.7/doc/html/right-insensitive.png differ Binary files /tmp/GupPRSuIRP/gupnp-av-0.12.6/doc/html/right.png and /tmp/d_GiuJpXwF/gupnp-av-0.12.7/doc/html/right.png differ diff -Nru gupnp-av-0.12.6/doc/html/style.css gupnp-av-0.12.7/doc/html/style.css --- gupnp-av-0.12.6/doc/html/style.css 2014-06-10 11:39:21.000000000 +0000 +++ gupnp-av-0.12.7/doc/html/style.css 2015-01-04 17:25:59.000000000 +0000 @@ -30,127 +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: 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; - margin-top: 0; - margin-bottom: 0; - top: 0; - left: 0; - height: 3em; - z-index: 10; - } - .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; - } -} -@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; } -} -@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; - } -} - -.navigation .title -{ - font-size: 120%; -} - div.gallery-float { float: left; @@ -181,7 +60,7 @@ div.informaltable table { border-collapse: separate; - border-spacing: 20px 3px; + border-spacing: 1em 0.5em; border: none; } @@ -239,6 +118,11 @@ color: #729fcf; } +td p +{ + margin: 0.25em; +} + div.table table { border-collapse: collapse; @@ -404,21 +288,28 @@ 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 */ @@ -433,11 +324,6 @@ padding: 0.5em; } .listing_lines { - /* this just adds visual clutter and - takes precious room from small screens */ - display: none; -} -.listing_lines { /* tango:sky blue 0.5 */ background: #a6c5e3; background: rgba(114, 159, 207, 0.2); @@ -459,3 +345,132 @@ 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/GupPRSuIRP/gupnp-av-0.12.6/doc/html/up-insensitive.png and /tmp/d_GiuJpXwF/gupnp-av-0.12.7/doc/html/up-insensitive.png differ Binary files /tmp/GupPRSuIRP/gupnp-av-0.12.6/doc/html/up.png and /tmp/d_GiuJpXwF/gupnp-av-0.12.7/doc/html/up.png differ diff -Nru gupnp-av-0.12.6/doc/Makefile.am gupnp-av-0.12.7/doc/Makefile.am --- gupnp-av-0.12.6/doc/Makefile.am 2014-02-01 09:57:19.000000000 +0000 +++ gupnp-av-0.12.7/doc/Makefile.am 2014-12-23 21:13:31.000000000 +0000 @@ -78,7 +78,8 @@ # 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) $(LIBGUPNP_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = $(LIBGUPNP_CFLAGS) GTKDOC_LIBS=$(top_builddir)/libgupnp-av/libgupnp-av-1.0.la $(LIBGUPNP_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. diff -Nru gupnp-av-0.12.6/doc/Makefile.in gupnp-av-0.12.7/doc/Makefile.in --- gupnp-av-0.12.6/doc/Makefile.in 2014-06-10 11:38:35.000000000 +0000 +++ gupnp-av-0.12.7/doc/Makefile.in 2015-01-04 17:12:57.000000000 +0000 @@ -335,7 +335,8 @@ # 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) $(LIBGUPNP_CFLAGS) +AM_CPPFLAGS = -I$(top_srcdir) +AM_CFLAGS = $(LIBGUPNP_CFLAGS) GTKDOC_LIBS = $(top_builddir)/libgupnp-av/libgupnp-av-1.0.la $(LIBGUPNP_LIBS) @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) diff -Nru gupnp-av-0.12.6/doc/version.xml gupnp-av-0.12.7/doc/version.xml --- gupnp-av-0.12.6/doc/version.xml 2014-06-10 11:38:44.000000000 +0000 +++ gupnp-av-0.12.7/doc/version.xml 2015-01-04 17:13:05.000000000 +0000 @@ -1 +1 @@ -0.12.6 +0.12.7 diff -Nru gupnp-av-0.12.6/libgupnp-av/gupnp-didl-lite-object.c gupnp-av-0.12.7/libgupnp-av/gupnp-didl-lite-object.c --- gupnp-av-0.12.6/libgupnp-av/gupnp-didl-lite-object.c 2014-06-10 10:49:41.000000000 +0000 +++ gupnp-av-0.12.7/libgupnp-av/gupnp-didl-lite-object.c 2014-12-24 11:05:32.000000000 +0000 @@ -835,6 +835,9 @@ res_info = gupnp_didl_lite_resource_get_protocol_info (resource); + if (res_info == NULL) + continue; + ret = gupnp_protocol_info_is_compatible (info, res_info); g_object_unref (info); @@ -1029,7 +1032,9 @@ { g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); - return object->priv->upnp_ns; + return xml_util_get_ns (object->priv->xml_doc->doc, + GUPNP_XML_NAMESPACE_UPNP, + &(object->priv->upnp_ns)); } /** @@ -1046,7 +1051,9 @@ { g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); - return object->priv->dc_ns; + return xml_util_get_ns (object->priv->xml_doc->doc, + GUPNP_XML_NAMESPACE_DC, + &(object->priv->dc_ns)); } /** @@ -1080,7 +1087,9 @@ { g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); - return object->priv->dlna_ns; + return xml_util_get_ns (object->priv->xml_doc->doc, + GUPNP_XML_NAMESPACE_DLNA, + &(object->priv->dlna_ns)); } /** @@ -1097,7 +1106,9 @@ { g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL); - return object->priv->pv_ns; + return xml_util_get_ns (object->priv->xml_doc->doc, + GUPNP_XML_NAMESPACE_PV, + &(object->priv->pv_ns)); } diff -Nru gupnp-av-0.12.6/libgupnp-av/gupnp-didl-lite-resource.c gupnp-av-0.12.7/libgupnp-av/gupnp-didl-lite-resource.c --- gupnp-av-0.12.6/libgupnp-av/gupnp-didl-lite-resource.c 2014-06-10 10:49:41.000000000 +0000 +++ gupnp-av-0.12.7/libgupnp-av/gupnp-didl-lite-resource.c 2014-12-24 11:05:32.000000000 +0000 @@ -980,7 +980,8 @@ protocol_info = xml_util_get_attribute_content (resource->priv->xml_node, "protocolInfo"); - g_return_val_if_fail (protocol_info != NULL, NULL); + if (protocol_info == NULL) + return NULL; error = NULL; info = gupnp_protocol_info_new_from_string (protocol_info, &error); diff -Nru gupnp-av-0.12.6/NEWS gupnp-av-0.12.7/NEWS --- gupnp-av-0.12.6/NEWS 2014-06-10 11:37:43.000000000 +0000 +++ gupnp-av-0.12.7/NEWS 2015-01-04 17:10:26.000000000 +0000 @@ -1,3 +1,24 @@ +0.12.7 +====== + +Changes since 0.12.6: + +- Remove use of deprecated INCLUDES. +- Fix GUPnPDIDLLiteObject namespace getters. +- Avoid warnings on missing protocol info. +- Require vapigen 0.22 to avoid endless loop on VAPI generation. + +Bugs fixed in this release: + - https://bugzilla.gnome.org/show_bug.cgi?id=740265 + - https://bugzilla.gnome.org/show_bug.cgi?id=741103 + - https://bugzilla.gnome.org/show_bug.cgi?id=741555 + - https://bugzilla.gnome.org/show_bug.cgi?id=740365 + +All contributors to this release: + - Sven Neumann + - Jens Georg + - Philip Withnall + 0.12.6 ====== diff -Nru gupnp-av-0.12.6/tests/gtest/Makefile.am gupnp-av-0.12.7/tests/gtest/Makefile.am --- gupnp-av-0.12.6/tests/gtest/Makefile.am 2014-02-01 09:57:20.000000000 +0000 +++ gupnp-av-0.12.7/tests/gtest/Makefile.am 2014-12-23 21:13:31.000000000 +0000 @@ -6,12 +6,15 @@ check_PROGRAMS = \ test-regression \ + test-didl-lite-object \ test-media-collection \ test-last-change-parser \ test-cds-last-change-parser test_regression_SOURCES = test-regression.c +test_didl_lite_object_SOURCES = test-didl-lite-object.c + test_media_collection_SOURCES = \ test-media-collection.c diff -Nru gupnp-av-0.12.6/tests/gtest/Makefile.in gupnp-av-0.12.7/tests/gtest/Makefile.in --- gupnp-av-0.12.6/tests/gtest/Makefile.in 2014-06-10 11:38:35.000000000 +0000 +++ gupnp-av-0.12.7/tests/gtest/Makefile.in 2015-01-04 17:12:58.000000000 +0000 @@ -78,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = test-regression$(EXEEXT) \ - test-media-collection$(EXEEXT) \ + test-didl-lite-object$(EXEEXT) test-media-collection$(EXEEXT) \ test-last-change-parser$(EXEEXT) \ test-cds-last-change-parser$(EXEEXT) subdir = tests/gtest @@ -110,6 +110,12 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +am_test_didl_lite_object_OBJECTS = test-didl-lite-object.$(OBJEXT) +test_didl_lite_object_OBJECTS = $(am_test_didl_lite_object_OBJECTS) +test_didl_lite_object_LDADD = $(LDADD) +test_didl_lite_object_DEPENDENCIES = \ + $(top_builddir)/libgupnp-av/libgupnp-av-1.0.la \ + $(am__DEPENDENCIES_1) am_test_last_change_parser_OBJECTS = \ test-last-change-parser.$(OBJEXT) test_last_change_parser_OBJECTS = \ @@ -165,9 +171,11 @@ am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(test_cds_last_change_parser_SOURCES) \ + $(test_didl_lite_object_SOURCES) \ $(test_last_change_parser_SOURCES) \ $(test_media_collection_SOURCES) $(test_regression_SOURCES) DIST_SOURCES = $(test_cds_last_change_parser_SOURCES) \ + $(test_didl_lite_object_SOURCES) \ $(test_last_change_parser_SOURCES) \ $(test_media_collection_SOURCES) $(test_regression_SOURCES) am__can_run_installinfo = \ @@ -543,6 +551,7 @@ TESTS = $(check_PROGRAMS) test_regression_SOURCES = test-regression.c +test_didl_lite_object_SOURCES = test-didl-lite-object.c test_media_collection_SOURCES = \ test-media-collection.c @@ -618,6 +627,10 @@ @rm -f test-cds-last-change-parser$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_cds_last_change_parser_OBJECTS) $(test_cds_last_change_parser_LDADD) $(LIBS) +test-didl-lite-object$(EXEEXT): $(test_didl_lite_object_OBJECTS) $(test_didl_lite_object_DEPENDENCIES) $(EXTRA_test_didl_lite_object_DEPENDENCIES) + @rm -f test-didl-lite-object$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_didl_lite_object_OBJECTS) $(test_didl_lite_object_LDADD) $(LIBS) + test-last-change-parser$(EXEEXT): $(test_last_change_parser_OBJECTS) $(test_last_change_parser_DEPENDENCIES) $(EXTRA_test_last_change_parser_DEPENDENCIES) @rm -f test-last-change-parser$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_last_change_parser_OBJECTS) $(test_last_change_parser_LDADD) $(LIBS) @@ -637,6 +650,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-cds-last-change-parser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-didl-lite-object.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-last-change-parser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-media-collection.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-regression.Po@am__quote@ @@ -867,6 +881,13 @@ $(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-didl-lite-object.log: test-didl-lite-object$(EXEEXT) + @p='test-didl-lite-object$(EXEEXT)'; \ + b='test-didl-lite-object'; \ + $(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-media-collection.log: test-media-collection$(EXEEXT) @p='test-media-collection$(EXEEXT)'; \ diff -Nru gupnp-av-0.12.6/tests/gtest/test-didl-lite-object.c gupnp-av-0.12.7/tests/gtest/test-didl-lite-object.c --- gupnp-av-0.12.6/tests/gtest/test-didl-lite-object.c 1970-01-01 00:00:00.000000000 +0000 +++ gupnp-av-0.12.7/tests/gtest/test-didl-lite-object.c 2014-12-23 21:13:31.000000000 +0000 @@ -0,0 +1,59 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include +#include + +static void +namespace_getters (void) +{ + GUPnPDIDLLiteWriter *writer = gupnp_didl_lite_writer_new (NULL); + GUPnPDIDLLiteObject *object = GUPNP_DIDL_LITE_OBJECT (gupnp_didl_lite_writer_add_item (writer)); + xmlNs *namespace; + + namespace = gupnp_didl_lite_object_get_upnp_namespace (object); + g_assert (namespace != NULL); + g_assert_cmpstr (namespace->prefix, ==, "upnp"); + + namespace = gupnp_didl_lite_object_get_dlna_namespace (object); + g_assert (namespace != NULL); + g_assert_cmpstr (namespace->prefix, ==, "dlna"); + + + namespace = gupnp_didl_lite_object_get_dc_namespace (object); + g_assert (namespace != NULL); + g_assert_cmpstr (namespace->prefix, ==, "dc"); + + namespace = gupnp_didl_lite_object_get_pv_namespace (object); + g_assert (namespace != NULL); + g_assert_cmpstr (namespace->prefix, ==, "pv"); +} + +int +main (int argc, char **argv) +{ +#if !GLIB_CHECK_VERSION (2, 35, 0) + g_type_init (); +#endif + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/didl-lite-object/namespace-getters", namespace_getters); + + g_test_run (); + + return 0; +}