Changeset 31853


Ignore:
Timestamp:
2012-05-24T06:29:36+02:00 (6 years ago)
Author:
swalker
Message:

[packages] gpsd: update to 3.6

  • add staging prefix patch for the pkg-config wrapper variables
  • re-enable libusb support
  • add a gpsd-clients package (#7879)
  • drop obsolete patches
Location:
packages/net/gpsd
Files:
1 added
2 deleted
1 edited
1 moved

Legend:

Unmodified
Added
Removed
  • packages/net/gpsd/Makefile

    r31621 r31853  
    11# 
    2 # Copyright (C) 2006-2011 OpenWrt.org 
     2# Copyright (C) 2006-2012 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    99 
    1010PKG_NAME:=gpsd 
    11 PKG_REV:=ffcc14068ada0d565f237efa56c7cd723847ca04 
    12 PKG_VERSION:=3.5-20120414 
    13 #PKG_VERSION:=20110917 
    14 PKG_RELEASE:=5 
     11PKG_VERSION:=3.6 
     12PKG_RELEASE:=1 
    1513 
    16 #PKG_SOURCE_URL:=http://download-mirror.savannah.gnu.org/releases/gpsd/ 
    17 #PKG_MD5SUM:=c01353459faa68834309109d4e868460 
     14PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     15PKG_SOURCE_URL:=http://download-mirror.savannah.gnu.org/releases/gpsd 
     16PKG_MD5SUM:=064a5ad75593f8c3ea3fe85010647832 
    1817 
    19 #PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    20 PKG_SOURCE_URL:=git://git.sv.gnu.org/gpsd.git 
    21 PKG_SOURCE_PROTO:=git 
    22 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) 
    23 PKG_SOURCE_VERSION:=$(PKG_REV) 
    24 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    25  
    26 PKG_BUILD_DEPENDS:=libncurses 
     18PKG_BUILD_DEPENDS:=libncurses libusb-1.0 
    2719 
    2820include $(INCLUDE_DIR)/package.mk 
     
    6153endef 
    6254 
    63 define Package/cgps 
     55define Package/gpsd-clients 
    6456  $(call Package/gpsd/Default) 
    6557  SECTION:=net 
    6658  CATEGORY:=Network 
    67   DEPENDS+= +libgps +libncurses 
    68   TITLE:=Test client for gpsd 
     59  DEPENDS+= +libgps +libgpsd +libncurses 
     60  TITLE:=GPS tools and clients 
    6961endef 
    7062 
    71 define Package/cgps/description 
     63define Package/gpsd-clients/description 
    7264  $(call Package/gpsd/Default/description) 
    73   This package contains a GPS test client. 
     65  This package contains auxiliary tools and example clients for monitoring and 
     66  testing the GPS daemon. 
    7467endef 
    7568 
     
    7871  SECTION:=libs 
    7972  CATEGORY:=Libraries 
     73  DEPENDS+= +libcap 
    8074  TITLE:=C service library for communicating with the GPS daemon 
    8175endef 
     
    9084  SECTION:=libs 
    9185  CATEGORY:=Libraries 
     86  DEPENDS+= +libcap +libusb-1.0 
    9287  TITLE:=C service library for GPS applications 
    9388endef 
     
    114109        strip=no \ 
    115110        python=no \ 
    116         usb=no \ 
    117         implicit_link=no 
     111        implicit_link=no \ 
     112        chrpath=no 
    118113 
    119114define Build/InstallDev 
     
    139134endef 
    140135 
    141 define Package/cgps/install 
     136define Package/gpsd-clients/install 
    142137        $(INSTALL_DIR) $(1)/usr/bin 
    143         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cgps $(1)/usr/bin/ 
     138        $(INSTALL_BIN) \ 
     139                $(PKG_INSTALL_DIR)/usr/bin/cgps \ 
     140                $(PKG_INSTALL_DIR)/usr/bin/gps{ctl,decode,mon,pipe} \ 
     141                $(PKG_INSTALL_DIR)/usr/bin/gpxlogger \ 
     142                $(PKG_INSTALL_DIR)/usr/bin/lcdgps \ 
     143                $(1)/usr/bin/ 
    144144endef 
    145145 
     
    155155 
    156156$(eval $(call BuildPackage,gpsd)) 
    157 $(eval $(call BuildPackage,cgps)) 
     157$(eval $(call BuildPackage,gpsd-clients)) 
    158158$(eval $(call BuildPackage,libgps)) 
    159159$(eval $(call BuildPackage,libgpsd)) 
  • packages/net/gpsd/patches/002-no_rpath.patch

    r31852 r31853  
    11--- a/SConstruct 
    22+++ b/SConstruct 
    3 @@ -270,8 +270,6 @@ def installdir(dir, add_destdir=True): 
     3@@ -269,8 +269,6 @@ def installdir(dir, add_destdir=True): 
    44  
    55 # Honor the specified installation prefix in link paths. 
     
    1010 # Give deheader a way to set compiler flags 
    1111 if 'MORECFLAGS' in os.environ: 
    12 @@ -390,17 +388,6 @@ config = Configure(env, custom_tests = { 
    13                                           'CheckXsltproc' : CheckXsltproc}) 
    14   
    15  env.Prepend(LIBPATH=[os.path.realpath(os.curdir)]) 
    16 -if config.CheckExecutable('$CHRPATH -v', 'chrpath'): 
    17 -    # Tell generated binaries to look in the current directory for 
    18 -    # shared libraries so we can run tests without hassle. Should be 
    19 -    # handled sanely by scons on all systems.  Not good to use '.' or 
    20 -    # a relative path here; it's a security risk.  At install time we 
    21 -    # use chrpath to edit this out of RPATH. 
    22 -    if env["shared"]: 
    23 -        env.Prepend(RPATH=[os.path.realpath(os.curdir)]) 
    24 -else: 
    25 -    print "chrpath is not available, forcing static linking." 
    26 -    env["shared"] = False 
    27   
    28  confdefs = ["/* gpsd_config.h.  Generated by scons, do not hand-hack.  */\n"] 
    29   
    30 @@ -1147,11 +1134,6 @@ binaryinstall.append(LibraryInstall(env, 
    31  if qt_env: 
    32      binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib)) 
    33   
    34 -# We don't use installdir here in order to avoid having DESTDIR affect the rpath 
    35 -if env["shared"]: 
    36 -    env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ 
    37 -                      % (installdir('libdir', False), )) 
    38 - 
    39  if not env['debug'] and not env['profiling'] and env['strip']: 
    40      env.AddPostAction(binaryinstall, '$STRIP $TARGET') 
    41   
Note: See TracChangeset for help on using the changeset viewer.