* [gentoo-commits] repo/proj/guru:master commit in: net-wireless/sdrpp/, net-wireless/sdrpp/files/
@ 2024-06-15 15:55 Julien Roy
0 siblings, 0 replies; 3+ messages in thread
From: Julien Roy @ 2024-06-15 15:55 UTC (permalink / raw
To: gentoo-commits
commit: 618816b32d9eb3a89954d82ccb9eb994b45a8952
Author: Eli Burch <eli.burch <AT> burchbytes <DOT> com>
AuthorDate: Sat Jun 15 14:53:39 2024 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sat Jun 15 14:59:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=618816b3
net-wireless/sdrpp: new package, add 1.2.0
Signed-off-by: Eli Burch <eli.burch <AT> burchbytes.com>
net-wireless/sdrpp/Manifest | 1 +
net-wireless/sdrpp/files/lib64.patch | 11 ++++
net-wireless/sdrpp/metadata.xml | 23 +++++++++
net-wireless/sdrpp/sdrpp-1.2.0.ebuild | 95 +++++++++++++++++++++++++++++++++++
4 files changed, 130 insertions(+)
diff --git a/net-wireless/sdrpp/Manifest b/net-wireless/sdrpp/Manifest
new file mode 100644
index 000000000..a2347fb90
--- /dev/null
+++ b/net-wireless/sdrpp/Manifest
@@ -0,0 +1 @@
+DIST sdrpp-1.2.0.tar.gz 3719680 BLAKE2B 0d6e8aa35fa6378687fd6c691e391c3ebe9a1302d9d7ca5511c439d701f3ca5b52c85b85f2a74efc0f2ef7c71e446217519d70a1049b484b4ff48aa81ae6b78b SHA512 7bf829149a5be59686ce973c25062281a2542255ea87fbcb9277a1dfcbc2584f41e33009e6dbff45d6696affc6ba25b0c357cd67f7d7a2968acca161a1144bc4
diff --git a/net-wireless/sdrpp/files/lib64.patch b/net-wireless/sdrpp/files/lib64.patch
new file mode 100644
index 000000000..1233c85fd
--- /dev/null
+++ b/net-wireless/sdrpp/files/lib64.patch
@@ -0,0 +1,11 @@
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index f194d7a..7aa825d 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -167,4 +167,4 @@ set(CORE_FILES ${RUNTIME_OUTPUT_DIRECTORY} PARENT_SCOPE)
+ # cmake .. "-DCMAKE_TOOLCHAIN_FILE=C:/dev/vcpkg/scripts/buildsystems/vcpkg.cmake"
+
+ # Install directives
+-install(TARGETS sdrpp_core DESTINATION lib)
+\ No newline at end of file
++install(TARGETS sdrpp_core DESTINATION lib64)
diff --git a/net-wireless/sdrpp/metadata.xml b/net-wireless/sdrpp/metadata.xml
new file mode 100644
index 000000000..54d8c6579
--- /dev/null
+++ b/net-wireless/sdrpp/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>eli.burch@burchbytes.com</email>
+ <name>Eli Burch</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">AlexandreRouma/SDRPlusPlus</remote-id>
+ </upstream>
+ <use>
+ <flag name="airspy">Support for airspy hardware</flag>
+ <flag name="airspyhf">Support for airspyhf+ hardware</flag>
+ <flag name="hackrf">Support for HackRF hardware</flag>
+ <flag name="rtlsdr">Support for rtlsdr dongles</flag>
+ <flag name="soapy">Support for hardware supported by SoapySDR</flag>
+ <flag name="bladerf">Support for bladerf hardware</flag>
+ <flag name="hermes">Support for hermes</flag>
+ <flag name="plutosdr">Support for plutosdr hardware</flag>
+ <flag name="sdrplay">Support for sdrplay hardware</flag>
+ <flag name="uhd">Support for uhd hardware</flag>
+ </use>
+</pkgmetadata>
diff --git a/net-wireless/sdrpp/sdrpp-1.2.0.ebuild b/net-wireless/sdrpp/sdrpp-1.2.0.ebuild
new file mode 100644
index 000000000..4cb7415b9
--- /dev/null
+++ b/net-wireless/sdrpp/sdrpp-1.2.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake
+
+DESCRIPTION="Cross-Platform SDR Software "
+HOMEPAGE="https://www.sdrpp.org/"
+SRC_URI="https://github.com/AlexandreRouma/SDRPlusPlus/archive/206ce6e8c37aa7ee2e1990b80644330b6ac69b6b.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Sources
+SOURCES_IUSE="airspy airspyhf bladerf hackrf hermes plutosdr rtlsdr sdrplay soapy uhd"
+
+SINKS_IUSE="portaudio"
+
+IUSE="${SOURCES_IUSE} ${SINKS_IUSE}"
+
+DEPEND="sci-libs/fftw
+ media-libs/glfw
+ media-libs/glew
+ sci-libs/volk
+ app-arch/zstd
+ media-libs/rtaudio
+ dev-build/cmake
+ airspy? (
+ net-wireless/airspy
+ )
+ airspyhf? (
+ net-wireless/airspyhf
+ )
+ bladerf? (
+ net-wireless/bladerf
+ )
+ hackrf? (
+ net-libs/libhackrf
+ )
+ plutosdr? (
+ net-libs/libad9361-iio
+ net-libs/libiio
+ )
+ sdrplay? (
+ net-wireless/sdrplay
+ )
+ soapy? (
+ net-wireless/soapysdr
+ )
+ rtlsdr? (
+ net-wireless/rtl-sdr
+ )
+ uhd? (
+ net-wireless/uhd
+ )
+ portaudio? (
+ media-libs/portaudio
+ )
+"
+RDEPEND="${DEPEND}"
+
+src_unpack(){
+ default
+ mv SDRPlusPlus* "${P}" || die
+}
+
+src_prepare(){
+ if [ "${ARCH}" = "amd64" ];
+ then
+ eapply "${FILESDIR}/lib64.patch"
+ fi
+ cmake_src_prepare
+}
+
+src_configure(){
+ mycmakeargs+=(
+ -DOPT_BUILD_AIRSPY_SOURCE=$(usex airspy ON OFF)
+ -DOPT_BUILD_AIRSPYHF_SOURCE=$(usex airspyhf ON OFF)
+ -DOPT_BUILD_BLADERF_SOURCE=$(usex bladerf ON OFF)
+ -DOPT_BUILD_HACKRF_SOURCE=$(usex hackrf ON OFF)
+ -DOPT_BUILD_HERMES_SOURCE=$(usex hermes ON OFF)
+ -DOPT_BUILD_PLUTOSDR_SOURCE=$(usex plutosdr ON OFF)
+ -DOPT_BUILD_RTL_SDR_SOURCE=$(usex rtlsdr ON OFF)
+ -DOPT_BUILD_SDRPLAY_SOURCE=$(usex sdrplay ON OFF)
+ -DOPT_BUILD_SOAPY_SOURCE=$(usex soapy ON OFF)
+ -DOPT_BUILD_USRP_SOURCE=$(usex uhd ON OFF)
+ -DOPT_BUILD_NEW_PORTAUDIO_SINK=$(usex portaudio ON OFF)
+ -DOPT_BUILD_PORTAUDIO_SINK=$(usex portaudio ON OFF)
+ -DOPT_BUILD_DISCORD_PRESENCE="OFF"
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-wireless/sdrpp/, net-wireless/sdrpp/files/
@ 2024-06-19 7:15 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2024-06-19 7:15 UTC (permalink / raw
To: gentoo-commits
commit: caf3b755ac6cd4f15773fc9bb309db010b25befc
Author: Eli Burch <eli.burch <AT> burchbytes <DOT> com>
AuthorDate: Tue Jun 18 16:30:49 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 16:31:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=caf3b755
net-wireless/sdrpp: Patch out problem compiler flags
Closes: https://bugs.gentoo.org/934413
Signed-off-by: Eli Burch <eli.burch <AT> burchbytes.com>
.../files/sdrpp-1.2.0_pre20240607-lib64.patch | 10 +++++
...p-1.2.0_pre20240607-remove-compiler-flags.patch | 43 ++++++++++++++++++++++
net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild | 6 ++-
3 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch
new file mode 100644
index 000000000..4aadaf719
--- /dev/null
+++ b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch
@@ -0,0 +1,10 @@
+# Patch lib directory
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -167,4 +167,4 @@ set(CORE_FILES ${RUNTIME_OUTPUT_DIRECTORY} PARENT_SCOPE)
+ # cmake .. "-DCMAKE_TOOLCHAIN_FILE=C:/dev/vcpkg/scripts/buildsystems/vcpkg.cmake"
+
+ # Install directives
+-install(TARGETS sdrpp_core DESTINATION lib)
+\ No newline at end of file
++install(TARGETS sdrpp_core DESTINATION lib64)
diff --git a/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch
new file mode 100644
index 000000000..f37a44312
--- /dev/null
+++ b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch
@@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0726e57..af67d19 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -85,9 +85,9 @@ else()
+ if (MSVC)
+ set(SDRPP_COMPILER_FLAGS /O2 /Ob2 /std:c++17 /EHsc)
+ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+- set(SDRPP_COMPILER_FLAGS -O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
++ set(SDRPP_COMPILER_FLAGS -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
+ else ()
+- set(SDRPP_COMPILER_FLAGS -O3 -std=c++17)
++ set(SDRPP_COMPILER_FLAGS -std=c++17)
+ endif ()
+ endif()
+ set(SDRPP_MODULE_COMPILER_FLAGS ${SDRPP_COMPILER_FLAGS})
+@@ -354,4 +354,4 @@ endif ()
+ configure_file(${CMAKE_SOURCE_DIR}/cmake_uninstall.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake @ONLY)
+ add_custom_target(uninstall ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+
+-# Create headers target
+\ No newline at end of file
++# Create headers target
+diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt
+index 7fce281..5a26430 100644
+--- a/core/libcorrect/CMakeLists.txt
++++ b/core/libcorrect/CMakeLists.txt
+@@ -27,12 +27,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+ endif()
+ else()
+ if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+ else()
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+ endif()
+ if(CMAKE_BUILD_TYPE STREQUAL "Profiling")
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -g3")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
+ endif()
+ endif()
+ endif(MSVC)
diff --git a/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild b/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild
index cac3f4449..f6d3016c4 100644
--- a/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild
+++ b/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild
@@ -61,6 +61,10 @@ DEPEND="sci-libs/fftw
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch"
+)
+
src_unpack(){
default
mv SDRPlusPlus* "${P}" || die
@@ -69,7 +73,7 @@ src_unpack(){
src_prepare(){
if [ "${ARCH}" = "amd64" ];
then
- eapply "${FILESDIR}/lib64.patch"
+ eapply "${FILESDIR}/sdrpp-1.2.0_pre20240607-lib64.patch"
fi
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-wireless/sdrpp/, net-wireless/sdrpp/files/
@ 2024-06-25 9:52 David Roman
0 siblings, 0 replies; 3+ messages in thread
From: David Roman @ 2024-06-25 9:52 UTC (permalink / raw
To: gentoo-commits
commit: 16084cb3d2ea0c8207e93d9b14366816f5044ddc
Author: Eli Burch <eli.burch <AT> burchbytes <DOT> com>
AuthorDate: Sun Jun 23 19:34:27 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sun Jun 23 19:35:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=16084cb3
net-wireless/sdrpp: Use get_libdir to get correct libdir
Signed-off-by: Eli Burch <eli.burch <AT> burchbytes.com>
net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch | 10 ----------
net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild | 6 ++----
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch
deleted file mode 100644
index 4aadaf719..000000000
--- a/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-# Patch lib directory
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -167,4 +167,4 @@ set(CORE_FILES ${RUNTIME_OUTPUT_DIRECTORY} PARENT_SCOPE)
- # cmake .. "-DCMAKE_TOOLCHAIN_FILE=C:/dev/vcpkg/scripts/buildsystems/vcpkg.cmake"
-
- # Install directives
--install(TARGETS sdrpp_core DESTINATION lib)
-\ No newline at end of file
-+install(TARGETS sdrpp_core DESTINATION lib64)
diff --git a/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild b/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild
index f6d3016c4..50927ee6b 100644
--- a/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild
+++ b/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild
@@ -71,10 +71,8 @@ src_unpack(){
}
src_prepare(){
- if [ "${ARCH}" = "amd64" ];
- then
- eapply "${FILESDIR}/sdrpp-1.2.0_pre20240607-lib64.patch"
- fi
+ sed -i "s@install(TARGETS sdrpp_core DESTINATION lib)@install(TARGETS sdrpp_core DESTINATION $(get_libdir))@" \
+ "core/CMakeLists.txt" || die
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-25 9:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-25 9:52 [gentoo-commits] repo/proj/guru:master commit in: net-wireless/sdrpp/, net-wireless/sdrpp/files/ David Roman
-- strict thread matches above, loose matches on Subject: below --
2024-06-19 7:15 Florian Schmaus
2024-06-15 15:55 Julien Roy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox