Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/bladerf/files/, net-wireless/bladerf/
Date: Sun, 01 Aug 2021 18:17:56
Message-Id: 1627841727.a58196e74c351092efe79d43adc3c6c34a09fac9.asturm@gentoo
1 commit: a58196e74c351092efe79d43adc3c6c34a09fac9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 29 18:25:58 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 1 18:15:27 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a58196e7
7
8 net-wireless/bladerf: Drop 2019.07
9
10 Bug: https://bugs.gentoo.org/791526
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 net-wireless/bladerf/Manifest | 1 -
15 net-wireless/bladerf/bladerf-2019.07.ebuild | 65 ----------------------
16 .../bladerf/files/bladerf-2019.07-gcc10.patch | 23 --------
17 3 files changed, 89 deletions(-)
18
19 diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
20 index 6813e01a5f9..05da6cefc69 100644
21 --- a/net-wireless/bladerf/Manifest
22 +++ b/net-wireless/bladerf/Manifest
23 @@ -1,3 +1,2 @@
24 DIST analogdevices-no-OS-0bba46.tar.gz 44190321 BLAKE2B b5c31b4b9ed92e0ac9f1a4c1eda38e065f00e0ee8034a99615a2509a4c91c589faefaf2e42a8bd30e61eb36459fa264c6e1892577f759c2ca0810925cede163e SHA512 cf6f6d34fed9879ae7263782f20f33dd3af84201e3477fa0501e072eb08a8a545a07c496ad0ff3f7dc1a6ef407f136f843ba05942b4819e146c5fef023a3bb02
25 -DIST bladerf-2019.07.tar.gz 2186702 BLAKE2B 1d08dc90ddf5d5f650fdc49e5a7e4224de7caa988974c1252052975599066b2221741a2cd2f0ba496e98d63b6d417b0eb1ae12de4dd9a9d43fb730bb6b221dc2 SHA512 e6ba47106ac9904d41fc611560c8f4bc482b9f17b6c476d4a2ac36c5779e9a64222140f4f067fab2252ccfabebf74e866f0fefb359934ff4df7a8416a8558b87
26 DIST bladerf-2021.03.tar.gz 2261864 BLAKE2B b4e58e370c1e515162f01a0da3985b5ba3c210a8a045bd531e618a9da8e4e66e74a8ccca9138cf6427b512f9c4423bd4151cc63d70a5e218c2a24980afa73972 SHA512 76ebb6501ad9286c7a52a0540f991f7848e396b4d75104bf7186ffac5e3142aa79914352238c8a9e0b4453910c171218c0e861092f228202d0b236939fecc325
27
28 diff --git a/net-wireless/bladerf/bladerf-2019.07.ebuild b/net-wireless/bladerf/bladerf-2019.07.ebuild
29 deleted file mode 100644
30 index f3febfccacb..00000000000
31 --- a/net-wireless/bladerf/bladerf-2019.07.ebuild
32 +++ /dev/null
33 @@ -1,65 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -inherit cmake-utils udev
40 -
41 -DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
42 -HOMEPAGE="https://nuand.com/"
43 -
44 -#lib is LGPL and cli tools are GPL
45 -LICENSE="GPL-2+ LGPL-2.1+"
46 -
47 -SLOT="0/${PV}"
48 -
49 -#maintainer notes:
50 -#doc use flag, looks like it can't be disabled right now and will
51 -# always build if pandoc and help2man are installed
52 -# also ignores when deps are missing and just disables docs
53 -IUSE="doc +tecla"
54 -
55 -MY_PN="bladeRF"
56 -
57 -if [[ ${PV} == "9999" ]] ; then
58 - inherit git-r3
59 - EGIT_REPO_URI="https://github.com/Nuand/${MY_PN}.git"
60 -else
61 - MY_PV=${PV/\_/-}
62 - S="${WORKDIR}/${MY_PN}-${MY_PV}"
63 - SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz \
64 - https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz"
65 - KEYWORDS="amd64 ~arm x86"
66 -fi
67 -
68 -CDEPEND=">=dev-libs/libusb-1.0.16
69 - tecla? ( dev-libs/libtecla )"
70 -DEPEND="${CDEPEND}
71 - virtual/pkgconfig"
72 -RDEPEND="${CDEPEND}"
73 -PDEPEND=">=net-wireless/bladerf-firmware-2.3.2
74 - >=net-wireless/bladerf-fpga-0.11.0"
75 -
76 -PATCHES=(
77 - "${FILESDIR}/${P}-gcc10.patch"
78 -)
79 -
80 -src_unpack() {
81 - if [ "${PV}" = "9999" ]; then
82 - git-r3_src_unpack
83 - else
84 - default
85 - mv "${WORKDIR}/no-OS-0bba46e6f6f75785a65d425ece37d0a04daf6157/ad9361" "${S}/thirdparty/analogdevicesinc/no-OS/" || die
86 - fi
87 -}
88 -
89 -src_configure() {
90 - mycmakeargs=(
91 - -DVERSION_INFO_OVERRIDE:STRING="${PV}"
92 - -DBUILD_DOCUMENTATION="$(usex doc)"
93 - -DENABLE_LIBTECLA="$(usex tecla)"
94 - -DTREAT_WARNINGS_AS_ERRORS=OFF
95 - -DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
96 - )
97 - cmake-utils_src_configure
98 -}
99
100 diff --git a/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch b/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
101 deleted file mode 100644
102 index bdd99c5cadc..00000000000
103 --- a/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
104 +++ /dev/null
105 @@ -1,23 +0,0 @@
106 -From 5cf9fd299a396a5ae5b4402215713fd2a84e607b Mon Sep 17 00:00:00 2001
107 -From: Robert Ghilduta <robert.ghilduta@×××××.com>
108 -Date: Mon, 25 May 2020 21:36:50 -0500
109 -Subject: [PATCH] libbladeRF: define bladerf2_state_to_string as extern in
110 - header
111 -
112 ----
113 - host/libraries/libbladeRF/src/board/bladerf2/common.h | 2 +-
114 - 1 file changed, 1 insertion(+), 1 deletion(-)
115 -
116 -diff --git a/host/libraries/libbladeRF/src/board/bladerf2/common.h b/host/libraries/libbladeRF/src/board/bladerf2/common.h
117 -index 23187ba6c..efbebc867 100644
118 ---- a/host/libraries/libbladeRF/src/board/bladerf2/common.h
119 -+++ b/host/libraries/libbladeRF/src/board/bladerf2/common.h
120 -@@ -207,7 +207,7 @@ extern const float ina219_r_shunt;
121 - /* Constants */
122 - /******************************************************************************/
123 -
124 --char const *bladerf2_state_to_string[4];
125 -+extern char const *bladerf2_state_to_string[4];
126 -
127 -
128 - /******************************************************************************/