From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 11E381582EF for ; Sun, 09 Mar 2025 22:47:41 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id C63B63430FA for ; Sun, 09 Mar 2025 22:47:40 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C2EA8110370; Sun, 09 Mar 2025 22:47:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id B6B8B110370 for ; Sun, 09 Mar 2025 22:47:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 35B033430FA for ; Sun, 09 Mar 2025 22:47:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5DB0122C for ; Sun, 09 Mar 2025 22:47:37 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1741560455.f07de82a529064fcd206f098ad5eca2dcdc5c2ca.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/rtl-sdr-blog/files/, net-wireless/rtl-sdr-blog/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/rtl-sdr-blog/Manifest net-wireless/rtl-sdr-blog/files/rtl-sdr-blog-1.3.6-disable-static.patch net-wireless/rtl-sdr-blog/files/rtl-sdr-blog-1.3.6-pkgconfig-libdir.patch net-wireless/rtl-sdr-blog/files/rtl-sdr-blog-1.3.6-udev-rules-path.patch net-wireless/rtl-sdr-blog/files/rtl_tcp.confd net-wireless/rtl-sdr-blog/files/rtl_tcp.initd net-wireless/rtl-sdr-blog/metadata.xml net-wireless/rtl-sdr-blog/rtl-sdr-blog-1.3.6.ebuild X-VCS-Directories: net-wireless/rtl-sdr-blog/ net-wireless/rtl-sdr-blog/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: f07de82a529064fcd206f098ad5eca2dcdc5c2ca X-VCS-Branch: master Date: Sun, 09 Mar 2025 22:47:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 55d5b692-fb39-43a6-aa73-b031c2e9e86e X-Archives-Hash: de20955323165eb2bdd91987f1bbe5d5 commit: f07de82a529064fcd206f098ad5eca2dcdc5c2ca Author: Conrad Kostecki gentoo org> AuthorDate: Sun Mar 9 22:41:36 2025 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sun Mar 9 22:47:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f07de82a net-wireless/rtl-sdr-blog: new package, add 1.3.6 Signed-off-by: Conrad Kostecki gentoo.org> net-wireless/rtl-sdr-blog/Manifest | 1 + .../files/rtl-sdr-blog-1.3.6-disable-static.patch | 55 ++++++++++++++++++++ .../rtl-sdr-blog-1.3.6-pkgconfig-libdir.patch | 11 ++++ .../files/rtl-sdr-blog-1.3.6-udev-rules-path.patch | 11 ++++ net-wireless/rtl-sdr-blog/files/rtl_tcp.confd | 7 +++ net-wireless/rtl-sdr-blog/files/rtl_tcp.initd | 11 ++++ net-wireless/rtl-sdr-blog/metadata.xml | 20 ++++++++ .../rtl-sdr-blog/rtl-sdr-blog-1.3.6.ebuild | 58 ++++++++++++++++++++++ 8 files changed, 174 insertions(+) diff --git a/net-wireless/rtl-sdr-blog/Manifest b/net-wireless/rtl-sdr-blog/Manifest new file mode 100644 index 000000000000..6ef92af99368 --- /dev/null +++ b/net-wireless/rtl-sdr-blog/Manifest @@ -0,0 +1 @@ +DIST rtl-sdr-blog-1.3.6.gh.tar.gz 138270 BLAKE2B a310eb44d1f65c882db35ecb694c4ce4f4e1b295558f61f15f3f7c6e11ca6f9860cd063f58062f2051b93d17af0d710928e95e3b806b17b317ab98143c12057d SHA512 3689fdafd111bae4b033e52b157ba800a6ec3ead8b045f2cf3572059ef49b76fa61aad384c0be6ff1a1c0a73cb46081c0ff9af67f05b0371e738c6dd2f21436c diff --git a/net-wireless/rtl-sdr-blog/files/rtl-sdr-blog-1.3.6-disable-static.patch b/net-wireless/rtl-sdr-blog/files/rtl-sdr-blog-1.3.6-disable-static.patch new file mode 100644 index 000000000000..aff87deed756 --- /dev/null +++ b/net-wireless/rtl-sdr-blog/files/rtl-sdr-blog-1.3.6-disable-static.patch @@ -0,0 +1,55 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -34,25 +34,6 @@ + generate_export_header(rtlsdr) + + ######################################################################## +-# Setup static library variant +-######################################################################## +-add_library(rtlsdr_static STATIC librtlsdr.c +- tuner_e4k.c tuner_fc0012.c tuner_fc0013.c tuner_fc2580.c tuner_r82xx.c) +-target_link_libraries(rtlsdr ${LIBUSB_LIBRARIES} ${THREADS_PTHREADS_LIBRARY}) +-target_include_directories(rtlsdr_static PUBLIC +- $ +- $ # /include +- ${LIBUSB_INCLUDE_DIRS} +- ${THREADS_PTHREADS_INCLUDE_DIR} +- ) +-set_property(TARGET rtlsdr_static APPEND PROPERTY COMPILE_DEFINITIONS "rtlsdr_STATIC" ) +-if(NOT WIN32) +-# Force same library filename for static and shared variants of the library +-set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) +-endif() +-generate_export_header(rtlsdr_static) +- +-######################################################################## + # Set up Windows DLL resource files + ######################################################################## + IF(MSVC) +@@ -63,7 +44,6 @@ + ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc + @ONLY) + target_sources(rtlsdr PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc) +- target_sources(rtlsdr_static PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/rtlsdr.rc) + ENDIF(MSVC) + + ######################################################################## +@@ -94,7 +74,7 @@ + add_executable(rtl_adsb rtl_adsb.c) + add_executable(rtl_power rtl_power.c) + add_executable(rtl_biast rtl_biast.c) +-set(INSTALL_TARGETS rtlsdr rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) ++set(INSTALL_TARGETS rtlsdr rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast) + + target_link_libraries(rtl_sdr rtlsdr convenience_static + ${LIBUSB_LIBRARIES} +@@ -163,9 +143,6 @@ + install(TARGETS rtlsdr EXPORT RTLSDR-export + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file + ) +-install(TARGETS rtlsdr_static EXPORT RTLSDR-export +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # .so/.dylib file +- ) + install(TARGETS rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power rtl_biast + DESTINATION ${CMAKE_INSTALL_BINDIR} + ) diff --git a/net-wireless/rtl-sdr-blog/files/rtl-sdr-blog-1.3.6-pkgconfig-libdir.patch b/net-wireless/rtl-sdr-blog/files/rtl-sdr-blog-1.3.6-pkgconfig-libdir.patch new file mode 100644 index 000000000000..831fc0063947 --- /dev/null +++ b/net-wireless/rtl-sdr-blog/files/rtl-sdr-blog-1.3.6-pkgconfig-libdir.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -174,7 +174,7 @@ + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix \${prefix}) + set(includedir \${prefix}/include) +-set(libdir \${exec_prefix}/lib) ++set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) + + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/librtlsdr.pc.in diff --git a/net-wireless/rtl-sdr-blog/files/rtl-sdr-blog-1.3.6-udev-rules-path.patch b/net-wireless/rtl-sdr-blog/files/rtl-sdr-blog-1.3.6-udev-rules-path.patch new file mode 100644 index 000000000000..e164bc553956 --- /dev/null +++ b/net-wireless/rtl-sdr-blog/files/rtl-sdr-blog-1.3.6-udev-rules-path.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -113,7 +113,7 @@ + if (INSTALL_UDEV_RULES) + install ( + FILES rtl-sdr.rules +- DESTINATION "/etc/udev/rules.d" ++ DESTINATION "/lib/udev/rules.d" + COMPONENT "udev" + ) + else (INSTALL_UDEV_RULES) diff --git a/net-wireless/rtl-sdr-blog/files/rtl_tcp.confd b/net-wireless/rtl-sdr-blog/files/rtl_tcp.confd new file mode 100644 index 000000000000..653d292de3cd --- /dev/null +++ b/net-wireless/rtl-sdr-blog/files/rtl_tcp.confd @@ -0,0 +1,7 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Options which will be passed to rtl_tcp. +# Default is listen on localhost with default port 1234 on first device. +# See `rtl_tcp -h` for all available options. +RTL_TCP_OPTIONS="-a localhost -d0 -p 1234" diff --git a/net-wireless/rtl-sdr-blog/files/rtl_tcp.initd b/net-wireless/rtl-sdr-blog/files/rtl_tcp.initd new file mode 100644 index 000000000000..6dd8f795e190 --- /dev/null +++ b/net-wireless/rtl-sdr-blog/files/rtl_tcp.initd @@ -0,0 +1,11 @@ +#!/sbin/openrc-run +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +error_log="/var/log/rtl_tcp.log" +pidfile="/run/rtl_tcp.pid" +output_log="/var/log/rtl_tcp.log" + +command="/usr/bin/rtl_tcp" +command_background="true" +command_args="${RTL_TCP_OPTIONS}" diff --git a/net-wireless/rtl-sdr-blog/metadata.xml b/net-wireless/rtl-sdr-blog/metadata.xml new file mode 100644 index 000000000000..9e824e3e6fb6 --- /dev/null +++ b/net-wireless/rtl-sdr-blog/metadata.xml @@ -0,0 +1,20 @@ + + + + + conikost@gentoo.org + Conrad Kostecki + + + This package aims to replace the net-wireless/rtl-sdr package, + as it contains various improvments for RTL-SDR Blog V3 and V4 units. + Since it's based on a modified net-wireless/rtl-sdr package, + it cannot co-exist with it. + + + may cause a bus error on some ARM systems + + + osmocom/rtl-sdr + + diff --git a/net-wireless/rtl-sdr-blog/rtl-sdr-blog-1.3.6.ebuild b/net-wireless/rtl-sdr-blog/rtl-sdr-blog-1.3.6.ebuild new file mode 100644 index 000000000000..35b727fd2a29 --- /dev/null +++ b/net-wireless/rtl-sdr-blog/rtl-sdr-blog-1.3.6.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake udev + +DESCRIPTION="Modified Osmocom drivers with enhancements for RTL-SDR Blog V3 and V4 units" +HOMEPAGE="https://github.com/rtlsdrblog/rtl-sdr-blog" +SRC_URI="https://github.com/rtlsdrblog/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="GPL-2+ GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="+zerocopy" + +RDEPEND="virtual/libusb:1" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.3.6-disable-static.patch" + "${FILESDIR}/${PN}-1.3.6-pkgconfig-libdir.patch" + "${FILESDIR}/${PN}-1.3.6-udev-rules-path.patch" + +) + +src_prepare() { + cmake_src_prepare + + # Set proper so file version name + sed -e '/VERSION_INFO_PATCH_VERSION/ s/git/0/g' -i CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DCVF_VERSION="${PV}" + -DDETACH_KERNEL_DRIVER="ON" + -DENABLE_ZEROCOPY="$(usex zerocopy)" + -DINSTALL_UDEV_RULES="ON" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + newinitd "${FILESDIR}"/rtl_tcp.initd rtl_tcp + newconfd "${FILESDIR}"/rtl_tcp.confd rtl_tcp +} + +pkg_postinst() { + udev_reload + elog "Only users in the usb group can capture." + elog "Just run 'gpasswd -a usb', then have re-login." +} + +pkg_postrm() { + udev_reload +}