diff options
Diffstat (limited to 'meta-oe/recipes-navigation')
24 files changed, 361 insertions, 626 deletions
diff --git a/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch b/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch new file mode 100644 index 0000000000..18e7185649 --- /dev/null +++ b/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch @@ -0,0 +1,30 @@ +From 6c434bdd31d674f85a82cb83248571813c7a37ff Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 3 May 2023 18:06:46 +0200 +Subject: [PATCH] libgeoclue: don't try to use g-ir-scanner when introspection + isn't enabled + +* it finds target g-ir-scanner, so gir is found(), but when it tries to call it, it fails: + http://errors.yoctoproject.org/Errors/Details/702778/ + geoclue/2.7.0-r0/recipe-sysroot/usr/bin/g-ir-scanner-wrapper: line 5: g-ir-scanner: command not found + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- +Upstream-Status: Pending + + libgeoclue/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgeoclue/meson.build b/libgeoclue/meson.build +index 5f05dad..7ed06a1 100644 +--- a/libgeoclue/meson.build ++++ b/libgeoclue/meson.build +@@ -77,7 +77,7 @@ gir_sources = [ libgeoclue_sources, + libgeoclue_headers, + libgeoclue_public_api_gen_sources[1] ] + +-if gir.found() ++if gir.found() and get_option('introspection') + geo_gir = gnome.generate_gir(libgeoclue, + sources: gir_sources, + namespace: 'Geoclue', diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.5.7.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.7.1.bb index 6c0b922c92..9fcd1e6f1e 100644 --- a/meta-oe/recipes-navigation/geoclue/geoclue_2.5.7.bb +++ b/meta-oe/recipes-navigation/geoclue/geoclue_2.7.1.bb @@ -3,45 +3,59 @@ DESCRIPTION = "Geoclue is a D-Bus service that provides location information. \ The primary goal of the Geoclue project is to make creating location-aware applications \ as simple as possible, while the secondary goal is to ensure that no application \ can access location information without explicit permission from user." -LICENSE = "GPLv2.0+" +LICENSE = "GPL-2.0-or-later" SECTION = "console/network" LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6" -DEPENDS = "glib-2.0 dbus json-glib libsoup-2.4 intltool-native" +DEPENDS = "glib-2.0 dbus json-glib libsoup-3.0 intltool-native" -inherit meson pkgconfig gtk-doc gobject-introspection vala +inherit meson pkgconfig gtk-doc gobject-introspection vala useradd -SRCREV = "3bb60dd600a8b247fd6049e7e5b1c73c2c5fc0e8" -SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1" +SRCREV = "8a24f60969d4c235d9918796c38a6a9c42e10131" +SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;branch=master \ + file://0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch \ +" S = "${WORKDIR}/git" # Without this line, package is declared a library and named libgeoclue* AUTO_LIBNAME_PKGS = "" -PACKAGECONFIG ??= "3g modem-gps cdma nmea lib" +PACKAGECONFIG ??= "3g modem-gps cdma nmea lib agent" PACKAGECONFIG[3g] = "-D3g-source=true,-D3g-source=false,modemmanager" PACKAGECONFIG[modem-gps] = "-Dmodem-gps-source=true,-Dmodem-gps-source=false,modemmanager" PACKAGECONFIG[cdma] = "-Dcdma-source=true,-Dcdma-source=false,modemmanager" PACKAGECONFIG[nmea] = "-Dnmea-source=true,-Dnmea-source=false,avahi,avahi-daemon" -PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false,gobject-introspection" +PACKAGECONFIG[lib] = "-Dlibgeoclue=true,-Dlibgeoclue=false" +PACKAGECONFIG[agent] = "-Ddemo-agent=true,-Ddemo-agent=false,libnotify" GTKDOC_MESON_OPTION = "gtk-doc" EXTRA_OEMESON += " \ -Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \ - -Ddemo-agent=false \ " -FILES_${PN} += " \ +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" + +do_install:append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'modem-gps', 'true', 'false', d)}; then + # Fix up permissions on polkit rules.d to work with rpm4 constraints + chmod 700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d + fi +} + +FILES:${PN} += " \ ${datadir}/dbus-1/system-services \ + ${datadir}/polkit-1/rules.d \ ${libdir} \ ${systemd_unitdir} \ ${prefix}/libexec \ " -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/dbus-1/interfaces \ ${datadir}/gir-1.0 \ " diff --git a/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch b/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch deleted file mode 100644 index 645e6f62a5..0000000000 --- a/meta-oe/recipes-navigation/geos/files/geos-config-Add-includedir-variable.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9d51027c228dafd7db2d0cffca1f0fc695e950fd Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Mon, 2 Dec 2013 11:33:26 -0200 -Subject: [PATCH] geos-config: Add includedir variable - -This fixes cross-compile as it is easier to mangle the includedir -during sysroot generation. - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - tools/geos-config.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/geos-config.in b/tools/geos-config.in -index 9b45b5f..1749892 100644 ---- a/tools/geos-config.in -+++ b/tools/geos-config.in -@@ -1,6 +1,7 @@ - #!/bin/sh - prefix=@prefix@ - exec_prefix=@exec_prefix@ -+includedir=@includedir@ - libdir=@libdir@ - - usage() -@@ -38,7 +39,7 @@ case $1 in - echo @VERSION@ - ;; - --cflags) -- echo -I${prefix}/include -+ echo -I${includedir} - ;; - --libs) - # TODO: make an alias for --clibs --- -1.7.10.4 - diff --git a/meta-oe/recipes-navigation/geos/geos.inc b/meta-oe/recipes-navigation/geos/geos.inc deleted file mode 100644 index 48721058da..0000000000 --- a/meta-oe/recipes-navigation/geos/geos.inc +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "GEOS - Geometry Engine, Open Source" -HOMEPAGE = "http://trac.osgeo.org/geos/" -SECTION = "libs" - -LICENSE = "LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI = "http://download.osgeo.org/geos/geos-${PV}.tar.bz2" - -inherit autotools pkgconfig binconfig - -PACKAGES =+ "geoslib ${PN}-c1" - -DESCRIPTION_${PN}lib = "Geometry engine for Geographic Information Systems - C++ Library" -FILES_${PN}lib += "${libdir}/libgeos-${PV}.so" - -DESCRIPTION_${PN}-c1 = "Geometry engine for Geographic Information Systems - C Library" -FILES_${PN}-c1 += "${libdir}/libgeos_c.so.*" - -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} += "geoslib ${PN}-c1" diff --git a/meta-oe/recipes-navigation/geos/geos_3.12.1.bb b/meta-oe/recipes-navigation/geos/geos_3.12.1.bb new file mode 100644 index 0000000000..461652a5ad --- /dev/null +++ b/meta-oe/recipes-navigation/geos/geos_3.12.1.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "GEOS - Geometry Engine, Open Source" +HOMEPAGE = "http://trac.osgeo.org/geos/" +SECTION = "libs" + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2" +SRC_URI[sha256sum] = "d6ea7e492224b51193e8244fe3ec17c4d44d0777f3c32ca4fb171140549a0d03" + +inherit cmake pkgconfig binconfig + +PACKAGES =+ "geoslib ${PN}-c1" + +DESCRIPTION:${PN}lib = "Geometry engine for Geographic Information Systems - C++ Library" +FILES:${PN}lib += "${libdir}/libgeos.so.*" + +DESCRIPTION:${PN}-c1 = "Geometry engine for Geographic Information Systems - C Library" +FILES:${PN}-c1 += "${libdir}/libgeos_c.so.*" + +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} += "geoslib ${PN}-c1" diff --git a/meta-oe/recipes-navigation/geos/geos_3.4.3.bb b/meta-oe/recipes-navigation/geos/geos_3.4.3.bb deleted file mode 100644 index 538456cc27..0000000000 --- a/meta-oe/recipes-navigation/geos/geos_3.4.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require geos.inc - -SRC_URI += "file://geos-config-Add-includedir-variable.patch \ -" - -SRC_URI[md5sum] = "77f2c2cca1e9f49bc1bece9037ac7a7a" -SRC_URI[sha256sum] = "cfbf68079117c1c2b76411636444ff41d73c31093c4cab9dcc9a8c1bbe7e3897" diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb b/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb index d2058ba570..4ced1c98db 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb @@ -1,7 +1,8 @@ SUMMARY = "Machine specific gpsd config" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" # empty by default # BSP layers can add stuff like meta-openmoko example: # +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0001-Revert-SConstruct-Add-test-for-sizeof-time_t-result-.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0001-Revert-SConstruct-Add-test-for-sizeof-time_t-result-.patch deleted file mode 100644 index b021d0b727..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/0001-Revert-SConstruct-Add-test-for-sizeof-time_t-result-.patch +++ /dev/null @@ -1,108 +0,0 @@ -Subject: [PATCH] Revert "SConstruct: Add test for sizeof(time_t), result in - SIZEOF_TIME_T." - -This reverts commit b32ff1a86c44fa738dabaf63de1b5462e0071ad3. - -Upstream-Status: Inappropriate [cross-compile specific] - ---- - SConstruct | 54 ++++-------------------------------------- - android/gpsd_config.in | 1 - - 2 files changed, 5 insertions(+), 50 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 33e0ff326..e3c62fa3c 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -597,42 +597,6 @@ def CheckHeaderDefines(context, file, define): - return ret - - --def CheckSizeOf(context, type): -- """Check sizeof 'type'""" -- context.Message('Checking size of ' + type + '... ') -- -- program = """ --#include <stdlib.h> --#include <stdio.h> -- --/* -- * The CheckSizeOf function does not have a way for the caller to -- * specify header files to be included to provide the type being -- * checked. As a workaround until that is remedied, include the -- * header required for time_t, which is the sole current use of this -- * function. -- */ --#include <time.h> -- --int main() { -- printf("%d", (int)sizeof(""" + type + """)); -- return 0; --} --""" -- -- # compile it -- ret = context.TryCompile(program, '.c') -- if 0 == ret: -- announce('ERROR: TryCompile failed\n') -- # fall back to sizeof(time_t) is 8 -- return '8' -- -- # run it -- ret = context.TryRun(program, '.c') -- context.Result(ret[0]) -- return ret[1] -- -- - def CheckCompilerDefines(context, define): - context.Message('Checking if compiler supplies %s... ' % (define,)) - ret = context.TryLink(""" -@@ -703,15 +667,13 @@ env.Prepend(LIBPATH=[os.path.realpath(os.curdir)]) - - # CheckXsltproc works, but result is incorrectly saved as "no" - config = Configure(env, custom_tests={ -- 'CheckC11': CheckC11, -- 'CheckCompilerDefines': CheckCompilerDefines, -- 'CheckCompilerOption': CheckCompilerOption, -- 'CheckHeaderDefines': CheckHeaderDefines, - 'CheckPKG': CheckPKG, -- 'CheckSizeOf': CheckSizeOf, - 'CheckXsltproc': CheckXsltproc, -- 'GetPythonValue': GetPythonValue, -- }) -+ 'CheckCompilerOption': CheckCompilerOption, -+ 'CheckCompilerDefines': CheckCompilerDefines, -+ 'CheckC11': CheckC11, -+ 'CheckHeaderDefines': CheckHeaderDefines, -+ 'GetPythonValue': GetPythonValue}) - - # Use print, rather than announce, so we see it in -s mode. - print("This system is: %s" % sys.platform) -@@ -1043,12 +1005,6 @@ else: - confdefs.append("/* #undef HAVE_%s_H */\n" - % hdr.replace("/", "_").upper()) - -- sizeof_time_t = config.CheckSizeOf("time_t") -- confdefs.append("#define SIZEOF_TIME_T %s\n" % sizeof_time_t) -- announce("sizeof(time_t) is %s" % sizeof_time_t) -- if 4 >= int(sizeof_time_t): -- announce("WARNING: time_t is too small. It will fail in 2038") -- - # check function after libraries, because some function require libraries - # for example clock_gettime() require librt on Linux glibc < 2.17 - for f in ("cfmakeraw", "clock_gettime", "daemon", "fcntl", "fork", -diff --git a/android/gpsd_config.in b/android/gpsd_config.in -index 758251986..d240f6d34 100644 ---- a/android/gpsd_config.in -+++ b/android/gpsd_config.in -@@ -19,7 +19,6 @@ - #define HAVE_ARPA_INET_H 1 - #define HAVE_SYSLOG_H 1 - #define HAVE_DAEMON 1 --#define SIZEOF_TIME_T 8 - #define HAVE_CLOCK_GETTIME 1 - #define HAVE_STRPTIME 1 - #define HAVE_GMTIME_R 1 --- -2.26.2 - diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch deleted file mode 100644 index 23ae5e509d..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 5464d9e1bfd1a1c54338ec7c4148cad1b222ef93 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 24 Apr 2012 18:45:14 +0200 -Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot - from python_lib_dir - -* without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix - and with PYTHONPATH from OE it's pointing to native python dir - - $ export PYTHONPATH=/OE/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/ - $ python - Python 2.7.2 (default, Apr 18 2012, 09:19:59) - [GCC 4.6.2] on linux2 - Type "help", "copyright", "credits" or "license" for more information. - >>> from distutils import sysconfig - >>> sysconfig.get_config_vars('INCLUDEPY') - ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7'] - >>> - $ unset PYTHONPATH - $ python - Python 2.7.2 (default, Apr 18 2012, 09:19:59) - [GCC 4.6.2] on linux2 - Type "help", "copyright", "credits" or "license" for more information. - >>> from distutils import sysconfig - >>> sysconfig.get_config_vars('INCLUDEPY') - ['/python2.7'] - >>> import sysconfig - >>> sysconfig.get_config_vars('INCLUDEPY') - ['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7'] -* python_lib_dir = python_lib_dir.replace(env['sysroot'], '') - returns path to target sysroot - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Signed-off-by: Peter A. Bigot <pab@pabigot.com> - ---- - SConstruct | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/SConstruct b/SConstruct -index b8f3fb1..883e06d 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -980,7 +980,7 @@ else: - - # Set up configuration for target Python - --PYTHON_LIBDIR_CALL = 'sysconfig.get_python_lib()' -+PYTHON_LIBDIR_CALL = 'sysconfig.get_python_lib(plat_specific=1)' - - PYTHON_CONFIG_NAMES = ['CC', 'CXX', 'OPT', 'BASECFLAGS', - 'CCSHARED', 'LDSHARED', 'SO', 'INCLUDEPY', 'LDFLAGS'] -@@ -1506,7 +1506,7 @@ else: - LINK=ldshared, - SHLIBPREFIX="", - SHLIBSUFFIX=python_config['SO'], -- CPPPATH=[python_config['INCLUDEPY']], -+ CPPPATH=[os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], python_config['INCLUDEPY']))] if env['sysroot'] else [python_config['INCLUDEPY']], - CPPFLAGS=python_config['OPT'], - CFLAGS=python_config['BASECFLAGS'], - CXXFLAGS=python_config['BASECFLAGS']) -@@ -1808,12 +1808,14 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip'] and - env.AddPostAction(binaryinstall, '$STRIP $TARGET') - - if env['python']: -- python_module_dir = str(python_libdir) + os.sep + 'gps' -+ python_module_dir = python_libdir.replace(env['sysroot'], '') + os.sep + 'gps' - python_extensions_install = python_env.Install(DESTDIR + python_module_dir, - python_built_extensions) - if ((not env['debug'] and not env['profiling'] and - not env['nostrip'] and not sys.platform.startswith('darwin'))): - python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET') -+ env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \ -+ % (python_libdir, )) - - python_modules_install = python_env.Install(DESTDIR + python_module_dir, - python_modules) diff --git a/meta-oe/recipes-navigation/gpsd/gpsd/0001-gpsd-dbusexport.c-Fix-broken-d-bus-message-time.patch b/meta-oe/recipes-navigation/gpsd/gpsd/0001-gpsd-dbusexport.c-Fix-broken-d-bus-message-time.patch deleted file mode 100644 index 659865efe1..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd/0001-gpsd-dbusexport.c-Fix-broken-d-bus-message-time.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c9cec2a888d4fea8534be78a0f46d920155ceae6 Mon Sep 17 00:00:00 2001 -From: Paul Fertser <fercerpav@gmail.com> -Date: Wed, 4 Nov 2020 12:40:50 -0800 -Subject: [PATCH] gpsd/dbusexport.c: Fix broken d-bus message time. - -Change-Id: I4b9990ce4517a8feb29fc9e090c62f5a0c56ddd5 ---- - dbusexport.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/dbusexport.c b/dbusexport.c -index 40b35739e..5d08a8702 100644 ---- a/dbusexport.c -+++ b/dbusexport.c -@@ -38,6 +38,7 @@ void send_dbus_fix(struct gps_device_t *channel) - /*DBusMessageIter iter; */ - dbus_uint32_t serial; /* collected, but not used */ - char *gpsd_devname; -+ double dtime; // time as a double, loss of precision! - - /* if the connection is non existent, return without doing anything */ - if (connection == NULL) -@@ -51,8 +52,9 @@ void send_dbus_fix(struct gps_device_t *channel) - /* the dbus/locationd doc fails to specify altitude as WGS84 or MSL. - * assume altMSL */ - message = dbus_message_new_signal("/org/gpsd", "org.gpsd", "fix"); -+ dtime = TSTONS(&gpsfix->time); - dbus_message_append_args(message, -- DBUS_TYPE_DOUBLE, &(gpsfix->time), -+ DBUS_TYPE_DOUBLE, &dtime, - DBUS_TYPE_INT32, &(gpsfix->mode), - DBUS_TYPE_DOUBLE, &(gpsfix->ept), - DBUS_TYPE_DOUBLE, &(gpsfix->latitude), --- -2.20.1 - diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb deleted file mode 100644 index 0989cc1398..0000000000 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.20.bb +++ /dev/null @@ -1,144 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=01764c35ae34d9521944bb6ab312af53" -DEPENDS = "dbus ncurses python3 pps-tools" -PROVIDES = "virtual/gpsd" - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ - file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ - file://0001-Revert-SConstruct-Add-test-for-sizeof-time_t-result-.patch \ - file://0001-gpsd-dbusexport.c-Fix-broken-d-bus-message-time.patch \ - file://gpsd.init \ -" -SRC_URI[md5sum] = "cf7fdec7ce7221d20bee1a7246362b05" -SRC_URI[sha256sum] = "172a7805068eacb815a3c5225436fcb0be46e7e49a5001a94034eac43df85e50" - -inherit scons update-rc.d python3-dir python3native systemd update-alternatives - -INITSCRIPT_PACKAGES = "gpsd-conf" -INITSCRIPT_NAME = "gpsd" -INITSCRIPT_PARAMS = "defaults 35" - -SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" - -export STAGING_INCDIR -export STAGING_LIBDIR - -CLEANBROKEN = "1" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} usb" -PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez5" -PACKAGECONFIG[qt] = "qt='yes' qt_versioned=5,qt='no',qtbase" -PACKAGECONFIG[usb] = "usb='true',usb='false',libusb1" -EXTRA_OESCONS = " \ - sysroot=${STAGING_DIR_TARGET} \ - libQgpsmm='false' \ - debug='false' \ - nostrip='true' \ - systemd='${SYSTEMD_OESCONS}' \ - libdir='${libdir}' \ - manbuild='false' \ - LINK='${CC}' \ - ${PACKAGECONFIG_CONFARGS} \ -" -# this cannot be used, because then chrpath is not found and only static lib is built -# target=${HOST_SYS} - -do_compile_prepend() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LD="${CC}" - export LINKFLAGS="${LDFLAGS}" -} - -do_install() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LD="${CC}" - export LINKFLAGS="${LDFLAGS}" - - export DESTDIR="${D}" - # prefix is used for RPATH and DESTDIR/prefix for instalation - ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} python_libdir=${libdir} install ${EXTRA_OESCONS} || \ - bbfatal "scons install execution failed." -} - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/gpsd.init ${D}/${sysconfdir}/init.d/gpsd - install -d ${D}/${sysconfdir}/default - install -m 0644 ${S}/packaging/deb/etc_default_gpsd ${D}/${sysconfdir}/default/gpsd.default - - #support for udev - install -d ${D}/${sysconfdir}/udev/rules.d - install -m 0644 ${S}/gpsd.rules ${D}/${sysconfdir}/udev/rules.d/ - install -d ${D}${base_libdir}/udev/ - install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/ - - #support for python - install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps - install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps - - #support for systemd - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${S}/systemd/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service - sed -i -e 's,/usr/local,/usr,g' ${D}${systemd_unitdir}/system/${BPN}.service - install -m 0644 ${S}/systemd/${BPN}ctl@.service ${D}${systemd_unitdir}/system/${BPN}ctl@.service - sed -i -e 's,/usr/local,/usr,g' ${D}${systemd_unitdir}/system/${BPN}ctl@.service - install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket -} - -PACKAGES =+ "libgps libgpsd python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils" - -RPROVIDES_${PN}-dbg += "python-pygps-dbg" - -FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \ - ${libdir}/libQgpsmm.prl" - -RDEPENDS_${PN} = "gpsd-gpsctl" -RRECOMMENDS_${PN} = "gpsd-conf gpsd-udev gpsd-machine-conf" - -SUMMARY_gpsd-udev = "udev relevant files to use gpsd hotplugging" -FILES_gpsd-udev = "${base_libdir}/udev ${sysconfdir}/udev/*" -RDEPENDS_gpsd-udev += "udev gpsd-conf" - -SUMMARY_libgpsd = "C service library used for communicating with gpsd" -FILES_libgpsd = "${libdir}/libgpsd.so.*" - -SUMMARY_libgps = "C service library used for communicating with gpsd" -FILES_libgps = "${libdir}/libgps.so.*" - -SUMMARY_gpsd-conf = "gpsd configuration files and init scripts" -FILES_gpsd-conf = "${sysconfdir}" -CONFFILES_gpsd-conf = "${sysconfdir}/default/gpsd.default" - -SUMMARY_gpsd-gpsctl = "Tool for tweaking GPS modes" -FILES_gpsd-gpsctl = "${bindir}/gpsctl" - -SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS" -# Python files are required for gps/fake, required for gpsfake. -FILES_gps-utils = "${bindir}/* ${libdir}/gps/*.py ${libdir}/gps/*.so" -RDEPENDS_gps-utils = "python3-pygps" - -SUMMARY_python3-pygps = "Python bindings to gpsd" -FILES_python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}/*.egg-info" -RDEPENDS_python3-pygps = " \ - python3-core \ - python3-io \ - python3-threading \ - python3-terminal \ - gpsd \ - python3-json" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${BPN}.socket ${BPN}ctl@.service" - - -ALTERNATIVE_${PN} = "gpsd-defaults" -ALTERNATIVE_LINK_NAME[gpsd-defaults] = "${sysconfdir}/default/gpsd" -ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.default" diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb new file mode 100644 index 0000000000..a755e39ed4 --- /dev/null +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb @@ -0,0 +1,159 @@ +SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" +SECTION = "console/network" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=7a5d174db44ec45f9638b2c747806821" +DEPENDS = "dbus ncurses python3 pps-tools" +PROVIDES = "virtual/gpsd" + +SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ + file://gpsd.init \ + " +SRC_URI[sha256sum] = "00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c" + +inherit scons update-rc.d python3-dir python3native systemd update-alternatives pkgconfig + +INITSCRIPT_PACKAGES = "gpsd-conf" +INITSCRIPT_NAME = "gpsd" +INITSCRIPT_PARAMS = "defaults 35" + +SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" + +export STAGING_INCDIR +export STAGING_LIBDIR + +CLEANBROKEN = "1" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} usb" +PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez5" +PACKAGECONFIG[qt] = "qt='yes' qt_versioned=5,qt='no',qtbase" +PACKAGECONFIG[usb] = "usb='true',usb='false',libusb1" +EXTRA_OESCONS = " \ + sysroot=${STAGING_DIR_TARGET} \ + libQgpsmm='false' \ + debug='false' \ + nostrip='true' \ + systemd='${SYSTEMD_OESCONS}' \ + libdir='${libdir}' \ + sbindir='${sbindir}' \ + udevdir='${nonarch_base_libdir}/udev' \ + unitdir='${systemd_system_unitdir}' \ + manbuild='false' \ + LINK='${CC}' \ + ${PACKAGECONFIG_CONFARGS} \ +" +# This cannot be used, because then chrpath is not found and only static lib is built +# target=${HOST_SYS} + +do_compile:prepend() { + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" + export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" + export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" + export CC="${CC}" + export LD="${CC}" + export LINKFLAGS="${LDFLAGS}" +} + +do_install() { + export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" + export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" + export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" + export LD="${CC}" + export LINKFLAGS="${LDFLAGS}" + + export DESTDIR="${D}" + # prefix is used for RPATH and DESTDIR/prefix for installation + ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} python_libdir=${libdir} udev-install ${EXTRA_OESCONS} || \ + bbfatal "scons install execution failed." +} + +do_install:append() { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/gpsd.init ${D}${sysconfdir}/init.d/gpsd + install -d ${D}${sysconfdir}/default + install -m 0644 ${S}/packaging/deb/etc_default_gpsd ${D}${sysconfdir}/default/gpsd.default + + # Support for python + if [ -d ${D}${libdir}/gps ]; then + install -d ${D}${PYTHON_SITEPACKAGES_DIR}/gps + install -m 755 ${D}${libdir}/gps/*.py ${D}${PYTHON_SITEPACKAGES_DIR}/gps + fi +} + +PACKAGES =+ "libgps python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils gps-utils-python" + +RPROVIDES:${PN}-dbg += "python-pygps-dbg" + +FILES:${PN}-dev += "${libdir}/libQgpsmm.prl" + +FILES:${PN}-doc += "${datadir}/${BPN}/doc" + +RDEPENDS:${PN} = "gpsd-gpsctl" +RRECOMMENDS:${PN} = "gpsd-conf gpsd-udev gpsd-machine-conf" + +SUMMARY:gpsd-udev = "udev relevant files to use gpsd hotplugging" +FILES:gpsd-udev = "${nonarch_base_libdir}/udev" +RDEPENDS:gpsd-udev += "udev gpsd-conf" + +SUMMARY:libgps = "C service library used for communicating with gpsd" +FILES:libgps = "${libdir}/libgps.so.*" + +SUMMARY:gpsd-conf = "gpsd configuration files and init scripts" +FILES:gpsd-conf = "${sysconfdir}" +CONFFILES:gpsd-conf = "${sysconfdir}/default/gpsd.default" + +SUMMARY:gpsd-gpsctl = "Tool for tweaking GPS modes" +FILES:gpsd-gpsctl = "${bindir}/gpsctl" + +SUMMARY:gps-utils = "Utils used for simulating, monitoring,... a GPS" +FILES:gps-utils = "\ + ${bindir}/cgps \ + ${bindir}/gps2udp \ + ${bindir}/gpsctl \ + ${bindir}/gpsdebuginfo \ + ${bindir}/gpsdecode \ + ${bindir}/gpsmon \ + ${bindir}/gpspipe \ + ${bindir}/gpsrinex \ + ${bindir}/gpssnmp \ + ${bindir}/gpxlogger \ + ${bindir}/lcdgps \ + ${bindir}/ntpshmmon \ + ${bindir}/ppscheck \ +" +RRECOMMENDS:gps-utils = "gps-utils-python" + +SUMMARY:gps-utils-python = "Python utils used for simulating, monitoring,... a GPS" +FILES:gps-utils-python = "\ + ${bindir}/gegps \ + ${bindir}/gpscat \ + ${bindir}/gpscsv \ + ${bindir}/gpsfake \ + ${bindir}/gpsplot \ + ${bindir}/gpsprof \ + ${bindir}/gpssubframe \ + ${bindir}/ubxtool \ + ${bindir}/xgps \ + ${bindir}/xgpsspeed \ + ${bindir}/zerk \ +" +RDEPENDS:gps-utils-python = "python3-pygps" + +SUMMARY:python3-pygps = "Python bindings to gpsd" +FILES:python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}/*.egg-info" +RDEPENDS:python3-pygps = " \ + python3-core \ + python3-io \ + python3-pyserial \ + python3-threading \ + python3-terminal \ + gpsd \ + python3-json" + +RPROVIDES:${PN} += "${PN}-systemd" +RREPLACES:${PN} += "${PN}-systemd" +RCONFLICTS:${PN} += "${PN}-systemd" +SYSTEMD_SERVICE:${PN} = "${BPN}.socket ${BPN}ctl@.service" + +ALTERNATIVE:${PN} = "gpsd-defaults" +ALTERNATIVE_LINK_NAME[gpsd-defaults] = "${sysconfdir}/default/gpsd" +ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.default" diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/geos-config.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/geos-config.patch deleted file mode 100644 index 28bd7dad87..0000000000 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite/geos-config.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://www.gaia-gis.it/fossil/libspatialite/tktview?name=abeeaad448 - -Upstream-Status: Submitted [rpm5-devel@rpm5.org] - -Index: libspatialite-4.2.0/configure.ac -=================================================================== ---- libspatialite-4.2.0.orig/configure.ac -+++ libspatialite-4.2.0/configure.ac -@@ -260,7 +260,7 @@ if test x"$enable_geos" != "xno"; then - fi - # Extract the linker and include flags - GEOS_LDFLAGS=`$GEOSCONFIG --ldflags` -- GEOS_CFLAGS=-I`$GEOSCONFIG --includes` -+ GEOS_CFLAGS=`$GEOSCONFIG --cflags` - AC_SUBST([GEOS_LDFLAGS]) - AC_SUBST([GEOS_CFLAGS]) - # Ensure that we can parse geos_c.h diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_geos.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_geos.patch new file mode 100644 index 0000000000..569ea76bb5 --- /dev/null +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_geos.patch @@ -0,0 +1,45 @@ +Upstream-Status: Pending + +diff -rupN --no-dereference libspatialite-5.0.1/configure.ac libspatialite-5.0.1-new/configure.ac +--- libspatialite-5.0.1/configure.ac 2021-03-08 08:57:19.015858195 +0100 ++++ libspatialite-5.0.1-new/configure.ac 2021-03-08 08:57:19.017858195 +0100 +@@ -312,35 +312,10 @@ AC_ARG_ENABLE(geos, [AS_HELP_STRING( + [], [enable_geos=yes]) + if test x"$enable_geos" != "xno"; then + #----------------------------------------------------------------------- +- # --with-geosconfig +- # +- AC_ARG_WITH([geosconfig], +- [AS_HELP_STRING([--with-geosconfig=FILE], [specify an alternative geos-config file])], +- [GEOSCONFIG="$withval"], [GEOSCONFIG=""]) +- if test "x$GEOSCONFIG" = "x"; then +- # GEOSCONFIG was not specified, so search within the current path +- AC_PATH_PROG([GEOSCONFIG], [geos-config]) +- # If we couldn't find geos-config, display an error +- if test "x$GEOSCONFIG" = "x"; then +- AC_MSG_ERROR([could not find geos-config within the current path. You may need to try re-running configure with a --with-geosconfig parameter.]) +- fi +- else +- # GEOSCONFIG was specified; display a message to the user +- if test "x$GEOSCONFIG" = "xyes"; then +- AC_MSG_ERROR([you must specify a parameter to --with-geosconfig, e.g. --with-geosconfig=/path/to/geos-config]) +- else +- if test -f $GEOSCONFIG; then +- AC_MSG_RESULT([Using user-specified geos-config file: $GEOSCONFIG]) +- else +- AC_MSG_ERROR([the user-specified geos-config file $GEOSCONFIG does not exist]) +- fi +- fi +- fi +- # Extract the linker and include flags +- GEOS_LDFLAGS=`$GEOSCONFIG --ldflags` +- GEOS_CFLAGS=-I`$GEOSCONFIG --includes` +- AC_SUBST([GEOS_LDFLAGS]) +- AC_SUBST([GEOS_CFLAGS]) ++ PKG_CHECK_MODULES([GEOS], [geos], , AC_MSG_ERROR(['geos' is required but it doesn't seem to be installed on this system.])) ++ GEOS_LDFLAGS="$GEOS_LIBS" ++ AC_SUBST(GEOS_CFLAGS) ++ AC_SUBST(GEOS_LDFLAGS) + # Ensure that we can parse geos_c.h + CPPFLAGS_SAVE="$CPPFLAGS" + CPPFLAGS="$GEOS_CFLAGS" diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch new file mode 100644 index 0000000000..6f1c165f58 --- /dev/null +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch @@ -0,0 +1,14 @@ +Upstream-Status: Pending + +diff -rupN --no-dereference libspatialite-5.0.1/configure.ac libspatialite-5.0.1-new/configure.ac +--- libspatialite-5.0.1/configure.ac 2021-03-08 08:57:18.748858216 +0100 ++++ libspatialite-5.0.1-new/configure.ac 2021-03-08 08:57:18.751858215 +0100 +@@ -96,7 +96,7 @@ AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_LIBTOOL_WIN32_DLL +-AC_PROG_LIBTOOL ++LT_INIT + + # Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch new file mode 100644 index 0000000000..de6e50a58d --- /dev/null +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch @@ -0,0 +1,13 @@ +Upstream-Status: Pending + +diff -rupN libspatialite-5.0.1/spatialite.pc.in libspatialite-5.0.1-new/spatialite.pc.in +--- libspatialite-5.0.1/spatialite.pc.in 2021-02-07 16:53:46.000000000 +0100 ++++ libspatialite-5.0.1-new/spatialite.pc.in 2021-02-10 09:54:09.647552994 +0100 +@@ -8,5 +8,6 @@ includedir=@includedir@ + Name: spatialite + Description: Spatial SQL database engine based on SQLite + Version: @VERSION@ +-Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ -lm ++Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ -lm ++Libs: -L${libdir} -lspatialite + Cflags: -I${includedir} diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite_4.3.0a.bb b/meta-oe/recipes-navigation/libspatialite/libspatialite_4.3.0a.bb deleted file mode 100644 index b33f5a31e4..0000000000 --- a/meta-oe/recipes-navigation/libspatialite/libspatialite_4.3.0a.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Library extending the SQLite core to support fully fledged Spatial SQL capabilities" -HOMEPAGE = "https://www.gaia-gis.it/fossil/libspatialite/" -SECTION = "libs" -DEPENDS = "proj geos sqlite3 libxml2 zlib" - -LICENSE = "MPLv1.1 & GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e" - -SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz \ - file://geos-config.patch" -SRC_URI[md5sum] = "6b380b332c00da6f76f432b10a1a338c" -SRC_URI[sha256sum] = "88900030a4762904a7880273f292e5e8ca6b15b7c6c3fb88ffa9e67ee8a5a499" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-freexl=no" -CFLAGS += "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" - -# package plugins for SQLite3 -PACKAGES += "${PN}-plugin" -INSANE_SKIP_${PN}-plugin = "dev-so" -FILES_${PN}-plugin += "${libdir}/mod_*" diff --git a/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb b/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb new file mode 100644 index 0000000000..f46b1083e1 --- /dev/null +++ b/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Library extending the SQLite core to support fully fledged Spatial SQL capabilities" +HOMEPAGE = "https://www.gaia-gis.it/fossil/libspatialite/" +SECTION = "libs" +DEPENDS = "proj geos sqlite3 libxml2 zlib" + +LICENSE = "MPL-1.1 & GPL-2.0-or-later & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e" + +SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz \ + file://libspatialite_geos.patch \ + file://libspatialite_macros.patch \ + file://libspatialite_pkgconfig.patch \ +" + +SRC_URI[sha256sum] = "eecbc94311c78012d059ebc0fae86ea5ef6eecb13303e6e82b3753c1b3409e98" + +inherit autotools-brokensep pkgconfig + +EXTRA_OECONF = "--enable-freexl=no --disable-rttopo --disable-minizip" + +# package plugins for SQLite3 +PACKAGES += "${PN}-plugin" +INSANE_SKIP:${PN}-plugin = "dev-so" +FILES:${PN}-plugin += "${libdir}/mod_*" diff --git a/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch b/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch deleted file mode 100644 index eb6241fdd0..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/0001-orrery-Fix-sprintf-format.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e600d3c09d2f97a197f86e6987d44d142e7b7cdf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Jun 2017 21:12:17 -0700 -Subject: [PATCH] orrery: Fix sprintf format - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - orrery.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/orrery.c b/orrery.c -index e3a1f6d..1b31a9f 100644 ---- a/orrery.c -+++ b/orrery.c -@@ -3767,7 +3767,7 @@ static void drawOptsScreens(void) - displayWidth/2 - gdk_string_width(smallFont, scratchString)/2, - 12, scratchString); - for (day = 0; day < 7; day++) { -- sprintf(scratchString, dayName[day]); -+ sprintf(scratchString, "%s", dayName[day]); - gdk_draw_string(pixmap, smallFont, blueGC, - CAL_DAY_WIDTH/2 + day*CAL_DAY_WIDTH + CAL_LEFT_OFFSET - - gdk_string_width(smallFont, scratchString)/2, --- -2.13.2 - diff --git a/meta-oe/recipes-navigation/orrery/orrery/orrery.png b/meta-oe/recipes-navigation/orrery/orrery/orrery.png Binary files differdeleted file mode 100644 index d9865b70ce..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/orrery.png +++ /dev/null diff --git a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch b/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch deleted file mode 100644 index 92d194de08..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery/use.GdkPixbuf.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: Benjamin Deering -Subject: orrery crashing X -Date: Thursday, September 2, 2010 - 5:25 pm -Link: http://kerneltrap.org/mailarchive/openmoko-community/2010/9/3/13218 - -diff -uNr orrery.orig//orrery.c orrery/orrery.c ---- orrery.orig//orrery.c 2009-11-30 06:59:44.000000000 +0100 -+++ orrery/orrery.c 2010-11-15 22:33:17.000000000 +0100 -@@ -1238,12 +1238,44 @@ - } - currentEntry = currentEntry->forwardPointer; - } -- if (nDarkGreyPoints > 0) -- gdk_draw_points(pixmap, darkGreyGC, darkGreyPoints, nDarkGreyPoints); -- if (nGreyPoints > 0) -- gdk_draw_points(pixmap, greyGC, greyPoints, nGreyPoints); -- if (nWhitePoints > 0) -- gdk_draw_points(pixmap, whiteGC, whitePoints, nWhitePoints); -+ GdkPixbuf* starDrawingBuf = gdk_pixbuf_get_from_drawable( NULL, -+ pixmap, -+ gdk_colormap_get_system() -+ , 0, 0, 0, 0, displayWidth, displayHeight); -+ g_assert (gdk_pixbuf_get_bits_per_sample (starDrawingBuf) == 8); -+ guchar* p; -+ int rowstride = gdk_pixbuf_get_rowstride (starDrawingBuf); -+ guchar* pixels = gdk_pixbuf_get_pixels (starDrawingBuf); -+ int n_channels = gdk_pixbuf_get_n_channels (starDrawingBuf); -+ GdkGCValues starGCval; -+ GdkColor starColor; -+ int pointNum; -+ gdk_gc_get_values(darkGreyGC, &starGCval); -+ gdk_colormap_query_color( gdk_gc_get_colormap(darkGreyGC),starGCval.foreground.pixel, &starColor ); -+ for( pointNum = 0; pointNum < nDarkGreyPoints; pointNum++) { -+ p = pixels + darkGreyPoints[pointNum].y * rowstride + darkGreyPoints[pointNum].x * n_channels; -+ p[0] = starColor.red & 0xff; -+ p[1] = starColor.green & 0xff; -+ p[2] = starColor.blue & 0xff; -+ } -+ gdk_gc_get_values(greyGC, &starGCval); -+ gdk_colormap_query_color( gdk_gc_get_colormap(greyGC), starGCval.foreground.pixel, &starColor ); -+ for( pointNum = 0; pointNum < nGreyPoints; pointNum++) { -+ p = pixels + greyPoints[pointNum].y * rowstride + greyPoints[pointNum].x * n_channels; -+ p[0] = starColor.red & 0xff; -+ p[1] = starColor.green & 0xff; -+ p[2] = starColor.blue & 0xff; -+ } -+ gdk_gc_get_values(whiteGC, &starGCval); -+ gdk_colormap_query_color( gdk_gc_get_colormap(whiteGC), starGCval.foreground.pixel, &starColor ); -+ for( pointNum = 0; pointNum < nWhitePoints; pointNum++) { -+ p = pixels + whitePoints[pointNum].y * rowstride + whitePoints[pointNum].x * n_channels; -+ p[0] = starColor.red & 0xff; -+ p[1] = starColor.green & 0xff; -+ p[2] = starColor.blue & 0xff; -+ } -+ gdk_draw_pixbuf ( pixmap , NULL , starDrawingBuf, -+ 0, 0, 0, 0, displayWidth, displayHeight, GDK_RGB_DITHER_NORMAL, 0, 0 ) ; - } - - void makeTimeString(char *string) diff --git a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-oe/recipes-navigation/orrery/orrery_2.7.bb deleted file mode 100644 index 589fc5f7c8..0000000000 --- a/meta-oe/recipes-navigation/orrery/orrery_2.7.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Astronomical application which displays the night sky" -HOMEPAGE = "http://projects.openmoko.org/projects/orrery/" -SECTION = "x11/scientific" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe" -DEPENDS = "gtk+" - -inherit features_check autotools-brokensep pkgconfig - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://projects.openmoko.org/frs/download.php/923/orrery_2.7_clean.tar.gz \ - file://orrery.png \ - file://use.GdkPixbuf.patch \ - file://0001-orrery-Fix-sprintf-format.patch \ - " - -SRC_URI[md5sum] = "bd62a33e7554ee1030313dfcdefcda8b" -SRC_URI[sha256sum] = "645166a5e05b2064ab630534a514697fc47b681951e7fe1d635c259cbdf7a5e6" - -S = "${WORKDIR}/${BPN}" - -do_configure_prepend() { - # fix DSO issue with binutils-2.22 - sed -i 's/ -lrt/ -lrt -lm/g' ${S}/Makefile.am -} -do_install_append() { - install -d ${D}${datadir}/orrery - cp -R --no-dereference --preserve=mode,links -v ${S}/data/* ${D}${datadir}/orrery - chown -R root:root ${D}${datadir}/orrery - install -d ${D}${datadir}/icons - install -m 0755 ${WORKDIR}/orrery.png ${D}${datadir}/icons -} - -FILES_${PN} += "${datadir}/icons/orrery.png" diff --git a/meta-oe/recipes-navigation/proj/proj_7.0.1.bb b/meta-oe/recipes-navigation/proj/proj_7.0.1.bb deleted file mode 100644 index 2cfaa7121b..0000000000 --- a/meta-oe/recipes-navigation/proj/proj_7.0.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "PROJ.4 - Cartographic Projections library" -HOMEPAGE = "http://trac.osgeo.org/proj/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=74d9aaec5fa0cd734341e8c4dc91b608" - -SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.gz" - -SRC_URI[md5sum] = "5ba7536b579a6c9e0ad822dbdd455985" -SRC_URI[sha256sum] = "a7026d39c9c80d51565cfc4b33d22631c11e491004e19020b3ff5a0791e1779f" - -DEPENDS = "sqlite3 sqlite3-native tiff" - -inherit autotools pkgconfig lib_package - -PACKAGECONFIG ?= "curl" - -PACKAGECONFIG[curl] = ",--without-curl,curl" - -FILES_${PN} += "${datadir}/proj" diff --git a/meta-oe/recipes-navigation/proj/proj_9.3.1.bb b/meta-oe/recipes-navigation/proj/proj_9.3.1.bb new file mode 100644 index 0000000000..78f4287d63 --- /dev/null +++ b/meta-oe/recipes-navigation/proj/proj_9.3.1.bb @@ -0,0 +1,27 @@ +SUMMARY = "PROJ.4 - Cartographic Projections library" +HOMEPAGE = "http://trac.osgeo.org/proj/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27445198ba1500f508fce2b183ce0ff" +DEPENDS = "sqlite3 sqlite3-native" + +SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.gz" +SRC_URI[sha256sum] = "b0f919cb9e1f42f803a3e616c2b63a78e4d81ecfaed80978d570d3a5e29d10bc" + +inherit cmake lib_package + +EXTRA_OECMAKE = "-DBUILD_TESTING=OFF -DSQLITE3_LIBRARY:STRING=sqlite3" + +FILES:${PN} += "${datadir}/proj" + +BBCLASSEXTEND = "native" + +PACKAGECONFIG ?= "curl shared" +PACKAGECONFIG:append:class-native = " apps" + +PACKAGECONFIG[apps] = "-DBUILD_APPS=ON, -DBUILD_APPS=OFF" +PACKAGECONFIG[curl] = "-DENABLE_CURL=ON,-DENABLE_CURL=OFF,curl" +PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," +PACKAGECONFIG[tiff] = "-DENABLE_TIFF=ON,-DENABLE_TIFF=OFF,tiff" + +BBCLASSEXTEND = "native nativesdk" |
