Merge pull request #2692 from blshkv/master

gr-gsm
This commit is contained in:
github-actions[bot] 2026-02-16 09:51:12 +00:00 committed by GitHub
commit 87c5fa5857
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 57 additions and 61 deletions

View file

@ -0,0 +1,51 @@
From 913cedba96aabd73dbc09f230653c7a9dc49d3ed Mon Sep 17 00:00:00 2001
From: Romain Thomas <me@romainthomas.fr>
Date: Sat, 24 Jan 2026 01:41:36 +0100
Subject: [PATCH] Update Python backend dependencies
---
api/python/build-requirements.txt | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/api/python/build-requirements.txt b/api/python/build-requirements.txt
index 729d9c974d..74b03d064e 100644
--- a/api/python/build-requirements.txt
+++ b/api/python/build-requirements.txt
@@ -1,10 +1,10 @@
-tomli==2.2.1
-scikit-build-core==0.11.1
+tomli==2.4.0
+scikit-build-core==0.11.6
# For Ninja: msvc.msvc14_get_vc_env
-setuptools==70.2.0
+setuptools==80.9.0
# For the "env" feature
-pydantic==2.11.3
+pydantic==2.12.5
# Implicit from scikit-build-core
-pathspec==0.12.1
-build==1.2.1
+pathspec==1.0.3
+build==1.4.0
wheel==0.45.1
From 85329de16dfbb15cda7fdfea0cf971a92a6789c2 Mon Sep 17 00:00:00 2001
From: Romain Thomas <me@romainthomas.fr>
Date: Sat, 17 Jan 2026 20:55:39 +0100
Subject: [PATCH] Update metrics requirements
---
scripts/metrics/requirements.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/metrics/requirements.txt b/scripts/metrics/requirements.txt
index 43f1e6ecae..7d22ad770f 100644
--- a/scripts/metrics/requirements.txt
+++ b/scripts/metrics/requirements.txt
@@ -1,4 +1,4 @@
influxdb-client==1.48.0
-pydantic==2.11.3
-pydantic-settings==2.8.1
-lxml==5.3.2
+pydantic==2.12.5
+pydantic-settings==2.12.0
+lxml==6.0.2

View file

@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
#DISTUTILS_USE_PEP517=scikit-build-core
DISTUTILS_USE_PEP517=standalone
DISTUTILS_EXT=1
PYTHON_COMPAT=( python3_{12..14} )
PYTHON_COMPAT=( python3_{12..13} )
inherit distutils-r1 cmake
DESCRIPTION="Library to instrument executable formats"

View file

@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@ -7,6 +7,7 @@ DISTUTILS_OPTIONAL=1
#DISTUTILS_USE_PEP517=scikit-build-core
DISTUTILS_USE_PEP517=standalone
DISTUTILS_EXT=1
PYTHON_COMPAT=( python3_{12..14} )
inherit distutils-r1 cmake
@ -27,8 +28,7 @@ IUSE="examples +python static-libs"
# lief requires a forked version of nanobind, see LIEF-0.15.1/api/python/CMakeLists.txt
# So don't try to use a standard one
RDEPEND="python? ( ${PYTHON_DEPS}
dev-python/pydantic[${PYTHON_USEDEP}]
dev-python/pydantic-core[${PYTHON_USEDEP}]
>=dev-python/pydantic-2.12.3[${PYTHON_USEDEP}]
dev-python/tomli[${PYTHON_USEDEP}]
dev-python/xtract[${PYTHON_USEDEP}]
)"
@ -51,6 +51,8 @@ wrap_python() {
}
src_prepare() {
eapply ${FILESDIR}/python_314.patch
#fix multilib
sed -i "s|CMAKE_INSTALL_LIBDIR \"lib\"|CMAKE_INSTALL_LIBDIR \"$(get_libdir)\"|" CMakeLists.txt || die
# sed -i '/COMMAND ${CMAKE_STRIP}/d' CMakeLists.txt || die

View file

@ -1 +0,0 @@
DIST gr-gsm-20210505.tar.gz 321224 BLAKE2B d1f519ae0b122f38aab1ce20f679192d7640f8424dc02d9e0689696a2fe0193553fcb9de340abe81f785571119e678a36dc770114f74b13fa287bf50455321fb SHA512 b9cc0d45dbeb0254d31e9a14f94c63d8ff39fd20a19962ee657aaefc62a5ce078e92da5259847515593aed491e020b7a334e82980603d3f75bd96348ef863d4a

View file

@ -1,56 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{12..14} )
inherit cmake python-single-r1
DESCRIPTION="Set of tools for receiving information transmitted by GSM equipment/devices"
HOMEPAGE="https://github.com/ptrkrysik/gr-gsm"
#EGIT_REPO_URI="https://github.com/ptrkrysik/gr-gsm.git"
#EGIT_BRANCH="porting_to_gr38"
HASH_COMMIT="2de47e28ce1fb9a518337bfc0add36c8e3cff5eb"
SRC_URI="https://github.com/ptrkrysik/gr-gsm/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
LICENSE="GPL-3"
SLOT="0"
IUSE="doc"
#if(NOT LIBOSMOCORE_FOUND OR NOT LIBOSMOCODEC_FOUND OR NOT LIBOSMOGSM_FOUND)
# set(LOCAL_OSMOCOM ON)
DEPEND="${PYTHON_DEPS}
>=net-wireless/gnuradio-3.8.0:=
net-wireless/gr-osmosdr
dev-libs/boost:=
dev-libs/log4cpp:=
dev-util/cppunit
net-libs/libosmocore:=
sci-libs/volk:="
RDEPEND="${DEPEND}"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
S="${WORKDIR}/${PN}-${HASH_COMMIT}"
src_prepare() {
#fixme below
sed -i "s|\${GR_DOC_DIR}\/\${CMAKE_PROJECT_NAME}|${EPREFIX}/usr/share/doc/${PF}|g" CMakeLists.txt
cmake_src_prepare
}
src_configure() {
mycmakeargs=(
-DENABLE_DOXYGEN="$(usex doc)"
#why it doesn't work?
# -DGR_PKG_DOC_DIR="$(usex doc ${EPREFIX}/usr/share/doc/${PF})"
-DPYTHON_EXECUTABLE=${PYTHON}
-DLOCAL_OSMOCOM=ON
)
cmake_src_configure
}
src_install() {
cmake_src_install
python_optimize "${D}/$(python_get_sitedir)"
}