Hello community, here is the log from the commit of package iio-sensor-proxy for openSUSE:Factory checked in at 2017-11-07 10:03:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iio-sensor-proxy (Old) and /work/SRC/openSUSE:Factory/.iio-sensor-proxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iio-sensor-proxy" Tue Nov 7 10:03:04 2017 rev:11 rq:539274 version:2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/iio-sensor-proxy/iio-sensor-proxy.changes 2017-10-31 15:43:51.766072593 +0100 +++ /work/SRC/openSUSE:Factory/.iio-sensor-proxy.new/iio-sensor-proxy.changes 2017-11-07 10:03:54.229446857 +0100 @@ -1,0 +2,13 @@ +Sun Nov 5 15:17:26 UTC 2017 - badshah...@gmail.com + +- Update to version 2.4: + + Fix data being incorrectly read from sensors due to a naively + broken compilation fix. + + Support Geoclue running as a different user than "geoclue". +- Drop patches incorporated upstream: + + 0001-data-fix-permissions-when-geoclue-runs-with-a-differ.patch + (also drop BuildRequires on autotools and a run of autoreconf + in the build stage that this patch necessitated). + + iio-sensor-proxy-revert-cast-align-warnings-arm-fix.patch. + +------------------------------------------------------------------- Old: ---- 0001-data-fix-permissions-when-geoclue-runs-with-a-differ.patch iio-sensor-proxy-2.3.tar.xz iio-sensor-proxy-revert-cast-align-warnings-arm-fix.patch New: ---- iio-sensor-proxy-2.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iio-sensor-proxy.spec ++++++ --- /var/tmp/diff_new_pack.rNKOCa/_old 2017-11-07 10:03:57.185339613 +0100 +++ /var/tmp/diff_new_pack.rNKOCa/_new 2017-11-07 10:03:57.185339613 +0100 @@ -17,7 +17,7 @@ Name: iio-sensor-proxy -Version: 2.3 +Version: 2.4 Release: 0 Summary: Proxy for IIO and input subsystems License: GPL-3.0 @@ -25,13 +25,6 @@ Url: https://github.com/hadess/iio-sensor-proxy Source0: https://github.com/hadess/iio-sensor-proxy/releases/download/%{version}/%{name}-%{version}.tar.xz Source99: iio-sensor-proxy-rpmlintrc -# PATCH-FIX-UPSTREAM 0001-data-fix-permissions-when-geoclue-runs-with-a-differ.patch fcro...@suse.com -- Ensure we handle geoclue not running as geoclue user -Patch0: 0001-data-fix-permissions-when-geoclue-runs-with-a-differ.patch -# PATCH-FIX-UPSTREAM iio-sensor-proxy-revert-cast-align-warnings-arm-fix.patch boo#1061190 gh#hadess/iio-sensor-proxy#191 badshah...@opensuse.org -- Revert "iio-buffer-utils: Fix cast-align warnings on ARM" because it caused rotations on all devices to have undefined values. -# needed by patch0 -Patch1: iio-sensor-proxy-revert-cast-align-warnings-arm-fix.patch -BuildRequires: autoconf -BuildRequires: automake BuildRequires: pkgconfig BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) @@ -55,12 +48,8 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build -# needed by patch0 -autoreconf %configure --disable-gtk-tests --with-geoclue-user=srvGeoClue make %{?_smp_mflags} ++++++ iio-sensor-proxy-2.3.tar.xz -> iio-sensor-proxy-2.4.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/Makefile.in new/iio-sensor-proxy-2.4/Makefile.in --- old/iio-sensor-proxy-2.3/Makefile.in 2017-09-20 18:39:17.000000000 +0200 +++ new/iio-sensor-proxy-2.4/Makefile.in 2017-11-02 19:17:57.000000000 +0100 @@ -302,6 +302,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +geoclue_user = @geoclue_user@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/NEWS new/iio-sensor-proxy-2.4/NEWS --- old/iio-sensor-proxy-2.3/NEWS 2017-09-20 18:38:44.000000000 +0200 +++ new/iio-sensor-proxy-2.4/NEWS 2017-11-02 19:17:32.000000000 +0100 @@ -1,3 +1,10 @@ +2.4 +--- + +This release fixes data being incorrectly read from sensors due to +a naively broken compilation fix. It also supports Geoclue running +as a different user than "geoclue". + 2.3 --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/README new/iio-sensor-proxy-2.4/README --- old/iio-sensor-proxy-2.3/README 2017-08-16 16:44:41.000000000 +0200 +++ new/iio-sensor-proxy-2.4/README 2017-10-24 10:44:18.000000000 +0200 @@ -93,7 +93,7 @@ made iio-sensor-proxy fail to see any events coming from sensors until the sensor was power-cycled (unplugged and replugged, or suspended and resumed). -The bug was finally fixed in [this commit](https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git/commit/?h=fixes-togreg&id=eafad73ed3851707fa6e3124a255fc049ff9545d) +The bug was finally fixed in [this commit](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f1664eaacec31035450132c46ed2915fd2b2049a) in the upstream kernel and backported to stable releases. If you experience unresponsive sensors, ask your distributor to make sure this patch was applied to the version you're using. @@ -117,6 +117,7 @@ - Dell Inspiron 13 7000 - Dell Venue 11 Pro (7140) - Dell Venue 8 Pro +- Dell XPS 9365 - HP Pavilion X360 - HP Spectre x360 (Kaby Lake) - Lenovo IdeaPad Yoga 13 @@ -126,6 +127,7 @@ - Lenovo Yoga 2 13" and 11" - Lenovo Yoga 2 Pro - Lenovo Yoga 460 +- Lenovo Yoga 710-11ISK - Lenovo Yoga 900 - Microsoft Surface Pro 2 - Onda v975w diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/README.md new/iio-sensor-proxy-2.4/README.md --- old/iio-sensor-proxy-2.3/README.md 2017-08-16 16:44:41.000000000 +0200 +++ new/iio-sensor-proxy-2.4/README.md 2017-10-24 10:44:18.000000000 +0200 @@ -93,7 +93,7 @@ made iio-sensor-proxy fail to see any events coming from sensors until the sensor was power-cycled (unplugged and replugged, or suspended and resumed). -The bug was finally fixed in [this commit](https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git/commit/?h=fixes-togreg&id=eafad73ed3851707fa6e3124a255fc049ff9545d) +The bug was finally fixed in [this commit](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f1664eaacec31035450132c46ed2915fd2b2049a) in the upstream kernel and backported to stable releases. If you experience unresponsive sensors, ask your distributor to make sure this patch was applied to the version you're using. @@ -117,6 +117,7 @@ - Dell Inspiron 13 7000 - Dell Venue 11 Pro (7140) - Dell Venue 8 Pro +- Dell XPS 9365 - HP Pavilion X360 - HP Spectre x360 (Kaby Lake) - Lenovo IdeaPad Yoga 13 @@ -126,6 +127,7 @@ - Lenovo Yoga 2 13" and 11" - Lenovo Yoga 2 Pro - Lenovo Yoga 460 +- Lenovo Yoga 710-11ISK - Lenovo Yoga 900 - Microsoft Surface Pro 2 - Onda v975w diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/configure new/iio-sensor-proxy-2.4/configure --- old/iio-sensor-proxy-2.3/configure 2017-09-20 18:39:17.000000000 +0200 +++ new/iio-sensor-proxy-2.4/configure 2017-11-02 19:17:57.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for iio-sensor-proxy 2.3. +# Generated by GNU Autoconf 2.69 for iio-sensor-proxy 2.4. # # Report bugs to <had...@hadess.net>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='iio-sensor-proxy' PACKAGE_TARNAME='iio-sensor-proxy' -PACKAGE_VERSION='2.3' -PACKAGE_STRING='iio-sensor-proxy 2.3' +PACKAGE_VERSION='2.4' +PACKAGE_STRING='iio-sensor-proxy 2.4' PACKAGE_BUGREPORT='had...@hadess.net' PACKAGE_URL='' @@ -590,6 +590,7 @@ LTLIBOBJS LIBOBJS GDBUS_CODEGEN +geoclue_user IIO_SENSOR_PROXY_LIBS IIO_SENSOR_PROXY_CFLAGS HAVE_GTK_TESTS_FALSE @@ -729,6 +730,7 @@ with_udevrulesdir with_systemdsystemunitdir enable_gtk_tests +with_geoclue_user ' ac_precious_vars='build_alias host_alias @@ -1287,7 +1289,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 iio-sensor-proxy 2.3 to adapt to many kinds of systems. +\`configure' configures iio-sensor-proxy 2.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1358,7 +1360,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of iio-sensor-proxy 2.3:";; + short | recursive ) echo "Configuration of iio-sensor-proxy 2.4:";; esac cat <<\_ACEOF @@ -1387,6 +1389,9 @@ --with-udevrulesdir=DIR Directory for udev rules --with-systemdsystemunitdir=DIR Directory for systemd service files + --with-geoclue-user=USER + The USER (existing) as which geoclue service is + running (default: geoclue) Some influential environment variables: CC C compiler command @@ -1480,7 +1485,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -iio-sensor-proxy configure 2.3 +iio-sensor-proxy configure 2.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1581,7 +1586,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by iio-sensor-proxy $as_me 2.3, which was +It was created by iio-sensor-proxy $as_me 2.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2460,7 +2465,7 @@ # Define the identity of the package. PACKAGE='iio-sensor-proxy' - VERSION='2.3' + VERSION='2.4' cat >>confdefs.h <<_ACEOF @@ -5753,6 +5758,16 @@ fi + +# Check whether --with-geoclue-user was given. +if test "${with_geoclue_user+set}" = set; then : + withval=$with_geoclue_user; geoclue_user="$with_geoclue_user" +else + geoclue_user="geoclue" +fi + + + # Extract the first word of "gdbus-codegen", so it can be a program name with args. set dummy gdbus-codegen; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -6390,7 +6405,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by iio-sensor-proxy $as_me 2.3, which was +This file was extended by iio-sensor-proxy $as_me 2.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6447,7 +6462,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -iio-sensor-proxy config.status 2.3 +iio-sensor-proxy config.status 2.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/configure.ac new/iio-sensor-proxy-2.4/configure.ac --- old/iio-sensor-proxy-2.3/configure.ac 2017-09-20 18:38:59.000000000 +0200 +++ new/iio-sensor-proxy-2.4/configure.ac 2017-11-02 19:17:32.000000000 +0100 @@ -1,6 +1,6 @@ AC_PREREQ(2.59) -AC_INIT([iio-sensor-proxy], [2.3], [had...@hadess.net]) +AC_INIT([iio-sensor-proxy], [2.4], [had...@hadess.net]) AX_IS_RELEASE([git-directory]) @@ -51,6 +51,13 @@ PKG_CHECK_MODULES(IIO_SENSOR_PROXY, gio-2.0 gudev-1.0 >= 232) +AC_ARG_WITH(geoclue-user, + AS_HELP_STRING([--with-geoclue-user=USER], + [The USER (existing) as which geoclue service is running (default: geoclue)]), + geoclue_user="$with_geoclue_user", + geoclue_user="geoclue") +AC_SUBST(geoclue_user) + AC_PATH_PROG([GDBUS_CODEGEN],[gdbus-codegen]) AC_CONFIG_FILES([ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/data/Makefile.am new/iio-sensor-proxy-2.4/data/Makefile.am --- old/iio-sensor-proxy-2.3/data/Makefile.am 2016-09-13 14:22:44.000000000 +0200 +++ new/iio-sensor-proxy-2.4/data/Makefile.am 2017-11-02 19:17:32.000000000 +0100 @@ -9,5 +9,9 @@ dbusconfdir = $(sysconfdir)/dbus-1/system.d dbusconf_DATA = net.hadess.SensorProxy.conf -CLEANFILES = iio-sensor-proxy.service -EXTRA_DIST = $(udevrules_DATA) $(dbusconf_DATA) $(systemdservice_in_files) +net.hadess.SensorProxy.conf: net.hadess.SensorProxy.conf.in Makefile + @sed -e "s|\@geoclue_user\@|$(geoclue_user)|" $< > $@ + + +CLEANFILES = iio-sensor-proxy.service net.hadess.SensorProxy.conf +EXTRA_DIST = $(udevrules_DATA) $(dbusconf_DATA) $(systemdservice_in_files) net.hadess.SensorProxy.conf.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/data/Makefile.in new/iio-sensor-proxy-2.4/data/Makefile.in --- old/iio-sensor-proxy-2.3/data/Makefile.in 2017-09-20 18:39:17.000000000 +0200 +++ new/iio-sensor-proxy-2.4/data/Makefile.in 2017-11-02 19:17:57.000000000 +0100 @@ -245,6 +245,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +geoclue_user = @geoclue_user@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -281,8 +282,8 @@ systemdservice_DATA = iio-sensor-proxy.service dbusconfdir = $(sysconfdir)/dbus-1/system.d dbusconf_DATA = net.hadess.SensorProxy.conf -CLEANFILES = iio-sensor-proxy.service -EXTRA_DIST = $(udevrules_DATA) $(dbusconf_DATA) $(systemdservice_in_files) +CLEANFILES = iio-sensor-proxy.service net.hadess.SensorProxy.conf +EXTRA_DIST = $(udevrules_DATA) $(dbusconf_DATA) $(systemdservice_in_files) net.hadess.SensorProxy.conf.in all: all-am .SUFFIXES: @@ -542,6 +543,9 @@ iio-sensor-proxy.service: iio-sensor-proxy.service.in Makefile $(AM_V_GEN) $(SED) -e "s|\@sbindir\@|$(sbindir)|" $< > $@ +net.hadess.SensorProxy.conf: net.hadess.SensorProxy.conf.in Makefile + @sed -e "s|\@geoclue_user\@|$(geoclue_user)|" $< > $@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/data/net.hadess.SensorProxy.conf.in new/iio-sensor-proxy-2.4/data/net.hadess.SensorProxy.conf.in --- old/iio-sensor-proxy-2.3/data/net.hadess.SensorProxy.conf.in 1970-01-01 01:00:00.000000000 +0100 +++ new/iio-sensor-proxy-2.4/data/net.hadess.SensorProxy.conf.in 2017-10-06 11:49:39.000000000 +0200 @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- --> + +<!DOCTYPE busconfig PUBLIC + "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd";> +<busconfig> + + <!-- Only root can own the service --> + <policy user="root"> + <allow own="net.hadess.SensorProxy"/> + </policy> + + <!-- Only Geoclue can access the compass --> + <policy user="@geoclue_user@"> + <allow send_destination="net.hadess.SensorProxy" send_interface="net.hadess.SensorProxy.Compass" send_path="/net/hadess/SensorProxy/Compass"/> + <allow send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Introspectable" send_path="/net/hadess/SensorProxy/Compass"/> + <allow send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Properties" send_path="/net/hadess/SensorProxy/Compass"/> + <allow send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Peer" send_path="/net/hadess/SensorProxy/Compass"/> + </policy> + + <!-- Anyone can talk to the main interface --> + <policy context="default"> + <allow send_destination="net.hadess.SensorProxy" send_interface="net.hadess.SensorProxy"/> + <allow send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Introspectable"/> + <allow send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Properties"/> + <allow send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Peer"/> + <deny send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Introspectable" send_path="/net/hadess/SensorProxy/Compass"/> + <deny send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Properties" send_path="/net/hadess/SensorProxy/Compass"/> + <deny send_destination="net.hadess.SensorProxy" send_interface="org.freedesktop.DBus.Peer" send_path="/net/hadess/SensorProxy/Compass"/> + <!-- <deny send_destination="net.hadess.SensorProxy" send_interface="net.hadess.SensorProxy.Compass"/> --> + </policy> + +</busconfig> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/docs/Makefile.in new/iio-sensor-proxy-2.4/docs/Makefile.in --- old/iio-sensor-proxy-2.3/docs/Makefile.in 2017-09-20 18:39:17.000000000 +0200 +++ new/iio-sensor-proxy-2.4/docs/Makefile.in 2017-11-02 19:17:57.000000000 +0100 @@ -221,6 +221,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +geoclue_user = @geoclue_user@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -346,34 +347,34 @@ @GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp #### setup #### -GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) -GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_@AM_V@) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_@AM_DEFAULT_V@) GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; #### scan #### -GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) -GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_@AM_V@) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_@AM_DEFAULT_V@) GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; -GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) -GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_@AM_V@) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@) GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; #### 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 = $(GTK_DOC_V_XML_@AM_V@) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_@AM_DEFAULT_V@) GTK_DOC_V_XML_0 = @echo " DOC Building XML"; #### html #### -GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) -GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_@AM_V@) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_@AM_DEFAULT_V@) GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; -GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) -GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_@AM_V@) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_@AM_DEFAULT_V@) GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; #### pdf #### -GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) -GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_@AM_V@) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_@AM_DEFAULT_V@) GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am @@ -591,38 +592,38 @@ setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_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 -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ - done; \ - fi; \ + files=`echo $(SETUP_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 -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ + fi; \ fi $(AM_V_at)touch setup-build.stamp 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" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - scanobj_options=""; \ - gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$$?" = "0"; then \ - if test "x$(V)" = "x1"; then \ - scanobj_options="--verbose"; \ - fi; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ fi; \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ - gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ else \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ fi $(AM_V_at)touch scan-build.stamp @@ -632,7 +633,7 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) $(AM_V_at)touch sgml-build.stamp @@ -667,12 +668,8 @@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@test "x$(HTML_IMAGES)" = "x" || \ for file in $(HTML_IMAGES) ; do \ - if test -f $(abs_srcdir)/$$file ; then \ - cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ - fi; \ - if test -f $(abs_builddir)/$$file ; then \ - cp $(abs_builddir)/$$file $(abs_builddir)/html; \ - fi; \ + test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \ done; $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) $(AM_V_at)touch html-build.stamp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/docs/html/gdbus-net.hadess.SensorProxy.Compass.html new/iio-sensor-proxy-2.4/docs/html/gdbus-net.hadess.SensorProxy.Compass.html --- old/iio-sensor-proxy-2.3/docs/html/gdbus-net.hadess.SensorProxy.Compass.html 2017-09-20 18:39:24.000000000 +0200 +++ new/iio-sensor-proxy-2.4/docs/html/gdbus-net.hadess.SensorProxy.Compass.html 2017-11-02 19:18:01.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="ref-dbus.html" title="D-Bus API Reference"> <link rel="prev" href="gdbus-net.hadess.SensorProxy.html" title="net.hadess.SensorProxy"> <link rel="next" href="ix01.html" title="Index"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.26 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -112,6 +112,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.26</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/docs/html/gdbus-net.hadess.SensorProxy.html new/iio-sensor-proxy-2.4/docs/html/gdbus-net.hadess.SensorProxy.html --- old/iio-sensor-proxy-2.3/docs/html/gdbus-net.hadess.SensorProxy.html 2017-09-20 18:39:24.000000000 +0200 +++ new/iio-sensor-proxy-2.4/docs/html/gdbus-net.hadess.SensorProxy.html 2017-11-02 19:18:01.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="ref-dbus.html" title="D-Bus API Reference"> <link rel="prev" href="ref-dbus.html" title="D-Bus API Reference"> <link rel="next" href="gdbus-net.hadess.SensorProxy.Compass.html" title="net.hadess.SensorProxy.Compass"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.26 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -188,6 +188,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.26</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/docs/html/index.html new/iio-sensor-proxy-2.4/docs/html/index.html --- old/iio-sensor-proxy-2.3/docs/html/index.html 2017-09-20 18:39:24.000000000 +0200 +++ new/iio-sensor-proxy-2.4/docs/html/index.html 2017-11-02 19:18:01.000000000 +0100 @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="Sensor Proxy Reference Manual"> <link rel="next" href="ref-dbus.html" title="D-Bus API Reference"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.26 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,7 +22,7 @@ <code class="email"><<a class="email" href="mailto:had...@hadess.net";>had...@hadess.net</a>></code><br> </p></div></div> </div></div></div> -<div><p class="releaseinfo">Version 2.3 +<div><p class="releaseinfo">Version 2.4 </p></div> <div><p class="copyright">Copyright © 2015 Red Hat, Inc.</p></div> <div><div class="legalnotice"> @@ -72,6 +72,6 @@ </dl></div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.26</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/docs/html/ix01.html new/iio-sensor-proxy-2.4/docs/html/ix01.html --- old/iio-sensor-proxy-2.3/docs/html/ix01.html 2017-09-20 18:39:24.000000000 +0200 +++ new/iio-sensor-proxy-2.4/docs/html/ix01.html 2017-11-02 19:18:01.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Sensor Proxy Reference Manual"> <link rel="prev" href="gdbus-net.hadess.SensorProxy.Compass.html" title="net.hadess.SensorProxy.Compass"> <link rel="next" href="license.html" title="Appendix A. License"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.26 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -25,40 +25,40 @@ <div xmlns:xlink="http://www.w3.org/1999/xlink"; class="index"><div class="indexdiv"> <h3>N</h3> <dl> -<dt id="ientry-idm140244601422144">net.hadess.SensorProxy, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-interface-net-hadess-SensorProxy.top_of_page">net.hadess.SensorProxy</a> +<dt id="ientry-idm140581295620688">net.hadess.SensorProxy, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-interface-net-hadess-SensorProxy.top_of_page">net.hadess.SensorProxy</a> </dt> -<dt id="ientry-idm140244607833040">net.hadess.SensorProxy.ClaimAccelerometer(), <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-method-net-hadess-SensorProxy.ClaimAccelerometer">The ClaimAccelerometer() method</a> +<dt id="ientry-idm140581302157616">net.hadess.SensorProxy.ClaimAccelerometer(), <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-method-net-hadess-SensorProxy.ClaimAccelerometer">The ClaimAccelerometer() method</a> </dt> -<dt id="ientry-idm140244607459024">net.hadess.SensorProxy.ClaimLight(), <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-method-net-hadess-SensorProxy.ClaimLight">The ClaimLight() method</a> +<dt id="ientry-idm140581302132016">net.hadess.SensorProxy.ClaimLight(), <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-method-net-hadess-SensorProxy.ClaimLight">The ClaimLight() method</a> </dt> -<dt id="ientry-idm140244600711328">net.hadess.SensorProxy.Compass, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.Compass.html#gdbus-interface-net-hadess-SensorProxy-Compass.top_of_page">net.hadess.SensorProxy.Compass</a> +<dt id="ientry-idm140581294781600">net.hadess.SensorProxy.Compass, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.Compass.html#gdbus-interface-net-hadess-SensorProxy-Compass.top_of_page">net.hadess.SensorProxy.Compass</a> </dt> -<dt id="ientry-idm140244600646016">net.hadess.SensorProxy.Compass.ClaimCompass(), <a class="indexterm" href="gdbus-net.hadess.SensorProxy.Compass.html#gdbus-method-net-hadess-SensorProxy-Compass.ClaimCompass">The ClaimCompass() method</a> +<dt id="ientry-idm140581294556400">net.hadess.SensorProxy.Compass.ClaimCompass(), <a class="indexterm" href="gdbus-net.hadess.SensorProxy.Compass.html#gdbus-method-net-hadess-SensorProxy-Compass.ClaimCompass">The ClaimCompass() method</a> </dt> -<dt id="ientry-idm140244602300272">net.hadess.SensorProxy.Compass.ReleaseCompass(), <a class="indexterm" href="gdbus-net.hadess.SensorProxy.Compass.html#gdbus-method-net-hadess-SensorProxy-Compass.ReleaseCompass">The ReleaseCompass() method</a> +<dt id="ientry-idm140581294551248">net.hadess.SensorProxy.Compass.ReleaseCompass(), <a class="indexterm" href="gdbus-net.hadess.SensorProxy.Compass.html#gdbus-method-net-hadess-SensorProxy-Compass.ReleaseCompass">The ReleaseCompass() method</a> </dt> -<dt id="ientry-idm140244601891856">net.hadess.SensorProxy.Compass:CompassHeading, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.Compass.html#gdbus-property-net-hadess-SensorProxy-Compass.CompassHeading">The "CompassHeading" property</a> +<dt id="ientry-idm140581297335056">net.hadess.SensorProxy.Compass:CompassHeading, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.Compass.html#gdbus-property-net-hadess-SensorProxy-Compass.CompassHeading">The "CompassHeading" property</a> </dt> -<dt id="ientry-idm140244602294496">net.hadess.SensorProxy.Compass:HasCompass, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.Compass.html#gdbus-property-net-hadess-SensorProxy-Compass.HasCompass">The "HasCompass" property</a> +<dt id="ientry-idm140581297339248">net.hadess.SensorProxy.Compass:HasCompass, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.Compass.html#gdbus-property-net-hadess-SensorProxy-Compass.HasCompass">The "HasCompass" property</a> </dt> -<dt id="ientry-idm140244607826832">net.hadess.SensorProxy.ReleaseAccelerometer(), <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-method-net-hadess-SensorProxy.ReleaseAccelerometer">The ReleaseAccelerometer() method</a> +<dt id="ientry-idm140581302136848">net.hadess.SensorProxy.ReleaseAccelerometer(), <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-method-net-hadess-SensorProxy.ReleaseAccelerometer">The ReleaseAccelerometer() method</a> </dt> -<dt id="ientry-idm140244607820800">net.hadess.SensorProxy.ReleaseLight(), <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-method-net-hadess-SensorProxy.ReleaseLight">The ReleaseLight() method</a> +<dt id="ientry-idm140581302125520">net.hadess.SensorProxy.ReleaseLight(), <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-method-net-hadess-SensorProxy.ReleaseLight">The ReleaseLight() method</a> </dt> -<dt id="ientry-idm140244607809888">net.hadess.SensorProxy:AccelerometerOrientation, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-property-net-hadess-SensorProxy.AccelerometerOrientation">The "AccelerometerOrientation" property</a> +<dt id="ientry-idm140581302114608">net.hadess.SensorProxy:AccelerometerOrientation, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-property-net-hadess-SensorProxy.AccelerometerOrientation">The "AccelerometerOrientation" property</a> </dt> -<dt id="ientry-idm140244607814176">net.hadess.SensorProxy:HasAccelerometer, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-property-net-hadess-SensorProxy.HasAccelerometer">The "HasAccelerometer" property</a> +<dt id="ientry-idm140581302118896">net.hadess.SensorProxy:HasAccelerometer, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-property-net-hadess-SensorProxy.HasAccelerometer">The "HasAccelerometer" property</a> </dt> -<dt id="ientry-idm140244601676320">net.hadess.SensorProxy:HasAmbientLight, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-property-net-hadess-SensorProxy.HasAmbientLight">The "HasAmbientLight" property</a> +<dt id="ientry-idm140581295579648">net.hadess.SensorProxy:HasAmbientLight, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-property-net-hadess-SensorProxy.HasAmbientLight">The "HasAmbientLight" property</a> </dt> -<dt id="ientry-idm140244601667296">net.hadess.SensorProxy:LightLevel, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-property-net-hadess-SensorProxy.LightLevel">The "LightLevel" property</a> +<dt id="ientry-idm140581295570624">net.hadess.SensorProxy:LightLevel, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-property-net-hadess-SensorProxy.LightLevel">The "LightLevel" property</a> </dt> -<dt id="ientry-idm140244601672352">net.hadess.SensorProxy:LightLevelUnit, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-property-net-hadess-SensorProxy.LightLevelUnit">The "LightLevelUnit" property</a> +<dt id="ientry-idm140581295575680">net.hadess.SensorProxy:LightLevelUnit, <a class="indexterm" href="gdbus-net.hadess.SensorProxy.html#gdbus-property-net-hadess-SensorProxy.LightLevelUnit">The "LightLevelUnit" property</a> </dt> </dl> </div></div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.26</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/docs/html/license.html new/iio-sensor-proxy-2.4/docs/html/license.html --- old/iio-sensor-proxy-2.3/docs/html/license.html 2017-09-20 18:39:24.000000000 +0200 +++ new/iio-sensor-proxy-2.4/docs/html/license.html 2017-11-02 19:18:01.000000000 +0100 @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="Sensor Proxy Reference Manual"> <link rel="up" href="index.html" title="Sensor Proxy Reference Manual"> <link rel="prev" href="ix01.html" title="Index"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.26 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -702,6 +702,6 @@ </p> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.26</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/docs/html/ref-dbus.html new/iio-sensor-proxy-2.4/docs/html/ref-dbus.html --- old/iio-sensor-proxy-2.3/docs/html/ref-dbus.html 2017-09-20 18:39:24.000000000 +0200 +++ new/iio-sensor-proxy-2.4/docs/html/ref-dbus.html 2017-11-02 19:18:01.000000000 +0100 @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Sensor Proxy Reference Manual"> <link rel="prev" href="index.html" title="Sensor Proxy Reference Manual"> <link rel="next" href="gdbus-net.hadess.SensorProxy.html" title="net.hadess.SensorProxy"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.26 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -45,6 +45,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.26</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/gtk-doc.make new/iio-sensor-proxy-2.4/gtk-doc.make --- old/iio-sensor-proxy-2.3/gtk-doc.make 2017-08-31 17:26:37.000000000 +0200 +++ new/iio-sensor-proxy-2.4/gtk-doc.make 2017-10-09 15:56:45.000000000 +0200 @@ -81,55 +81,54 @@ #### setup #### -GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) -GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_@AM_V@) +GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_@AM_DEFAULT_V@) GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_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 -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ - done; \ - fi; \ + files=`echo $(SETUP_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 -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ + fi; \ fi $(AM_V_at)touch setup-build.stamp - #### scan #### -GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) -GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_@AM_V@) +GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_@AM_DEFAULT_V@) GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; -GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V)) -GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_@AM_V@) +GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@) GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; 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" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - scanobj_options=""; \ - gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$$?" = "0"; then \ - if test "x$(V)" = "x1"; then \ - scanobj_options="--verbose"; \ - fi; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ fi; \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ - gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ else \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ fi $(AM_V_at)touch scan-build.stamp @@ -138,14 +137,14 @@ #### 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=$(GTK_DOC_V_XML_@AM_V@) +GTK_DOC_V_XML_=$(GTK_DOC_V_XML_@AM_DEFAULT_V@) GTK_DOC_V_XML_0=@echo " DOC Building XML"; sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) $(AM_V_at)touch sgml-build.stamp @@ -166,12 +165,12 @@ #### html #### -GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) -GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_@AM_V@) +GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_@AM_DEFAULT_V@) GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; -GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) -GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_@AM_V@) +GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_@AM_DEFAULT_V@) GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) @@ -190,20 +189,16 @@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@test "x$(HTML_IMAGES)" = "x" || \ for file in $(HTML_IMAGES) ; do \ - if test -f $(abs_srcdir)/$$file ; then \ - cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ - fi; \ - if test -f $(abs_builddir)/$$file ; then \ - cp $(abs_builddir)/$$file $(abs_builddir)/html; \ - fi; \ + test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \ done; $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) $(AM_V_at)touch html-build.stamp #### pdf #### -GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) -GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_@AM_V@) +GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_@AM_DEFAULT_V@) GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/src/Makefile.in new/iio-sensor-proxy-2.4/src/Makefile.in --- old/iio-sensor-proxy-2.3/src/Makefile.in 2017-09-20 18:39:18.000000000 +0200 +++ new/iio-sensor-proxy-2.4/src/Makefile.in 2017-11-02 19:17:57.000000000 +0100 @@ -316,6 +316,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +geoclue_user = @geoclue_user@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/src/drv-input-accel.c new/iio-sensor-proxy-2.4/src/drv-input-accel.c --- old/iio-sensor-proxy-2.3/src/drv-input-accel.c 2017-08-31 17:48:39.000000000 +0200 +++ new/iio-sensor-proxy-2.4/src/drv-input-accel.c 2017-10-24 10:45:18.000000000 +0200 @@ -199,6 +199,8 @@ drv_data->parent = g_udev_device_get_parent (drv_data->dev); drv_data->dev_path = g_udev_device_get_device_file (device); drv_data->name = g_udev_device_get_property (device, "NAME"); + if (!drv_data->name) + drv_data->name = g_udev_device_get_property (device, "ID_MODEL"); drv_data->client = g_udev_client_new (subsystems); mount_matrix = g_udev_device_get_property (device, "ACCEL_MOUNT_MATRIX"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iio-sensor-proxy-2.3/src/iio-buffer-utils.c new/iio-sensor-proxy-2.4/src/iio-buffer-utils.c --- old/iio-sensor-proxy-2.3/src/iio-buffer-utils.c 2017-09-07 04:19:16.000000000 +0200 +++ new/iio-sensor-proxy-2.4/src/iio-buffer-utils.c 2017-11-02 19:17:32.000000000 +0100 @@ -44,6 +44,48 @@ unsigned location; }; +#define _IIO_GETU(__data, __idx, __size, __shift) \ + (((guint##__size) (((const guint8 *) (__data))[__idx])) << (__shift)) + +#define _IIO_READ_UINT32_BE(data) (_IIO_GETU (data, 0, 32, 24) | \ + _IIO_GETU (data, 1, 32, 16) | \ + _IIO_GETU (data, 2, 32, 8) | \ + _IIO_GETU (data, 3, 32, 0)) + +#define _IIO_READ_UINT32_LE(data) (_IIO_GETU (data, 3, 32, 24) | \ + _IIO_GETU (data, 2, 32, 16) | \ + _IIO_GETU (data, 1, 32, 8) | \ + _IIO_GETU (data, 0, 32, 0)) + +static inline guint32 +iio_readu32 (struct iio_channel_info *info, const guint8 * data) +{ + if (info->be) + return _IIO_READ_UINT32_BE (data + info->location); + return _IIO_READ_UINT32_LE(data + info->location); +} + +#define _IIO_GET(__data, __idx, __size, __shift) \ + (((guint##__size) (((const guint8 *) (__data))[__idx])) << (__shift)) + +#define _IIO_READ_INT32_BE(data) (_IIO_GET (data, 0, 32, 24) | \ + _IIO_GET (data, 1, 32, 16) | \ + _IIO_GET (data, 2, 32, 8) | \ + _IIO_GET (data, 3, 32, 0)) + +#define _IIO_READ_INT32_LE(data) (_IIO_GET (data, 3, 32, 24) | \ + _IIO_GET (data, 2, 32, 16) | \ + _IIO_GET (data, 1, 32, 8) | \ + _IIO_GET (data, 0, 32, 0)) + +static inline gint32 +iio_read32 (struct iio_channel_info *info, const gint8 * data) +{ + if (info->be) + return _IIO_READ_INT32_BE (data + info->location); + return _IIO_READ_INT32_LE(data + info->location); +} + static char * iioutils_break_up_name (const char *name) { @@ -493,14 +535,14 @@ /* only a few cases implemented so far */ case 4: if (!buffer_data->channels[k]->is_signed) { - guint32 val = *(data + buffer_data->channels[k]->location); + guint32 val = iio_readu32(buffer_data->channels[k], (guint8 *) data); val = val >> buffer_data->channels[k]->shift; if (buffer_data->channels[k]->bits_used < 32) val &= ((guint32) 1 << buffer_data->channels[k]->bits_used) - 1; *ch_val = (int) val; *ch_present = TRUE; } else { - gint32 val = *(data + buffer_data->channels[k]->location); + gint32 val = iio_read32(buffer_data->channels[k], (gint8 *) data); val = val >> buffer_data->channels[k]->shift; if (buffer_data->channels[k]->bits_used < 32) val &= ((guint32) 1 << buffer_data->channels[k]->bits_used) - 1;
