* [gentoo-commits] repo/gentoo:master commit in: net-wireless/rtl-sdr/, net-wireless/rtl-sdr/files/
@ 2018-06-06 8:13 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2018-06-06 8:13 UTC (permalink / raw
To: gentoo-commits
commit: 7b4faeec4a39a52cc65298d67ec8a3bf1cacce7c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 3 12:42:41 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 6 08:11:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b4faeec
net-wireless/rtl-sdr: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-wireless/rtl-sdr/Manifest | 1 -
.../files/rtl-sdr-0.5.3-static-inline.patch | 66 ----------------------
.../rtl-sdr/rtl-sdr-0.5.3_p20150730.ebuild | 53 -----------------
3 files changed, 120 deletions(-)
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 26c994c8052..cd7eb23d549 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -1,2 +1 @@
-DIST rtl-sdr-0.5.3_p20150730.tar.xz 485476 BLAKE2B 950d6b6d959bf6998c1ddb0c8ee55621e05ccce16abc7b03ee6632dc194249a8cea75f68697a54c0e156750708f14365bbb327f4198e36a9e042898ea015f945 SHA512 b19e9ce6ebc1c63a26ad3d8b13ccdcac76d4dee317aba547a8cd760e59256251df59ecc3ff6f8cb42d9be8235d67bd280f3373e58acb64f553fae5e3c2d113a6
DIST rtl-sdr-0.5.3_p20170919.tar.xz 98972 BLAKE2B fb7d977bd05a2c717897ba58a2242698d1a90cf38a7a8340d7ec8c3aefeeff49bfe9612285253b27c6726ae584172e0b26c8f535bc4bec704958c1296e232f04 SHA512 b1b97c720882ccbe8be8e30af28b8d52c5a27507861bdb9e964e153cd8ece9de977abd271b68861c163a7cf239044f28c8d17ccda5ff5acf60f17d839d782a82
diff --git a/net-wireless/rtl-sdr/files/rtl-sdr-0.5.3-static-inline.patch b/net-wireless/rtl-sdr/files/rtl-sdr-0.5.3-static-inline.patch
deleted file mode 100644
index 0f0e829e3b0..00000000000
--- a/net-wireless/rtl-sdr/files/rtl-sdr-0.5.3-static-inline.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://github.com/steve-m/librtlsdr/pull/38
-
-From ea6a86d8e792430faa3a8161ee99f2bc392875d1 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Fri, 3 Feb 2017 15:44:18 -1000
-Subject: [PATCH] fix builds with newer compilers & C standards
-
-The meaning of "inline" has changed when "static" is not used.
-Since none of these functions are used outside of their respective
-files, mark them as static to avoid build errors where funcs are
-not inlined (based on compiler flags too).
----
- src/rtl_adsb.c | 8 ++++----
- src/rtl_power.c | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/rtl_adsb.c b/src/rtl_adsb.c
-index e611e78f3dad..a3bfa7f36b5e 100644
---- a/src/rtl_adsb.c
-+++ b/src/rtl_adsb.c
-@@ -182,7 +182,7 @@ int magnitute(uint8_t *buf, int len)
- return len/2;
- }
-
--inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
-+static inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
- /* takes 4 consecutive real samples, return 0 or 1, BADSAMPLE on error */
- {
- int bit, bit_p;
-@@ -223,17 +223,17 @@ inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d
- return BADSAMPLE;
- }
-
--inline uint16_t min16(uint16_t a, uint16_t b)
-+static inline uint16_t min16(uint16_t a, uint16_t b)
- {
- return a<b ? a : b;
- }
-
--inline uint16_t max16(uint16_t a, uint16_t b)
-+static inline uint16_t max16(uint16_t a, uint16_t b)
- {
- return a>b ? a : b;
- }
-
--inline int preamble(uint16_t *buf, int i)
-+static inline int preamble(uint16_t *buf, int i)
- /* returns 0/1 for preamble at index i */
- {
- int i2;
-diff --git a/src/rtl_power.c b/src/rtl_power.c
-index aa7a138a8cd3..a7a43bbd2507 100644
---- a/src/rtl_power.c
-+++ b/src/rtl_power.c
-@@ -249,7 +249,7 @@ void sine_table(int size)
- }
- }
-
--inline int16_t FIX_MPY(int16_t a, int16_t b)
-+static inline int16_t FIX_MPY(int16_t a, int16_t b)
- /* fixed point multiply and scale */
- {
- int c = ((int)a * (int)b) >> 14;
---
-2.11.0
-
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20150730.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20150730.ebuild
deleted file mode 100644
index 11c384d7264..00000000000
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20150730.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
-HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
-
-if [[ ${PV} == 9999* ]]; then
- inherit git-r3
- SRC_URI=""
- EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
- KEYWORDS=""
-else
- SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.5.3-static-inline.patch
-)
-
-src_unpack() {
- if [[ ${PV} == 9999* ]]; then
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_configure() {
- #the udev rules are 666, we don't want that
- mycmakeargs=(
- -DINSTALL_UDEV_RULES=OFF
- -DDETACH_KERNEL_DRIVER=ON
- -DLIB_INSTALL_DIR=/usr/$(get_libdir)
- )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- elog "Only users in the usb group can capture."
- elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/rtl-sdr/, net-wireless/rtl-sdr/files/
@ 2022-06-14 12:54 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-06-14 12:54 UTC (permalink / raw
To: gentoo-commits
commit: 03cd3275857a0d452d03b93c6db9700166b487a7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 12:53:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 12:54:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03cd3275
net-wireless/rtl-sdr: fix libdir in .pc
Bug: https://bugs.gentoo.org/831403
Signed-off-by: Sam James <sam <AT> gentoo.org>
...rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch | 13 +++++++++++++
...-9999.ebuild => rtl-sdr-0.6.0_p2020802-r1.ebuild} | 20 ++++++++------------
net-wireless/rtl-sdr/rtl-sdr-9999.ebuild | 18 +++++++-----------
3 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch b/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..b71454b87828
--- /dev/null
+++ b/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc39bc3..4833602 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -160,7 +160,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
+ 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/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild
similarity index 82%
copy from net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
copy to net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild
index 4f87f3a82cdd..e6d44a620d49 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake multilib
+inherit cmake
-DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
+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
@@ -21,7 +21,7 @@ else
COMMIT="ed0317e6a58c098874ac58b769cf2e609c18d9a5"
SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${COMMIT}"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
fi
LICENSE="GPL-2"
@@ -31,13 +31,9 @@ IUSE="+zerocopy"
DEPEND="virtual/libusb:1"
RDEPEND="${DEPEND}"
-src_unpack() {
- if [[ ${PV} == 9999* ]]; then
- git-r3_src_unpack
- else
- default
- fi
-}
+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_p20200802#' CMakeLists.txt
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index 4f87f3a82cdd..b00901863baa 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit cmake multilib
+inherit cmake
-DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
+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
@@ -31,13 +31,9 @@ IUSE="+zerocopy"
DEPEND="virtual/libusb:1"
RDEPEND="${DEPEND}"
-src_unpack() {
- if [[ ${PV} == 9999* ]]; then
- git-r3_src_unpack
- else
- default
- fi
-}
+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_p20200802#' CMakeLists.txt
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-14 12:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-06 8:13 [gentoo-commits] repo/gentoo:master commit in: net-wireless/rtl-sdr/, net-wireless/rtl-sdr/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-06-14 12:54 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox