deleted file mode 100644
@@ -1,51 +0,0 @@
-From c72a489e2eb13296c7b514b7341033114abf430a Mon Sep 17 00:00:00 2001
-From: Miroslav Lichvar <mlichvar@redhat.com>
-Date: Mon, 22 Apr 2024 11:31:24 +0200
-Subject: [PATCH 1/2] SConscript: provide variable names to MergeFlags
-
-If the scons MergeFlags() function is provided with a list of
-compiler/linker options, it needs to guess what options belong where. If
-it doesn't recognize an option, it is silently ignored. There are also
-ambiguous options that could be both in CFLAGS and LINKFLAGS (e.g. -spec).
-
-Provide MergeFlags() with a dict instead of list to avoid the guesswork
-in order to pass all options, even if some are not recognized by scons.
-Switch LDFLAGS to LINKFLAGS for better compatibility with existing
-scripts.
-
-Upstream-Status: Submitted [https://gitlab.com/gpsd/gpsd/-/merge_requests/406]
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
----
- SConscript | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/SConscript b/SConscript
-index dab481654..ee90d87c4 100644
---- a/SConscript
-+++ b/SConscript
-@@ -585,8 +585,8 @@ env['SC_PYTHON'] = sys.executable # Path to SCons Python
- # explicitly quote them or (better yet) use the "=" form of GNU option
- # settings.
- #
--# Scons also uses different internal names than most other build-systems.
--# So we rely on MergeFlags/ParseFlags to do the right thing for us.
-+# Scons also uses different internal names than most other build-systems,
-+# e.g. it uses LINKFLAGS instead of LDFLAGS.
- #
- # scons uses gcc, or clang, to link. Thus LDFLAGS does not serve its
- # traditional function of providing arguments to ln. LDFLAGS set in the
-@@ -618,7 +618,10 @@ for i in ["ARFLAGS",
- "SHLINKFLAGS",
- ]:
- if i in os.environ:
-- env.MergeFlags(Split(os.getenv(i)))
-+ t = i
-+ if t == "LDFLAGS":
-+ t = "LINKFLAGS"
-+ env.MergeFlags({t: Split(os.getenv(i))})
-
-
- # Keep scan-build options in the environment
-GitLab
similarity index 97%
rename from meta-oe/recipes-navigation/gpsd/gpsd_3.25.bb
rename to meta-oe/recipes-navigation/gpsd/gpsd_3.26.1.bb
@@ -9,9 +9,8 @@ HOMEPAGE = "https://gpsd.io/"
SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
file://gpsd.init \
- file://fix-pps_strerror_r.patch \
"
-SRC_URI[sha256sum] = "b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2"
+SRC_URI[sha256sum] = "dc7e465968c1540e61bc57c7586d6a57a0047212a014efdad348f907bc2e0990"
inherit scons update-rc.d python3-dir python3native systemd update-alternatives pkgconfig
Drop patch that was applied upstream in https://gitlab.com/gpsd/gpsd/-/merge_requests/406 Upstream changelog: 3.26.1: 17 May 2025 Increment libgps version Update Debian Trixie in build.adoc Fix buffer overrun in cgps. Make gpsmon deprecation slightly more obvious. Fix some *BSD compiler warnings Fix numerous typos. 3.26: 11 May 2025 Handle NTRIPv2 that comes in "chunks". Add many UBX decodes. Mostly in ubxtool, some in gpsd. Improve TSIP and UBX initialization. Gather Antenna Status (ant_stat) and Jamming (jam) and send to JSON. Always build u-blox, RTCM104V2, RTCM104V3 drivers. Add partial support for badly documented ALLYSTAR GNSS messages. Add minimal support for Unicore GNSS messages. Add minimal support for CASIC GNSS messages. Add minimal support for buggy Inertial Sense GNSS messages. Try to work better as non-root using non-standard "capabilities". Add SUBSYSTEM=gnss rule to gpsd.rules Moved ntploggps from NTPSec to GPSD and renamed to gpslogntp. Fix many build, Coverity, and Codacy warnings. Improved Python interface for the lexer. Add support for new BeiDou PRNs and subframes. Officially deprecate gpsmon. Improve support for NMEA 4.11 (a stealthy moving target). Remove Oceanserver IMU support. Never worked well. Always with build ubx, NMEA 103, rtcm104v2 and rtcm104v3 support. Add support for jamming detection. Add Go client example. Add support for RTCM3.2 Note: The new "chunk" code led to a short lived bug that led to CVE-2023-43628, a buffer overrun. That bug never appeared in any gpsd release. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> --- .../gpsd/gpsd/fix-pps_strerror_r.patch | 51 ------------------- .../gpsd/{gpsd_3.25.bb => gpsd_3.26.1.bb} | 3 +- 2 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd/fix-pps_strerror_r.patch rename meta-oe/recipes-navigation/gpsd/{gpsd_3.25.bb => gpsd_3.26.1.bb} (97%)