Hello community, here is the log from the commit of package gssdp for openSUSE:Factory checked in at 2013-09-11 12:00:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gssdp (Old) and /work/SRC/openSUSE:Factory/.gssdp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gssdp" Changes: -------- --- /work/SRC/openSUSE:Factory/gssdp/gssdp.changes 2013-08-16 12:23:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gssdp.new/gssdp.changes 2013-09-11 12:00:29.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Sep 3 13:53:37 UTC 2013 - [email protected] + +- Update to version 0.14.5: + + Port get_host_ip() to Android/Bionic. + + Some more gtk-doc updates. + + Fix some autoconf warnings. + + Bugs fixed: bgo#707161. + +------------------------------------------------------------------- Old: ---- gssdp-0.14.4.tar.xz New: ---- gssdp-0.14.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gssdp.spec ++++++ --- /var/tmp/diff_new_pack.ubmYUz/_old 2013-09-11 12:00:29.000000000 +0200 +++ /var/tmp/diff_new_pack.ubmYUz/_new 2013-09-11 12:00:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: gssdp -Version: 0.14.4 +Version: 0.14.5 Release: 0 Summary: Library for resource discovery and announcement over SSDP License: LGPL-2.0+ ++++++ gssdp-0.14.4.tar.xz -> gssdp-0.14.5.tar.xz ++++++ ++++ 1803 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/NEWS new/gssdp-0.14.5/NEWS --- old/gssdp-0.14.4/NEWS 2013-07-30 09:10:10.000000000 +0200 +++ new/gssdp-0.14.5/NEWS 2013-09-03 13:38:04.000000000 +0200 @@ -1,3 +1,17 @@ +0.14.5 +====== + +- Port get_host_ip() to Android/Bionic. +- Some more gtk-doc updates. +- Fix some autoconf warnings. + +Bugs fixed in this release: + - https://bugzilla.gnome.org/show_bug.cgi?id=707161 + +All contributors to this release: + - Jens Georg <[email protected]> + - Reynaldo H. Verdejo Pinochet <[email protected]> + 0.14.4 ====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/configure.ac new/gssdp-0.14.5/configure.ac --- old/gssdp-0.14.4/configure.ac 2013-07-30 08:54:39.000000000 +0200 +++ new/gssdp-0.14.5/configure.ac 2013-09-03 13:38:48.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) AC_INIT([gssdp], - [0.14.4], + [0.14.5], [http://bugzilla.gnome.org/enter_bug.cgi?product=gupnp&component=gssdp], [gssdp], [http://www.gupnp.org/]) @@ -10,6 +10,9 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) +AC_CANONICAL_HOST +AC_CANONICAL_TARGET + AM_INIT_AUTOMAKE([1.11 tar-ustar no-dist-gzip dist-xz]) AM_MAINTAINER_MODE([enable]) @@ -114,7 +117,21 @@ AC_MSG_RESULT([$os_win32]) AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) -GTK_DOC_CHECK([1.0]) +dnl Check for Android +AC_MSG_CHECKING([for Android as target OS]) +target_android=no +case "$target_os" in + linux-android*) + target_android=yes + ;; + *) + target_android=no + ;; +esac +AC_MSG_RESULT([$target_android]) +AM_CONDITIONAL(TARGET_ANDROID, [test $target_android = yes]) + +GTK_DOC_CHECK([1.14], [--flavour no-tmpl]) AC_CONFIG_FILES([ Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/doc/Makefile.am new/gssdp-0.14.5/doc/Makefile.am --- old/gssdp-0.14.4/doc/Makefile.am 2013-07-30 08:54:39.000000000 +0200 +++ new/gssdp-0.14.5/doc/Makefile.am 2013-09-03 12:36:29.000000000 +0200 @@ -29,7 +29,7 @@ # Extra options to supply to gtkdoc-mkdb. # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml -MKDB_OPTIONS=--sgml-mode --output-format=xml +MKDB_OPTIONS=--xml-mode --output-format=xml # Extra options to supply to gtkdoc-mktmpl # e.g. MKTMPL_OPTIONS=--only-section-tmpl @@ -70,7 +70,7 @@ # signals and properties. # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) -AM_CPPFLAGS=-I$(top_srcdir) $(LIBGSSDP_CFLAGS) +GTKDOC_CFLAGS=-I$(top_srcdir) $(LIBGSSDP_CFLAGS) GTKDOC_LIBS=$(top_builddir)/libgssdp/libgssdp-1.0.la $(LIBGSSDP_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/doc/html/GSSDPClient.html new/gssdp-0.14.5/doc/html/GSSDPClient.html --- old/gssdp-0.14.4/doc/html/GSSDPClient.html 2013-07-30 09:13:49.000000000 +0200 +++ new/gssdp-0.14.5/doc/html/GSSDPClient.html 2013-09-03 13:41:11.000000000 +0200 @@ -104,8 +104,6 @@ <div class="refsect2"> <a name="GSSDPClient-struct"></a><h3>struct GSSDPClient</h3> <pre class="programlisting">struct GSSDPClient;</pre> -<p> -</p> </div> <hr> <div class="refsect2"> @@ -141,8 +139,6 @@ <div class="refsect2"> <a name="gssdp-client-get-main-context"></a><h3>gssdp_client_get_main_context ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#GMainContext";><span class="returnvalue">GMainContext</span></a> * gssdp_client_get_main_context (<em class="parameter"><code><a class="link" href="GSSDPClient.html" title="GSSDPClient"><span class="type">GSSDPClient</span></a> *client</code></em>);</pre> -<p> -</p> </div> <hr> <div class="refsect2"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/doc/html/GSSDPResourceBrowser.html new/gssdp-0.14.5/doc/html/GSSDPResourceBrowser.html --- old/gssdp-0.14.4/doc/html/GSSDPResourceBrowser.html 2013-07-30 09:13:49.000000000 +0200 +++ new/gssdp-0.14.5/doc/html/GSSDPResourceBrowser.html 2013-09-03 13:41:11.000000000 +0200 @@ -98,8 +98,6 @@ <div class="refsect2"> <a name="GSSDPResourceBrowser-struct"></a><h3>struct GSSDPResourceBrowser</h3> <pre class="programlisting">struct GSSDPResourceBrowser;</pre> -<p> -</p> </div> <hr> <div class="refsect2"> @@ -115,6 +113,23 @@ <a name="gssdp-resource-browser-new"></a><h3>gssdp_resource_browser_new ()</h3> <pre class="programlisting"><a class="link" href="GSSDPResourceBrowser.html" title="GSSDPResourceBrowser"><span class="returnvalue">GSSDPResourceBrowser</span></a> * gssdp_resource_browser_new (<em class="parameter"><code><a class="link" href="GSSDPClient.html" title="GSSDPClient"><span class="type">GSSDPClient</span></a> *client</code></em>, <em class="parameter"><code>const <span class="type">char</span> *target</code></em>);</pre> +<p> +<em class="parameter"><code>target</code></em> is a generic string the resource browser listens for on the SSDP +bus. There are several possible targets such as +</p> +<div class="itemizedlist"><ul class="itemizedlist" type="disc"> +<li class="listitem"><p>"ssdp:all" for everything</p></li> +<li class="listitem"><p> + "upnp:rootdevice" for UPnP device entry points, not caring about the + device type</p></li> +<li class="listitem"><p>The UUID of a specific device</p></li> +<li class="listitem"><p>Device types such as + "urn:schemas-upnp-org:device:MediaServer:1"</p></li> +<li class="listitem"><p>Service types such as + "urn:schemas-upnp-org:service:ContentDirectory:1"</p></li> +</ul></div> +<p> +</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -123,6 +138,10 @@ <td>The <a class="link" href="GSSDPClient.html" title="GSSDPClient"><span class="type">GSSDPClient</span></a> to associate with</td> </tr> <tr> +<td><p><span class="term"><em class="parameter"><code>target</code></em> :</span></p></td> +<td>A SSDP search target</td> +</tr> +<tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td>A new <a class="link" href="GSSDPResourceBrowser.html" title="GSSDPResourceBrowser"><span class="type">GSSDPResourceBrowser</span></a> object.</td> </tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/doc/html/GSSDPResourceGroup.html new/gssdp-0.14.5/doc/html/GSSDPResourceGroup.html --- old/gssdp-0.14.4/doc/html/GSSDPResourceGroup.html 2013-07-30 09:13:49.000000000 +0200 +++ new/gssdp-0.14.5/doc/html/GSSDPResourceGroup.html 2013-09-03 13:41:11.000000000 +0200 @@ -98,8 +98,6 @@ <div class="refsect2"> <a name="GSSDPResourceGroup-struct"></a><h3>struct GSSDPResourceGroup</h3> <pre class="programlisting">struct GSSDPResourceGroup;</pre> -<p> -</p> </div> <hr> <div class="refsect2"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/doc/html/ch01.html new/gssdp-0.14.5/doc/html/ch01.html --- old/gssdp-0.14.4/doc/html/ch01.html 2013-07-30 09:13:49.000000000 +0200 +++ new/gssdp-0.14.5/doc/html/ch01.html 2013-09-03 13:41:11.000000000 +0200 @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id538502"></a>GSSDP</h2></div></div></div> +<a name="id419383"></a>GSSDP</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="GSSDPClient.html">GSSDPClient</a></span><span class="refpurpose"> — SSDP "bus" wrapper.</span> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/doc/html/gssdp-Error-codes.html new/gssdp-0.14.5/doc/html/gssdp-Error-codes.html --- old/gssdp-0.14.4/doc/html/gssdp-Error-codes.html 2013-07-30 09:13:49.000000000 +0200 +++ new/gssdp-0.14.5/doc/html/gssdp-Error-codes.html 2013-09-03 13:41:11.000000000 +0200 @@ -42,8 +42,6 @@ </div> <div class="refsect1"> <a name="gssdp-Error-codes.description"></a><h2>Description</h2> -<p> -</p> </div> <div class="refsect1"> <a name="gssdp-Error-codes.details"></a><h2>Details</h2> @@ -51,8 +49,6 @@ <a name="GSSDP-ERROR:CAPS"></a><h3>GSSDP_ERROR</h3> <pre class="programlisting">#define GSSDP_ERROR (gssdp_error_quark ()) </pre> -<p> -</p> </div> <hr> <div class="refsect2"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/doc/html/index.html new/gssdp-0.14.5/doc/html/index.html --- old/gssdp-0.14.4/doc/html/index.html 2013-07-30 09:13:49.000000000 +0200 +++ new/gssdp-0.14.5/doc/html/index.html 2013-09-03 13:41:11.000000000 +0200 @@ -14,14 +14,14 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GSSDP Reference Manual</p></th></tr></table></div> -<div><p class="releaseinfo">Version 0.14.4 +<div><p class="releaseinfo">Version 0.14.5 <a class="ulink" href="http://developer.gnome.org/gssdp/stable/"; target="_top">http://developer.gnome.org/gssdp/stable/</a> </p></div> <div><p class="copyright">Copyright © 2007 OpenedHand LTD</p></div> <div><p class="copyright">Copyright © 2009, 2010, 2011 Nokia Corporation</p></div> <div><div class="legalnotice"> -<a name="id513493"></a><p> +<a name="id394335"></a><p> Permission is granted to copy, distribute and/or modify this document under the terms of the <em class="citetitle">GNU Free Documentation License</em>, Version 1.1 or any later diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/doc/tmpl/gssdp-client.sgml new/gssdp-0.14.5/doc/tmpl/gssdp-client.sgml --- old/gssdp-0.14.4/doc/tmpl/gssdp-client.sgml 2013-07-30 09:13:49.000000000 +0200 +++ new/gssdp-0.14.5/doc/tmpl/gssdp-client.sgml 1970-01-01 01:00:00.000000000 +0100 @@ -1,159 +0,0 @@ -<!-- ##### SECTION Title ##### --> -GSSDPClient - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT GSSDPClient ##### --> -<para> - -</para> - - -<!-- ##### SIGNAL GSSDPClient::message-received ##### --> -<para> - -</para> - -@gssdpclient: the object which received the signal. -@arg1: -@arg2: -@arg3: -@arg4: - -<!-- ##### ARG GSSDPClient:active ##### --> -<para> - -</para> - -<!-- ##### ARG GSSDPClient:host-ip ##### --> -<para> - -</para> - -<!-- ##### ARG GSSDPClient:interface ##### --> -<para> - -</para> - -<!-- ##### ARG GSSDPClient:main-context ##### --> -<para> - -</para> - -<!-- ##### ARG GSSDPClient:network ##### --> -<para> - -</para> - -<!-- ##### ARG GSSDPClient:server-id ##### --> -<para> - -</para> - -<!-- ##### ARG GSSDPClient:socket-ttl ##### --> -<para> - -</para> - -<!-- ##### FUNCTION gssdp_client_new ##### --> -<para> - -</para> - -@main_context: -@iface: -@error: -@Returns: - - -<!-- ##### FUNCTION gssdp_client_get_main_context ##### --> -<para> - -</para> - -@client: -@Returns: - - -<!-- ##### FUNCTION gssdp_client_set_server_id ##### --> -<para> - -</para> - -@client: -@server_id: - - -<!-- ##### FUNCTION gssdp_client_get_server_id ##### --> -<para> - -</para> - -@client: -@Returns: - - -<!-- ##### FUNCTION gssdp_client_get_interface ##### --> -<para> - -</para> - -@client: -@Returns: - - -<!-- ##### FUNCTION gssdp_client_get_host_ip ##### --> -<para> - -</para> - -@client: -@Returns: - - -<!-- ##### FUNCTION gssdp_client_set_network ##### --> -<para> - -</para> - -@client: -@network: - - -<!-- ##### FUNCTION gssdp_client_get_network ##### --> -<para> - -</para> - -@client: -@Returns: - - -<!-- ##### FUNCTION gssdp_client_get_active ##### --> -<para> - -</para> - -@client: -@Returns: - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/doc/tmpl/gssdp-error.sgml new/gssdp-0.14.5/doc/tmpl/gssdp-error.sgml --- old/gssdp-0.14.4/doc/tmpl/gssdp-error.sgml 2013-07-30 09:13:49.000000000 +0200 +++ new/gssdp-0.14.5/doc/tmpl/gssdp-error.sgml 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -<!-- ##### SECTION Title ##### --> -Error codes - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### MACRO GSSDP_ERROR ##### --> -<para> - -</para> - - - -<!-- ##### ENUM GSSDPError ##### --> -<para> - -</para> - -@GSSDP_ERROR_NO_IP_ADDRESS: -@GSSDP_ERROR_FAILED: - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/doc/tmpl/gssdp-resource-browser.sgml new/gssdp-0.14.5/doc/tmpl/gssdp-resource-browser.sgml --- old/gssdp-0.14.4/doc/tmpl/gssdp-resource-browser.sgml 2013-07-30 09:13:49.000000000 +0200 +++ new/gssdp-0.14.5/doc/tmpl/gssdp-resource-browser.sgml 1970-01-01 01:00:00.000000000 +0100 @@ -1,156 +0,0 @@ -<!-- ##### SECTION Title ##### --> -GSSDPResourceBrowser - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT GSSDPResourceBrowser ##### --> -<para> - -</para> - - -<!-- ##### SIGNAL GSSDPResourceBrowser::resource-available ##### --> -<para> - -</para> - -@gssdpresourcebrowser: the object which received the signal. -@arg1: -@arg2: - -<!-- ##### SIGNAL GSSDPResourceBrowser::resource-unavailable ##### --> -<para> - -</para> - -@gssdpresourcebrowser: the object which received the signal. -@arg1: - -<!-- ##### ARG GSSDPResourceBrowser:active ##### --> -<para> - -</para> - -<!-- ##### ARG GSSDPResourceBrowser:client ##### --> -<para> - -</para> - -<!-- ##### ARG GSSDPResourceBrowser:mx ##### --> -<para> - -</para> - -<!-- ##### ARG GSSDPResourceBrowser:target ##### --> -<para> - -</para> - -<!-- ##### MACRO GSSDP_ALL_RESOURCES ##### --> -<para> - -</para> - - - -<!-- ##### FUNCTION gssdp_resource_browser_new ##### --> -<para> - -</para> - -@client: -@target: -@Returns: - - -<!-- ##### FUNCTION gssdp_resource_browser_get_client ##### --> -<para> - -</para> - -@resource_browser: -@Returns: - - -<!-- ##### FUNCTION gssdp_resource_browser_set_target ##### --> -<para> - -</para> - -@resource_browser: -@target: - - -<!-- ##### FUNCTION gssdp_resource_browser_get_target ##### --> -<para> - -</para> - -@resource_browser: -@Returns: - - -<!-- ##### FUNCTION gssdp_resource_browser_set_mx ##### --> -<para> - -</para> - -@resource_browser: -@mx: - - -<!-- ##### FUNCTION gssdp_resource_browser_get_mx ##### --> -<para> - -</para> - -@resource_browser: -@Returns: - - -<!-- ##### FUNCTION gssdp_resource_browser_set_active ##### --> -<para> - -</para> - -@resource_browser: -@active: - - -<!-- ##### FUNCTION gssdp_resource_browser_get_active ##### --> -<para> - -</para> - -@resource_browser: -@Returns: - - -<!-- ##### FUNCTION gssdp_resource_browser_rescan ##### --> -<para> - -</para> - -@resource_browser: -@Returns: - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/doc/tmpl/gssdp-resource-group.sgml new/gssdp-0.14.5/doc/tmpl/gssdp-resource-group.sgml --- old/gssdp-0.14.4/doc/tmpl/gssdp-resource-group.sgml 2013-07-30 09:13:49.000000000 +0200 +++ new/gssdp-0.14.5/doc/tmpl/gssdp-resource-group.sgml 1970-01-01 01:00:00.000000000 +0100 @@ -1,155 +0,0 @@ -<!-- ##### SECTION Title ##### --> -GSSDPResourceGroup - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - -<!-- ##### STRUCT GSSDPResourceGroup ##### --> -<para> - -</para> - - -<!-- ##### ARG GSSDPResourceGroup:available ##### --> -<para> - -</para> - -<!-- ##### ARG GSSDPResourceGroup:client ##### --> -<para> - -</para> - -<!-- ##### ARG GSSDPResourceGroup:max-age ##### --> -<para> - -</para> - -<!-- ##### ARG GSSDPResourceGroup:message-delay ##### --> -<para> - -</para> - -<!-- ##### FUNCTION gssdp_resource_group_new ##### --> -<para> - -</para> - -@client: -@Returns: - - -<!-- ##### FUNCTION gssdp_resource_group_get_client ##### --> -<para> - -</para> - -@resource_group: -@Returns: - - -<!-- ##### FUNCTION gssdp_resource_group_set_max_age ##### --> -<para> - -</para> - -@resource_group: -@max_age: - - -<!-- ##### FUNCTION gssdp_resource_group_get_max_age ##### --> -<para> - -</para> - -@resource_group: -@Returns: - - -<!-- ##### FUNCTION gssdp_resource_group_set_available ##### --> -<para> - -</para> - -@resource_group: -@available: - - -<!-- ##### FUNCTION gssdp_resource_group_get_available ##### --> -<para> - -</para> - -@resource_group: -@Returns: - - -<!-- ##### FUNCTION gssdp_resource_group_set_message_delay ##### --> -<para> - -</para> - -@resource_group: -@message_delay: - - -<!-- ##### FUNCTION gssdp_resource_group_get_message_delay ##### --> -<para> - -</para> - -@resource_group: -@Returns: - - -<!-- ##### FUNCTION gssdp_resource_group_add_resource ##### --> -<para> - -</para> - -@resource_group: -@target: -@usn: -@locations: -@Returns: - - -<!-- ##### FUNCTION gssdp_resource_group_add_resource_simple ##### --> -<para> - -</para> - -@resource_group: -@target: -@usn: -@location: -@Returns: - - -<!-- ##### FUNCTION gssdp_resource_group_remove_resource ##### --> -<para> - -</para> - -@resource_group: -@resource_id: - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/doc/tmpl/gssdp.sgml new/gssdp-0.14.5/doc/tmpl/gssdp.sgml --- old/gssdp-0.14.4/doc/tmpl/gssdp.sgml 2013-07-30 09:13:49.000000000 +0200 +++ new/gssdp-0.14.5/doc/tmpl/gssdp.sgml 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -<!-- ##### SECTION Title ##### --> -gssdp - -<!-- ##### SECTION Short_Description ##### --> - - -<!-- ##### SECTION Long_Description ##### --> -<para> - -</para> - - -<!-- ##### SECTION See_Also ##### --> -<para> - -</para> - - -<!-- ##### SECTION Stability_Level ##### --> - - -<!-- ##### SECTION Image ##### --> - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/doc/version.xml new/gssdp-0.14.5/doc/version.xml --- old/gssdp-0.14.4/doc/version.xml 2013-07-30 09:13:25.000000000 +0200 +++ new/gssdp-0.14.5/doc/version.xml 2013-09-03 13:39:11.000000000 +0200 @@ -1 +1 @@ -0.14.4 +0.14.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/gtk-doc.make new/gssdp-0.14.5/gtk-doc.make --- old/gssdp-0.14.4/gtk-doc.make 2013-05-30 12:22:47.000000000 +0200 +++ new/gssdp-0.14.5/gtk-doc.make 2013-05-30 12:22:47.000000000 +0200 @@ -33,9 +33,9 @@ $(HTML_IMAGES) \ $(SETUP_FILES) -DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ +DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ - tmpl.stamp sgml.stamp html.stamp pdf.stamp + sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -87,12 +87,10 @@ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ - test -d $(abs_srcdir)/tmpl && \ - { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ - chmod -R u+w $(abs_builddir)/tmpl; } \ fi $(AM_V_at)touch setup-build.stamp + #### scan #### GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) @@ -129,35 +127,14 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - -GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V)) -GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_TMPL_0=@echo " DOC Rebuilding template files"; - -tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - if test -w $(abs_srcdir) ; then \ - cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ - fi \ - fi - $(AM_V_at)touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -$(srcdir)/tmpl/*.sgml: - @true - #### xml #### GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XML_0=@echo " DOC Building XML"; -sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - $(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) + $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ @@ -241,7 +218,6 @@ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ - rm -rf tmpl; \ fi maintainer-clean-local: @@ -289,9 +265,7 @@ endif dist-hook: dist-check-gtkdoc dist-hook-local - @mkdir $(distdir)/tmpl @mkdir $(distdir)/html - @-cp ./tmpl/*.sgml $(distdir)/tmpl @cp ./html/* $(distdir)/html @-cp ./$(DOC_MODULE).pdf $(distdir)/ @-cp ./$(DOC_MODULE).types $(distdir)/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/libgssdp/Makefile.am new/gssdp-0.14.5/libgssdp/Makefile.am --- old/gssdp-0.14.4/libgssdp/Makefile.am 2012-12-13 20:25:34.000000000 +0100 +++ new/gssdp-0.14.5/libgssdp/Makefile.am 2013-09-02 20:35:27.000000000 +0200 @@ -56,6 +56,10 @@ libgssdp_1_0_la_LDFLAGS += -no-undefined endif +if TARGET_ANDROID +libgssdp_1_0_la_LIBADD += -llog +endif + EXTRA_DIST = gssdp-marshal.list CLEANFILES = $(BUILT_SOURCES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/libgssdp/gssdp-client.c new/gssdp-0.14.5/libgssdp/gssdp-client.c --- old/gssdp-0.14.4/libgssdp/gssdp-client.c 2013-07-30 09:02:34.000000000 +0200 +++ new/gssdp-0.14.5/libgssdp/gssdp-client.c 2013-09-02 20:35:27.000000000 +0200 @@ -54,7 +54,13 @@ #ifndef G_OS_WIN32 #include <arpa/inet.h> #include <net/if.h> +#ifndef __BIONIC__ #include <ifaddrs.h> +#else +#include <sys/ioctl.h> +#include <net/if.h> +#include <stdlib.h> +#endif #endif #include <libsoup/soup-headers.h> @@ -69,6 +75,10 @@ #define INET6_ADDRSTRLEN 46 #endif +#ifdef __BIONIC__ +#include <android/log.h> +#endif + /* Size of the buffer used for reading from the socket */ #define BUF_SIZE 65536 @@ -1240,6 +1250,196 @@ g_free (adapters_addresses); return TRUE; +#elif __BIONIC__ + struct ifreq *ifaces = NULL; + struct ifreq *iface = NULL; + struct ifreq tmp_iface; + struct ifconf ifconfigs; + struct sockaddr_in *address, *netmask; + struct in_addr net_address; + uint32_t ip; + int if_buf_size, sock, i, if_num; + GList *if_ptr, *if_list = NULL; + + if ((sock = socket (AF_INET, SOCK_STREAM, 0)) < 0) { + __android_log_write (ANDROID_LOG_WARN, + "gssdp", + "Couldn't create socket"); + return FALSE; + } + + /* Fill ifaces with the available interfaces + * we incrementally proceed in chunks of 4 + * till getting the full list + */ + + if_buf_size = 0; + do { + if_buf_size += 4 * sizeof (struct ifreq); + ifaces = g_realloc (ifaces, if_buf_size); + ifconfigs.ifc_len = if_buf_size; + ifconfigs.ifc_buf = (char *) ifaces; + + /* FIXME: IPv4 only. This ioctl only deals with AF_INET */ + if (ioctl (sock, SIOCGIFCONF, &ifconfigs) == -1) { + __android_log_print (ANDROID_LOG_WARN, "gssdp", + "Couldn't get list of devices. Asked for: %d", + if_buf_size / sizeof (struct ifreq)); + + goto fail; + } + + } while (ifconfigs.ifc_len >= if_buf_size); + + if_num = ifconfigs.ifc_len / sizeof (struct ifreq); + + if (!device->iface_name) { + __android_log_print (ANDROID_LOG_DEBUG, "gssdp", + "Got list of %d interfaces. Looking for a suitable one", + if_num); + } else { + __android_log_print (ANDROID_LOG_DEBUG, "gssdp", + "List of %d interfaces ready. Now finding %s", + if_num, device->iface_name); + } + + /* Buildup prioritized interface list + */ + + for (i = 0; i < if_num; i++) { + + address = (struct sockaddr_in *) &(ifaces[i].ifr_addr); + + __android_log_print (ANDROID_LOG_DEBUG, + "gssdp", + "Trying interface: %s", + ifaces[i].ifr_name); + + if (!address->sin_addr.s_addr) { + __android_log_write (ANDROID_LOG_DEBUG, "gssdp", + "No configured address. Discarding"); + continue; + } + + memcpy (&tmp_iface, &ifaces[i], sizeof (struct ifreq)); + + if (ioctl (sock, SIOCGIFFLAGS, &tmp_iface) == -1) { + __android_log_write (ANDROID_LOG_DEBUG, "gssdp", + "Couldn't get flags. Discarding"); + continue; + } + + /* If an specific interface query was passed over.. */ + if (device->iface_name && + g_strcmp0 (device->iface_name, tmp_iface.ifr_name)) { + continue; + } else if (!(tmp_iface.ifr_flags & IFF_UP) || + tmp_iface.ifr_flags & IFF_POINTOPOINT) { + continue; + } + + /* Prefer non loopback */ + if (ifaces[i].ifr_flags & IFF_LOOPBACK) + if_list = g_list_append (if_list, ifaces + i); + else + if_list = g_list_prepend (if_list, ifaces + i); + + if (device->iface_name) + break; + } + + if (!g_list_length (if_list)) { + __android_log_write (ANDROID_LOG_DEBUG, + "gssdp", + "No usable interfaces found"); + goto fail; + } + + /* Fill device with data from the first interface + * we can get complete config info for and return + */ + + for (if_ptr = if_list; if_ptr != NULL; + if_ptr = g_list_next (if_ptr)) { + + iface = (struct ifreq *) if_ptr->data; + address = (struct sockaddr_in *) &(iface->ifr_addr); + netmask = (struct sockaddr_in *) &(iface->ifr_netmask); + + device->host_ip = g_malloc0 (INET_ADDRSTRLEN); + + if (inet_ntop (AF_INET, &(address->sin_addr), + device->host_ip, INET_ADDRSTRLEN) == NULL) { + + __android_log_print (ANDROID_LOG_INFO, + "gssdp", + "Failed to get ip for: %s, %s", + iface->ifr_name, + strerror (errno)); + + g_free (device->host_ip); + device->host_ip = NULL; + continue; + } + + ip = address->sin_addr.s_addr; + + if (ioctl (sock, SIOCGIFNETMASK, iface) == -1) { + __android_log_write (ANDROID_LOG_DEBUG, "gssdp", + "Couldn't get netmask. Discarding"); + g_free (device->host_ip); + device->host_ip = NULL; + continue; + } + + memcpy (&device->mask, netmask, sizeof (struct sockaddr_in)); + + if (device->network == NULL) { + device->network = g_malloc0 (INET_ADDRSTRLEN); + + net_address.s_addr = ip & netmask->sin_addr.s_addr; + + if (inet_ntop (AF_INET, &net_address, + device->network, INET_ADDRSTRLEN) == NULL) { + + __android_log_print (ANDROID_LOG_WARN, "gssdp", + "Failed to get nw for: %s, %s", + iface->ifr_name, strerror (errno)); + + g_free (device->host_ip); + device->host_ip = NULL; + g_free (device->network); + device->network = NULL; + continue; + } + } + + if (!device->iface_name) + device->iface_name = g_strdup (iface->ifr_name); + + goto success; + + } + + __android_log_write (ANDROID_LOG_WARN, "gssdp", + "Traversed whole list without finding a configured device"); + +fail: + __android_log_write (ANDROID_LOG_WARN, + "gssdp", + "Failed to get configuration for device"); + g_free (ifaces); + g_list_free (if_list); + close (sock); + return FALSE; +success: + __android_log_print (ANDROID_LOG_DEBUG, "gssdp", + "Returned config params for device: %s ip: %s network: %s", + device->iface_name, device->host_ip, device->network); + g_free (ifaces); + g_list_free (if_list); + close (sock); + return TRUE; #else struct ifaddrs *ifa_list, *ifa; GList *up_ifaces, *ifaceptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gssdp-0.14.4/libgssdp/gssdp-resource-browser.c new/gssdp-0.14.5/libgssdp/gssdp-resource-browser.c --- old/gssdp-0.14.4/libgssdp/gssdp-resource-browser.c 2013-07-30 08:54:38.000000000 +0200 +++ new/gssdp-0.14.5/libgssdp/gssdp-resource-browser.c 2013-09-03 12:24:47.000000000 +0200 @@ -385,6 +385,21 @@ /** * gssdp_resource_browser_new: * @client: The #GSSDPClient to associate with + * @target: A SSDP search target + * + * @target is a generic string the resource browser listens for on the SSDP + * bus. There are several possible targets such as + * <itemizedlist> + * <listitem><para>"ssdp:all" for everything</para></listitem> + * <listitem><para> + * "upnp:rootdevice" for UPnP device entry points, not caring about the + * device type</para></listitem> + * <listitem><para>The UUID of a specific device</para></listitem> + * <listitem><para>Device types such as + * "urn:schemas-upnp-org:device:MediaServer:1"</para></listitem> + * <listitem><para>Service types such as + * "urn:schemas-upnp-org:service:ContentDirectory:1"</para></listitem> + * </itemizedlist> * * Return value: A new #GSSDPResourceBrowser object. **/ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
