commit: 3ff41e7642d7bf75c27d463973477f4558ea6a4d Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> AuthorDate: Thu Dec 7 02:38:51 2023 +0000 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> CommitDate: Thu Dec 7 02:40:04 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ff41e76
net-wireless/rtl-sdr: add 2.0.1 This adds rtlblog v4 support and other updates. Also fixes the license correctly. Closes: https://bugs.gentoo.org/912730 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> net-wireless/rtl-sdr/Manifest | 1 + net-wireless/rtl-sdr/metadata.xml | 3 +++ .../rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild | 3 +-- net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild | 5 ++--- net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild | 3 +-- ...r-0.6.0_p20221217.ebuild => rtl-sdr-2.0.1.ebuild} | 20 +++++--------------- net-wireless/rtl-sdr/rtl-sdr-9999.ebuild | 20 +++++--------------- 7 files changed, 18 insertions(+), 37 deletions(-) diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest index 175021ba6533..8f65fea32bc7 100644 --- a/net-wireless/rtl-sdr/Manifest +++ b/net-wireless/rtl-sdr/Manifest @@ -1,2 +1,3 @@ DIST rtl-sdr-0.6.0_p2020802.tar.gz 134107 BLAKE2B 18ff8fe93a0dfaa20614924c7f951b2e7ffbccb4e5a2ebb6af698321ceaeba5012e6b88be03c7ff4c7b5cd45ec8df2baaa4ae55b813cdf448d895877a6757f47 SHA512 355af98a887a978794b562aa8ef78c91d19c33a6d0eb5740eb3a9b1e1329f8b11ca688eebc81a2d61440972ba5121225205de7165a22882a7e32cf6608888f25 DIST rtl-sdr-0.6.0_p20221217.tar.gz 134261 BLAKE2B 1148e0aeaba67dda5545b2bcd18a806047eeea9573578e1a3111b08abea481e2649ef68ab6ccd9e69603798b0003cc63efb3c5f6184acfd021dd223688402d56 SHA512 e80bae2405aaa4c6c943f5df7afc96ea02cd5861b0348d33e567000bde0a3aa79ab2204311bde6094a4b8037d11eb14ca0f91f8dbd339c339aae2581c0a78652 +DIST rtl-sdr-2.0.1.gh.tar.gz 135727 BLAKE2B 46bb64e2e35d5f6164acb15b0b1e4c0c988bac8de8fd494faec85f4d36f2db3f73ebb0dc46ce42d4b2ff00a9025f145259aeff25563dd82623c2a3502cda1059 SHA512 ed7b84f05d524d89afc1db384a4e1c4bb2a66e9c6b42623ab42ac9d55829bde77eb12529044e1778664b5a97a48dc5b64bed19161a430c9d91c04dd08cb6b7ac diff --git a/net-wireless/rtl-sdr/metadata.xml b/net-wireless/rtl-sdr/metadata.xml index cd7543fbf5e2..cacbce26183d 100644 --- a/net-wireless/rtl-sdr/metadata.xml +++ b/net-wireless/rtl-sdr/metadata.xml @@ -8,4 +8,7 @@ <use> <flag name="zerocopy">may cause a bus error on some ARM systems</flag> </use> + <upstream> + <remote-id type="github">osmocom/rtl-sdr</remote-id> + </upstream> </pkgmetadata> diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild index bbdfee3faae7..1a6acb86c807 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild @@ -10,7 +10,6 @@ HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr"; if [[ ${PV} == 9999* ]]; then inherit git-r3 - SRC_URI="" EGIT_REPO_URI="https://git.osmocom.org/${PN}"; else #git clone https://git.osmocom.org/rtl-sdr @@ -24,7 +23,7 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" fi -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" IUSE="+zerocopy" diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild index f7b88d47150c..ad11e988cd5f 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild @@ -3,14 +3,13 @@ EAPI=7 -inherit cmake multilib +inherit cmake DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver" HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr"; if [[ ${PV} == 9999* ]]; then inherit git-r3 - SRC_URI="" EGIT_REPO_URI="https://git.osmocom.org/${PN}"; else #git clone https://git.osmocom.org/rtl-sdr @@ -24,7 +23,7 @@ else KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" fi -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" IUSE="+zerocopy" diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild index 1da1818e4d31..62c75adae478 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild @@ -10,7 +10,6 @@ HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr"; if [[ ${PV} == 9999* ]]; then inherit git-r3 - SRC_URI="" EGIT_REPO_URI="https://git.osmocom.org/${PN}"; else #git clone https://git.osmocom.org/rtl-sdr @@ -24,7 +23,7 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" fi -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" IUSE="+zerocopy" diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild b/net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild similarity index 65% copy from net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild copy to net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild index 1da1818e4d31..dd2530e97a36 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p20221217.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild @@ -10,21 +10,16 @@ HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr"; if [[ ${PV} == 9999* ]]; then inherit git-r3 - SRC_URI="" EGIT_REPO_URI="https://git.osmocom.org/${PN}"; else - #git clone https://git.osmocom.org/rtl-sdr - #cd rtl-sdr - #git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz - #SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"; - - COMMIT="142325a93c6ad70f851f43434acfdf75e12dfe03" - SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" + #COMMIT="142325a93c6ad70f851f43434acfdf75e12dfe03" + #SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + #S="${WORKDIR}/${PN}-${COMMIT}" + SRC_URI="https://github.com/osmocom/rtl-sdr/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" fi -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" IUSE="+zerocopy" @@ -35,11 +30,6 @@ PATCHES=( "${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch ) -src_prepare() { - sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20221217#' CMakeLists.txt - cmake_src_prepare -} - src_configure() { #the udev rules are 666, we don't want that local mycmakeargs=( diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild index 1da1818e4d31..dd2530e97a36 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild @@ -10,21 +10,16 @@ HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr"; if [[ ${PV} == 9999* ]]; then inherit git-r3 - SRC_URI="" EGIT_REPO_URI="https://git.osmocom.org/${PN}"; else - #git clone https://git.osmocom.org/rtl-sdr - #cd rtl-sdr - #git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz - #SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"; - - COMMIT="142325a93c6ad70f851f43434acfdf75e12dfe03" - SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" + #COMMIT="142325a93c6ad70f851f43434acfdf75e12dfe03" + #SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + #S="${WORKDIR}/${PN}-${COMMIT}" + SRC_URI="https://github.com/osmocom/rtl-sdr/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" fi -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" IUSE="+zerocopy" @@ -35,11 +30,6 @@ PATCHES=( "${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch ) -src_prepare() { - sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20221217#' CMakeLists.txt - cmake_src_prepare -} - src_configure() { #the udev rules are 666, we don't want that local mycmakeargs=(
