[gpsd-commit-watch] [SCM] GPSD branch, master, updated. release-3.16-96-ga2b3a39

[Jon Schlueter]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GPSD".

The branch, master has been updated
       via  a2b3a3980ba7fd5f740fe0bcf6eb0e2d9680c22e (commit)
       via  bd11bf845d8764667244154db995d6749ae84e17 (commit)
       via  286046427488c1200cb375388f30bb11ac3b85bf (commit)
       via  48083ca320afa1027067c8fe6f89119bb4d2efba (commit)
      from  709b6c4d01acc5e6e51afacd0668216b1e04a324 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a2b3a3980ba7fd5f740fe0bcf6eb0e2d9680c22e
Author: Fred Wright <address@hidden>
Date:   Tue Mar 8 13:54:25 2016 -0800

    Fixes Qt5 build on OSX.
    
    The workaround for the -rpath bug in scons breaks Qt5 linking on OSX
    because pkg-config --libs-only-* doesn't include the needed -framework
    option.  The fix is to make the hack optional, and only use it in the
    ncurses/tinfo cases where the -rpath is observed.  The other uses of
    pkg-config now just use the usual --libs flag.
    
    This also adds a message when Qt support is disabled due to the
    library's not being found (similar to the handling of some other
    libraries).
    
    It also gets rid of a silly use of lambdas for pkg_config().
    
    TESTED:
    Ran build-all, -h, and -c on OSX with no Qt, Qt4, Qt5, and shared=no,
    and verified that builds were successful and properly cleaned.  Also
    ran build-all, -h, and -c (with Qt absent) on Linux, FreeBSD, OpenBSD
    and NetBSD, with correct results (including not crashing on FreeBSD
    and ncurses getting disabled on NetBSD).
    
    Signed-off-by: Jon Schlueter <address@hidden>

commit bd11bf845d8764667244154db995d6749ae84e17
Author: Fred Wright <address@hidden>
Date:   Tue Mar 8 12:51:09 2016 -0800

    Fixes cleaning of Qt objects.
    
    The recent rework of the 'clean' handling broke the cleaning of the Qt
    objects, which was missed because Qt wasn't enabled in the testing.
    This fixes it by moving the Qt object setup outside the "not cleaning
    or helping" conditional, while suppressing the call on pkg_config in
    that case.
    
    It also creates the variables 'cleaning' and 'helping', so as not to
    have to make multiple calls on GetOption() for those options.
    
    TESTED:
    Ran "scons -c" after building with Qt, and verified that all build
    products were removed.
    
    Signed-off-by: Jon Schlueter <address@hidden>

commit 286046427488c1200cb375388f30bb11ac3b85bf
Author: Rob Norris <address@hidden>
Date:   Mon Feb 29 21:36:23 2016 +0000

    Move declarations of libgps_debug related functions and definitions.
    
    Move from gpsd.h to libgps.h
    
    This is the more logical place for this code
     and removes the dependency of test_libgps.c on gpsd.h
    
    Signed-off-by: Jon Schlueter <address@hidden>

commit 48083ca320afa1027067c8fe6f89119bb4d2efba
Author: Rob Norris <address@hidden>
Date:   Mon Mar 7 23:53:51 2016 +0000

    Remove duplicate <sys/socket.h> include.
    
    TESTED
    'scons build-all check' with and without qt passes.
    
    Signed-off-by: Jon Schlueter <address@hidden>

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

Summary of changes:
 SConstruct        |   44 ++++++++++++++++++++++++++------------------
 driver_nmea2000.c |    1 +
 gpsd.h-tail       |   14 --------------
 libgps.h          |   17 +++++++++++++++++
 libgps_sock.c     |    1 -
 test_libgps.c     |    3 ++-
 6 files changed, 46 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
GPSD