diff options
Diffstat (limited to 'net-wireless/gnuradio')
-rw-r--r-- | net-wireless/gnuradio/Manifest | 3 | ||||
-rw-r--r-- | net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch | 18 | ||||
-rw-r--r-- | net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index eab92ca2705c..cf0b6639d95f 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -1,11 +1,12 @@ AUX gnuradio-3.6.1-automagic-audio.patch 2839 BLAKE2B 5b7e2e224ef2dcc9d0645a0faf156a83f6b463b74398a6bb17f70a0917bdded1e585fe1ead61dd38f5aeb9020fac256a6f5caf9e1f638e214035fb8ec3b8ef7c SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768 +AUX gnuradio-3.7.13.5-boost-1.70-asio.patch 769 BLAKE2B 19a0f56540911443a8b2b8af3f16b3a784ae760ac60a017f5d2d642a6612c4c4f310df5937ba1d815b9cf9ff8e7d5de660876140f6821d2ab59acf94270ccbe6 SHA512 b3270301945489ac6cb301f30c28bea4b9d59ee7cb2a0e5a162e8ff514e0173d849236db8c3e60fa028a9df2304fc22ce73b7eabb525e567867ad72d7cd46dd7 AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8 DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15 EBUILD gnuradio-3.6.5.1-r2.ebuild 5127 BLAKE2B ad5cb9725f4a3adfc90deac129121d3b17d9db03dea210e9d9bc04b5279eec5276cb216110e88cab5b6cfeb12c1d213198dc9d50b032a21bc88b16a9945a52d0 SHA512 b36955101eee2a2e92388980c470941d2c6aeb7eb58f23158b21da16174e49640fd9332e5e05626307fccc1233fc6149a9baf8211ba1866ec2dbedc85c24831b -EBUILD gnuradio-3.7.13.5.ebuild 7369 BLAKE2B f6ad6ccaa7d38b34ca6805ea799ed1861585037a6457f598510b896f3554b79e364462001436620e642612110a0e0d8148b08db5c185dd17160fadbe4f101290 SHA512 87ec2799db30073c2bd7b30f29a8242a3b06edd4a51657bf41d26cc0e0a7198d94226bd5c43825703654b6e6584eff645aabdcf5689720611be57f564e86ad2f +EBUILD gnuradio-3.7.13.5.ebuild 7435 BLAKE2B 2aa7f26b80ce2f66a551dbe38b2111003fcd67e1dd901b18a738e30cac939f73fcd40bbff8e83d3eaa767011e04938e3f4b7b7e5af2ba004f15a02c7234cff29 SHA512 817f3a56f07ec8d62b5014c35bb0fa6445257bcd70608ae745f4a9834ff6c678c038f667e72fffcd9dba2d7137a2673b8d3c3f0f11927e9ef6b5b07d23046870 EBUILD gnuradio-3.7.9999.ebuild 6917 BLAKE2B ad74825e50483a3950aab15788b467e834379e38cd6bab913f67e3a05e9abd4533df01f7878782a06c29be196b7357f52952359b1beeb878f41193f866b2c33c SHA512 1ca495b9bb543bf7879c079e1668155fa805b6fbeef0f6940e9748bb5540453402a770df9c2510cac2b71ad63ff8119234ed54dcb87896d90c819c93d06c83aa EBUILD gnuradio-9999.ebuild 6955 BLAKE2B 727f4f890202932f02a1c9136b6fbbbf417380cd9ea477d7485f98411656b25ee798b930caf8f65cd0d8f193b69d54dd0811cedd27247617bc663e75606988fa SHA512 e961f10a77bc407eb6be40424f146852ab7a17ac87ead37a45305bcd6aa66038d74550ea4f25795ebaef800111926f7260e94902fd637876154d7fe8557fa0d6 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699 diff --git a/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch b/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch new file mode 100644 index 000000000000..d4925e674eab --- /dev/null +++ b/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch @@ -0,0 +1,18 @@ +Bug: https://bugs.gentoo.org/683380 +Patch adapted from FreeBSD: +https://svnweb.freebsd.org/ports/head/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc?view=markup&pathrev=499093 + +--- a/gr-blocks/lib/socket_pdu_impl.cc ++++ b/gr-blocks/lib/socket_pdu_impl.cc +@@ -165,7 +165,11 @@ + void + socket_pdu_impl::start_tcp_accept() + { ++#if (BOOST_VERSION >= 107000) ++ tcp_connection::sptr new_connection = tcp_connection::make(d_io_service, d_rxbuf.size(), d_tcp_no_delay); ++#else + tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay); ++#endif + + d_acceptor_tcp->async_accept(new_connection->socket(), + boost::bind(&socket_pdu_impl::handle_tcp_accept, this, diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild index 354d6e7b959a..687926509464 100644 --- a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild @@ -49,7 +49,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669 RDEPEND="${PYTHON_DEPS} >=dev-lang/orc-0.4.12 - dev-libs/boost:0=[${PYTHON_USEDEP}] + dev-libs/boost:0=[python,${PYTHON_USEDEP}] !<=dev-libs/boost-1.52.0-r6:0/1.52 dev-python/mako[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] @@ -120,6 +120,7 @@ src_prepare() { sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die epatch "${WORKDIR}"/qt5-maint-00*.patch epatch "${WORKDIR}"/codec2-next-00*.patch + epatch "${FILESDIR}"/${PN}-3.7.13.5-boost-1.70-asio.patch use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake |