From ecfcda82ae29dca1e668de7165acd4df2e8948dd Mon Sep 17 00:00:00 2001 From: Quetzaly Daniela Solano Gómez Date: Wed, 5 Apr 2023 14:56:36 -0500 Subject: net-wireless/*: Update gr-osmosdr versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Quetzaly Daniela Solano Gómez --- net-wireless/airspyhf/Manifest | 2 +- net-wireless/airspyhf/airspyhf-1.6.8.ebuild | 2 +- net-wireless/gr-osmosdr/Manifest | 10 +-- .../gr-osmosdr-0.2.3-use_xtrx_open_string.patch | 23 ------ net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild | 80 ------------------- .../gr-osmosdr-0.2.3_p20210128-r1.ebuild | 18 +++-- .../gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild | 83 ------------------- net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild | 93 ++++++++++++++++++++++ net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild | 41 +++++++--- 9 files changed, 141 insertions(+), 211 deletions(-) delete mode 100644 net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch delete mode 100644 net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild delete mode 100644 net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild create mode 100644 net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild diff --git a/net-wireless/airspyhf/Manifest b/net-wireless/airspyhf/Manifest index b86122c..43b125c 100644 --- a/net-wireless/airspyhf/Manifest +++ b/net-wireless/airspyhf/Manifest @@ -1,4 +1,4 @@ DIST airspyhf-1.6.8.tar.gz 33527 BLAKE2B 6b233f2b80fbb166a6bd2b899d43b70349061cc3761514f6197363e63a5b99f256f3a0c10133a7a5c372467adaf4a964b409413c170e0f2ed0abd3435b021b72 SHA512 cc327012f51514935b422d07e54f1806f2a22d900a2bfe2e10adac9acca572ada3853709f0c37300b387061bc7559dcf10eae6814a06e22e8c765f1409b66f59 -EBUILD airspyhf-1.6.8.ebuild 648 BLAKE2B 12ccb5ba6b15241f979b3f14bdc667dc7e83ddb8b0785f26d9ff9aa87a469ed5eecbd91799dbbd5773b6fe371baa472ffc7e8d5e792c8c0cec971adfeaf4a220 SHA512 433e27d5cd3190ce2ffa13eff11d6ce815a3e570108bc28d715b136131ee38418dc62e269fa4f93456eef3b112deac60d52c329d4c1df58f747adf54f676195a +EBUILD airspyhf-1.6.8.ebuild 655 BLAKE2B da43c73b617f537ebb1829ff005d7282a67991461b178847778e889b22ada49e36fb446c6e573f69b881701638c69968c70b629094394a10128a7891d28d49eb SHA512 dc830ece6a341dce64476befc98f5f43b10b93f1449b5762544c005c5745ccafde5b8198a09f5c0ae9e133d6316b0c0b99bcfc1fe59cef8c86416b5a8e04d6ce EBUILD airspyhf-9999.ebuild 624 BLAKE2B 102f88aad4f6bf655dc1d09ef9be95b0d2d2c9d260789d7f4f69405ff5e56bfdbeb659434367cf467314a5a0baa5fa65732cdd676586be150733be610457a2ab SHA512 29b7571215e9dc3e235b1c20577b193205453b522762036f79dada9451c4bd1add1e2bd9f954a5e2a95d335a4babc70492b12564c9c3eccd2e2aa408c688c8ee MISC metadata.xml 384 BLAKE2B 4cae41b9c42294b8ad194da553a21b17c91edb1d8cbc3e0c011c0734ebfc5ef19e627ca15d7a2f7b272289f877667d3621299aa059f0111eb131d236d175489d SHA512 648606aa7d2cc3d13905a3abd400ec6c2cd28b65793ea65d4c1114b03d0c2183a538e6773edafd150683ea02251d58b42dc9f22e7e6dfbba42d9623850bbcd38 diff --git a/net-wireless/airspyhf/airspyhf-1.6.8.ebuild b/net-wireless/airspyhf/airspyhf-1.6.8.ebuild index d154b74..2cdb238 100644 --- a/net-wireless/airspyhf/airspyhf-1.6.8.ebuild +++ b/net-wireless/airspyhf/airspyhf-1.6.8.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="User mode driver for Airspy HF+" HOMEPAGE="https://github.com/airspy/airspyhf" SRC_URI="https://github.com/airspy/airspyhf/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~riscv ~x86" LICENSE="BSD" SLOT="0/${PV}" diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest index c2abe50..0e4d381 100644 --- a/net-wireless/gr-osmosdr/Manifest +++ b/net-wireless/gr-osmosdr/Manifest @@ -1,9 +1,7 @@ -AUX gr-osmosdr-0.2.3-use_xtrx_open_string.patch 931 BLAKE2B 21df3d2ef163f7216ad8b34c86877b65b4909523bd80bf1d1a7ab86fa1676f777a49a670a456a2b4babdcbbee7063e6fd8b6a24a025b92d43632d580fa8ab329 SHA512 0d763dbbd510f273fbe937bf51a07cda2f2d9e53dcfdb64d210f3c85c51e6995223cf13d81d94b90dc7dc0fddde8fc8ea6f30d23b652edf8945fee08c494b1f0 AUX gr-osmosdr-0.2.3_p20210128-fix-enable-python.patch 342 BLAKE2B fe7b93a8679eb11959560e41c8c9675d94f27578c98926327329139cab87cdab1d8556605809347a894a6cf66b44f9d585ace9c3edf51d938558cab0a7da67ef SHA512 dab43caa06b4073cc6832076b58a938f6ad0ea023870279c2f49588d88d2b208465d4788f6d0ed9d02a11a6678e21974a982a23565fcecbf72d841ea6b1a18a6 -DIST gr-osmosdr-0.2.3.tar.gz 252727 BLAKE2B 04fe86496c09a274058bfd812fc14d7843d7e9db2648cf2cf5292e50494a859e22b1ab211f7078f2b6964c786c5f5ad5c3c9d2dd44ec5fc96d240b96f2cb63f4 SHA512 3c82a39972a309aa5b023b9c5e61f1fc80b797380b7a6c6c23cd4fe278cfaba3ab3019f32d38ebc01300868bb892f6aaaa7f12c9ee9b7ab5ba3e38817a40bf3e DIST gr-osmosdr-0.2.3_p20210128.tar.gz 257938 BLAKE2B 1bdb3b57ec6a2f942769770c34d41b4e3db5b62f8c337d724b0099f9a2fe5bdb7231bc0727dfe4bd01cd62918b4847ea2f8780208c0960bced5853c716ec6f02 SHA512 4dcb6b2c10eeb2252111ba691be179fe5b6dc9598fa7e6129a3b214ee74d43ca2d67ab5eafa73cea2abb25729c24be0592585d149e13c7285f2ce330e52a6470 -EBUILD gr-osmosdr-0.2.3.ebuild 2209 BLAKE2B 013c2904d26c1773153d2b6b0e559a3d378b82527487e0c4bfd6586782dab66b33eba13f3c7ec9308a9204ce2d7c3bf349688335eea6d9b1d04420c5f6fbb02f SHA512 99d9a36d9d885d01d0d70278753c3c8cacaf04d62967502100ee23c1c78a27191621da5edafa5123536a7665a4b1e6a11d07408f3ac8c917cd865e3699e84ed6 -EBUILD gr-osmosdr-0.2.3_p20210128-r1.ebuild 2468 BLAKE2B 5449613ed974d0e5ed4177566376cfc75f163742ed7a871085aef0c86688815f4ad3b06e681425988c6d7a384ef315a3c115b7fbe8cacb0588925246f2a63207 SHA512 e33af1bf71048eaccfb3fe06046df83d6f00adb080f88321243501e426e45dc737c8637e08861dc87c728310b80a043b0c5aa45b451dc08a6cc2f13ec7541278 -EBUILD gr-osmosdr-0.2.3_p20210128.ebuild 2335 BLAKE2B c8c592bc1db7d07063ba24ceae8ba5279a9ca54feb9ca81d6ddbddc413b0e0097e2c56e2cd756431c2c636c778394ec87f348cc4fedfc352fdb6668c82fea6b1 SHA512 70c20dcb661e2608159ef906e10cb93bad8dcf7a8eecafefceb2bc6315381e00f90eabf371d727bb867242a4a18fed4c1df827e5c6b136ee4d2cec4ecf0df49e -EBUILD gr-osmosdr-9999.ebuild 2126 BLAKE2B e2feee23a7aa2f128e0d7e24eb5f6c78bb724e2a5c505a0bfa0185f58bc8f67ae38c4e32715a7858a76db4f703a1571a4143f24f839baafdeaf853c2f3a6a4f7 SHA512 7c6a78f63a427a92a01c9ab7853b7303afb5ec0ea8719392fe7fb07273fb9dd2b48bc23f8234756efea95fbcc149d94fa5e1e4ad5d3745cbe9a459b7668a0a87 +DIST gr-osmosdr-0.2.4.tar.gz 260745 BLAKE2B 6af08b2658619edbbbf398aebcd3b3262f03aa7ed9d18c31970c255f093ea60d8da8597635fdd33a267a005a375fd54b82d1405c6674ad92721c38b3e4660a16 SHA512 04b54c92e40e58b76a9e6c9c3fb419f97af2599ca2f92cb58858464722e993ebe05896ffee2592ced729521ec65857eac9fac7809567c8b6de62a0ff99f615d5 +EBUILD gr-osmosdr-0.2.3_p20210128-r1.ebuild 2627 BLAKE2B 8e944fc30ed0932ae044145ffabc4bb3029d753da2aef7057e42d20369aa170015febc480ace72b416f5c7ce497e4fc3a43db3a5f1718ba2b208ed2dc45b3e6c SHA512 27bbd419d8f4f8e40838d8599826fcc5dc443d163782fdbece7ff132d182c9b75b30238f430060729f235ab4d7e338761aab8ae5f14f38e4c2bbf59cb9ad1a10 +EBUILD gr-osmosdr-0.2.4.ebuild 2636 BLAKE2B cf4a003f851c7df90544255ceebeca2d635cdd31d1ee73c32a306ec1c938bc151ab29b2c62b1b52c3a0809cbb3066b52c94c5fa1237ee1f62990c0f9b38b0211 SHA512 7fd2d5bbf2c54d5372dab6fc2646ef452a01e13c16912a1338068b65fe9bf7474b22e88647bab50c1e6409b93b395cbee6976660e1d8cf646879e37423eed7eb +EBUILD gr-osmosdr-9999.ebuild 2634 BLAKE2B 840f9454d006627d91d8ee9b429002e1db646b686757125306c10e52e57a75bcaedd4c69dd87e6ae1ed62c4d45d0da33c4d8933cd68abc34f1421026861e059e SHA512 63b6f053e0cc993bbe6447363d9d1fc93969dc872701afbae22666a7394f2135adb4e7ad43f1297ba5497b0f17b64b5b0c402a6a6c27e05436231e4177c5f976 MISC metadata.xml 957 BLAKE2B 7bcc1cba394e707749e5a350a7d3db16ebb2f9d7a85d5951bccdd4dc09cdd101cec7c95993cdd9d4abeef78660f81c27388faff9a032dedcd755bbb424663418 SHA512 86263cbd1eb5a9c1e4c567d535e20260df49a4fc161c4ce1e6d7289a0e3f902e6c4208f8badcb40aa26540710a96e020aa6b746c363e256a3c5211501bae7af2 diff --git a/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch b/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch deleted file mode 100644 index 7699c81..0000000 --- a/net-wireless/gr-osmosdr/files/gr-osmosdr-0.2.3-use_xtrx_open_string.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ecca19615c588f771a131432f7161156efc274c2 Mon Sep 17 00:00:00 2001 -From: lain -Date: Tue, 30 Jul 2019 15:59:38 -0700 -Subject: [PATCH] Quick patch to use xtrx_open_string() instead of the removed - xtrx_open_list(). - ---- - lib/xtrx/xtrx_obj.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/xtrx/xtrx_obj.cc b/lib/xtrx/xtrx_obj.cc -index 1d58de5..5c73259 100644 ---- a/lib/xtrx/xtrx_obj.cc -+++ b/lib/xtrx/xtrx_obj.cc -@@ -68,7 +68,7 @@ xtrx_obj::xtrx_obj(const std::string &path, unsigned loglevel, bool lmsreset) - unsigned xtrxflag = (loglevel & XTRX_O_LOGLVL_MASK) | ((lmsreset) ? XTRX_O_RESET : 0); - std::cerr << "xtrx_obj::xtrx_obj = " << xtrxflag << std::endl; - -- int res = xtrx_open_list(path.c_str(), NULL, &_obj); -+ int res = xtrx_open_string(path.c_str(), &_obj); - if (res < 0) { - std::stringstream message; - message << "Couldn't open " ": Error: " << -res; diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild deleted file mode 100644 index 14bccd9..0000000 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9,10} ) - -inherit cmake python-single-r1 - -DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf" -HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git" -else - SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" -fi - -LICENSE="GPL-3" -SLOT="0/${PV}" -IUSE="airspy airspyhf bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx" - -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:= - dev-libs/log4cpp - =net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}] - sci-libs/volk:= - airspy? ( net-wireless/airspy ) - airspyhf? ( net-wireless/airspyhf ) - bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) - hackrf? ( net-libs/libhackrf:= ) - iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] ) - rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) - sdrplay? ( net-wireless/sdrplay ) - soapy? ( net-wireless/soapysdr:= ) - uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] ) - xtrx? ( net-wireless/libxtrx ) - " -DEPEND="${RDEPEND} - dev-lang/swig - " - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -PATCHES=( - "${FILESDIR}/${P}-use_xtrx_open_string.patch" -) - -src_configure() { - local mycmakeargs=( - -DENABLE_DEFAULT=OFF - -DPYTHON_EXECUTABLE="${PYTHON}" - -DENABLE_FILE=ON - -DENABLE_AIRSPY="$(usex airspy ON OFF)" - -DENABLE_AIRSPYHF="$(usex airspyhf)" - -DENABLE_BLADERF="$(usex bladerf ON OFF)" - -DENABLE_HACKRF="$(usex hackrf ON OFF)" - -DENABLE_IQBALANCE="$(usex iqbalance ON OFF)" - -DENABLE_PYTHON="$(usex python ON OFF)" - -DENABLE_RTL="$(usex rtlsdr ON OFF)" - -DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)" - -DENABLE_SDRPLAY="$(usex sdrplay ON OFF)" - -DENABLE_NONFREE="$(usex sdrplay ON OFF)" - -DENABLE_SOAPY="$(usex soapy ON OFF)" - -DENABLE_UHD="$(usex uhd ON OFF)" - -DENABLE_XTRX="$(usex xtrx ON OFF)" - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - if use python; then - python_fix_shebang "${ED}"/usr/bin - python_optimize - fi - mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" -} diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild index c5759c9..7f011db 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128-r1.ebuild @@ -1,22 +1,28 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +EAPI=8 +PYTHON_COMPAT=( python3_10 ) inherit cmake python-single-r1 DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf" -HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR" +HOMEPAGE=" + https://sdr.osmocom.org/trac/wiki/GrOsmoSDR + https://gitea.osmocom.org/sdr/gr-osmosdr +" if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git" else + #commit COMMIT="a100eb024c0210b95e4738b6efd836d48225bd03" SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64 ~x86" + #release + #SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi LICENSE="GPL-3" @@ -49,7 +55,7 @@ BDEPEND=" REQUIRED_USE="${PYTHON_REQUIRED_USE}" PATCHES=( - "${FILESDIR}"/${P}-fix-enable-python.patch + "${FILESDIR}/${P}-fix-enable-python.patch" ) src_configure() { diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild deleted file mode 100644 index 2ac791b..0000000 --- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3_p20210128.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) - -inherit cmake python-single-r1 - -DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf" -HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git" -else - COMMIT="a100eb024c0210b95e4738b6efd836d48225bd03" - SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-3" -SLOT="0/${PV}" -IUSE="airspy airspyhf bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx" - -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:= - dev-libs/log4cpp - >=net-wireless/gnuradio-3.9.0.0:0=[${PYTHON_SINGLE_USEDEP}] - sci-libs/volk:= - airspy? ( net-wireless/airspy ) - airspyhf? ( net-wireless/airspyhf ) - bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) - hackrf? ( net-libs/libhackrf:= ) - iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] ) - rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) - sdrplay? ( net-wireless/sdrplay ) - soapy? ( net-wireless/soapysdr:= ) - uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] ) - xtrx? ( net-wireless/libxtrx ) - " -DEPEND="${RDEPEND} - dev-lang/swig - " - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -PATCHES=( - "${FILESDIR}"/${P}-fix-enable-python.patch -) - -src_configure() { - local mycmakeargs=( - -DENABLE_DEFAULT=OFF - -DPYTHON_EXECUTABLE="${PYTHON}" - -DENABLE_FILE=ON - -DENABLE_AIRSPY="$(usex airspy ON OFF)" - -DENABLE_AIRSPYHF="$(usex airspyhf)" - -DENABLE_BLADERF="$(usex bladerf ON OFF)" - -DENABLE_HACKRF="$(usex hackrf ON OFF)" - -DENABLE_IQBALANCE="$(usex iqbalance ON OFF)" - -DENABLE_PYTHON="$(usex python ON OFF)" - -DENABLE_RTL="$(usex rtlsdr ON OFF)" - -DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)" - -DENABLE_SDRPLAY="$(usex sdrplay ON OFF)" - -DENABLE_NONFREE="$(usex sdrplay ON OFF)" - -DENABLE_SOAPY="$(usex soapy ON OFF)" - -DENABLE_UHD="$(usex uhd ON OFF)" - -DENABLE_XTRX="$(usex xtrx ON OFF)" - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - if use python; then - find "${ED}" -name '*.py[oc]' -delete || die - python_fix_shebang "${ED}"/usr/bin - python_optimize - fi - mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" -} diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild new file mode 100644 index 0000000..ed96a01 --- /dev/null +++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.4.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_10 ) + +inherit cmake python-single-r1 + +DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf" +HOMEPAGE=" + https://sdr.osmocom.org/trac/wiki/GrOsmoSDR + https://gitea.osmocom.org/sdr/gr-osmosdr +" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git" +else + #commit + #COMMIT="a100eb024c0210b95e4738b6efd836d48225bd03" + #SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + #S="${WORKDIR}/${PN}-${COMMIT}" + #release + SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" +fi + +LICENSE="GPL-3" +SLOT="0/${PV}" +IUSE="airspy airspyhf bladerf doc hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx" + +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:= + dev-libs/log4cpp + net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] + sci-libs/volk:= + airspy? ( net-wireless/airspy ) + airspyhf? ( net-wireless/airspyhf ) + bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) + hackrf? ( net-libs/libhackrf:= ) + iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] ) + rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= ) + sdrplay? ( net-wireless/sdrplay ) + soapy? ( net-wireless/soapysdr:= ) + uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] ) + xtrx? ( net-wireless/libxtrx ) + " +DEPEND="${RDEPEND}" + +BDEPEND=" + $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') + doc? ( app-doc/doxygen ) + " + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +PATCHES=( + "${FILESDIR}/${PN}-0.2.3_p20210128-fix-enable-python.patch" +) + +src_configure() { + local mycmakeargs=( + -DENABLE_DEFAULT=OFF + -DPYTHON_EXECUTABLE="${PYTHON}" + -DENABLE_FILE=ON + -DENABLE_AIRSPY="$(usex airspy ON OFF)" + -DENABLE_AIRSPYHF="$(usex airspyhf)" + -DENABLE_BLADERF="$(usex bladerf ON OFF)" + -DENABLE_HACKRF="$(usex hackrf ON OFF)" + -DENABLE_IQBALANCE="$(usex iqbalance ON OFF)" + -DENABLE_PYTHON="$(usex python ON OFF)" + -DENABLE_RTL="$(usex rtlsdr ON OFF)" + -DENABLE_RTL_TCP="$(usex rtlsdr ON OFF)" + -DENABLE_SDRPLAY="$(usex sdrplay ON OFF)" + -DENABLE_NONFREE="$(usex sdrplay ON OFF)" + -DENABLE_SOAPY="$(usex soapy ON OFF)" + -DENABLE_UHD="$(usex uhd ON OFF)" + -DENABLE_XTRX="$(usex xtrx ON OFF)" + -DENABLE_DOXYGEN="$(usex doc ON OFF)" + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + if use python; then + find "${ED}" -name '*.py[oc]' -delete || die + python_fix_shebang "${ED}"/usr/bin + python_optimize + fi + mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" +} diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild index e0d37ab..c4d673c 100644 --- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild +++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild @@ -1,30 +1,38 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +EAPI=8 +PYTHON_COMPAT=( python3_10 ) inherit cmake python-single-r1 DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf" -HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR" +HOMEPAGE=" + https://sdr.osmocom.org/trac/wiki/GrOsmoSDR + https://gitea.osmocom.org/sdr/gr-osmosdr +" if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git" else - SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" + #commit + COMMIT="a100eb024c0210b95e4738b6efd836d48225bd03" + SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + #release + #SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" fi LICENSE="GPL-3" SLOT="0/${PV}" -IUSE="airspy airspyhf bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd" +IUSE="airspy airspyhf bladerf doc hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx" -#xtrx? ( net-wireless/libxtrx ) RDEPEND="${PYTHON_DEPS} dev-libs/boost:= - =net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}] + dev-libs/log4cpp + net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] sci-libs/volk:= airspy? ( net-wireless/airspy ) airspyhf? ( net-wireless/airspyhf ) @@ -35,13 +43,22 @@ RDEPEND="${PYTHON_DEPS} sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr:= ) uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] ) + xtrx? ( net-wireless/libxtrx ) " DEPEND="${RDEPEND}" +BDEPEND=" + $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]') + doc? ( app-doc/doxygen ) + " + REQUIRED_USE="${PYTHON_REQUIRED_USE}" +PATCHES=( + "${FILESDIR}/${PN}-0.2.3_p20210128-fix-enable-python.patch" +) + src_configure() { - #-DENABLE_XTRX="$(usex xtrx ON OFF)" local mycmakeargs=( -DENABLE_DEFAULT=OFF -DPYTHON_EXECUTABLE="${PYTHON}" @@ -58,7 +75,8 @@ src_configure() { -DENABLE_NONFREE="$(usex sdrplay ON OFF)" -DENABLE_SOAPY="$(usex soapy ON OFF)" -DENABLE_UHD="$(usex uhd ON OFF)" - -DENABLE_XTRX=OFF + -DENABLE_XTRX="$(usex xtrx ON OFF)" + -DENABLE_DOXYGEN="$(usex doc ON OFF)" ) cmake_src_configure @@ -67,6 +85,7 @@ src_configure() { src_install() { cmake_src_install if use python; then + find "${ED}" -name '*.py[oc]' -delete || die python_fix_shebang "${ED}"/usr/bin python_optimize fi -- cgit v1.2.3-65-gdbad