commit: 9ae5d18cae8d4fd6b31bfbe7a16bf202e3cc5981
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 12 09:23:07 2025 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Jul 12 09:27:16 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ae5d18c
net-wireless/libxtrx: Fix build with CMake 4
* add missing remote ID
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
net-wireless/libxtrx/files/libxtrx-cmake4.patch | 32 ++++++++++++++++++++++
...1202.ebuild => libxtrx-0.0_p20201202-r1.ebuild} | 8 +++---
net-wireless/libxtrx/libxtrx-9999.ebuild | 8 +++---
net-wireless/libxtrx/metadata.xml | 3 ++
4 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/net-wireless/libxtrx/files/libxtrx-cmake4.patch
b/net-wireless/libxtrx/files/libxtrx-cmake4.patch
new file mode 100644
index 000000000000..88bd6ff0f855
--- /dev/null
+++ b/net-wireless/libxtrx/files/libxtrx-cmake4.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4615124..68551c8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,7 +1,7 @@
++cmake_minimum_required(VERSION 3.10)
+ project(libxtrx C)
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+-cmake_minimum_required(VERSION 2.8)
+
+
+ # Set the version information here
+diff --git a/examples/xtrx_fft/CMakeLists.txt
b/examples/xtrx_fft/CMakeLists.txt
+index 2d1662a..eb044c5 100644
+--- a/examples/xtrx_fft/CMakeLists.txt
++++ b/examples/xtrx_fft/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1.0)
++cmake_minimum_required(VERSION 3.10)
+ project(fft_wnd)
+
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+diff --git a/soapy/CMakeLists.txt b/soapy/CMakeLists.txt
+index edfe657..167887e 100644
+--- a/soapy/CMakeLists.txt
++++ b/soapy/CMakeLists.txt
+@@ -1,3 +1,4 @@
++cmake_minimum_required(VERSION 3.10)
+ set(CMAKE_CXX_STANDARD 11)
+ project(soapyxtrx C CXX)
+
diff --git a/net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild
b/net-wireless/libxtrx/libxtrx-0.0_p20201202-r1.ebuild
similarity index 90%
rename from net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild
rename to net-wireless/libxtrx/libxtrx-0.0_p20201202-r1.ebuild
index e1962c0b6c2e..96835d783b11 100644
--- a/net-wireless/libxtrx/libxtrx-0.0_p20201202.ebuild
+++ b/net-wireless/libxtrx/libxtrx-0.0_p20201202-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -20,8 +20,6 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE=""
-
RDEPEND="
net-wireless/libxtrxll:=
net-wireless/libxtrxdsp:=
@@ -30,6 +28,8 @@ RDEPEND="
# soapy? ( net-wireless/soapysdr )
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${PN}-cmake4.patch )
+
src_configure() {
#fails to build, not sure why
#-DENABLE_SOAPY="$(usex soapy ON OFF)"
diff --git a/net-wireless/libxtrx/libxtrx-9999.ebuild
b/net-wireless/libxtrx/libxtrx-9999.ebuild
index e1962c0b6c2e..96835d783b11 100644
--- a/net-wireless/libxtrx/libxtrx-9999.ebuild
+++ b/net-wireless/libxtrx/libxtrx-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake
@@ -20,8 +20,6 @@ else
KEYWORDS="~amd64 ~x86"
fi
-IUSE=""
-
RDEPEND="
net-wireless/libxtrxll:=
net-wireless/libxtrxdsp:=
@@ -30,6 +28,8 @@ RDEPEND="
# soapy? ( net-wireless/soapysdr )
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${PN}-cmake4.patch )
+
src_configure() {
#fails to build, not sure why
#-DENABLE_SOAPY="$(usex soapy ON OFF)"
diff --git a/net-wireless/libxtrx/metadata.xml
b/net-wireless/libxtrx/metadata.xml
index 807ec69d81bc..11720aab61bf 100644
--- a/net-wireless/libxtrx/metadata.xml
+++ b/net-wireless/libxtrx/metadata.xml
@@ -5,4 +5,7 @@
<email>[email protected]</email>
<name>Radio</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">xtrx-sdr/libxtrx</remote-id>
+ </upstream>
</pkgmetadata>
