pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
(ham/gnuradio-core) some patches removed, make proceeds to some point. Error recorded in TOOD
Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By: mef
Date: Mon Sep 16 22:19:05 2019 +0900
Changeset: 891e7e63b97cfa31b2f0145821682601d63b227a
Modified Files:
gnuradio-core/TODO
gnuradio-core/distinfo
gnuradio-core/patches/patch-grc_script_gnuradio-companion
Removed Files:
gnuradio-core/patches/patch-gnuradio_runtime_lib_thread_thread_cc
gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc
gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc
gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h
Log Message:
(ham/gnuradio-core) some patches removed, make proceeds to some point. Error recorded in TOOD
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=891e7e63b97cfa31b2f0145821682601d63b227a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gnuradio-core/TODO | 135 ++++-----------------
gnuradio-core/distinfo | 3 +-
.../patch-gnuradio_runtime_lib_thread_thread_cc | 47 -------
.../patches/patch-gr-audio_lib_CMakeLists.txt | 15 ---
.../patch-gr-blocks_lib_socket__pdu__impl.cc | 15 ---
.../patches/patch-gr-blocks_lib_tcp__connection.cc | 21 ----
.../patches/patch-gr-blocks_lib_tcp__connection.h | 21 ----
.../patches/patch-grc_script_gnuradio-companion | 8 +-
8 files changed, 26 insertions(+), 239 deletions(-)
diffs:
diff --git a/gnuradio-core/TODO b/gnuradio-core/TODO
index c83c0c88a5..e15eda4607 100644
--- a/gnuradio-core/TODO
+++ b/gnuradio-core/TODO
@@ -15,120 +15,27 @@
# : permission denied
(updating cmake 3.0.2 in wip doesn't help)
-- Unknown message at pbulk
- [210/231] Starting build of gnuradio-fec-3.7.5
- X11 connection rejected because of wrong authentication.
- at the time around these configure lines ?
- | -- Found ALSA 1.0.27.2
- | -- checking for module 'jack'
- | -- found jack, version 0.121.3
- | -- Found jack: /WRKOBJDIR/wip/gnuradio-fec/work/.buildlink/lib/libjack.so
- | -- Looking for C++ include AudioUnit/AudioUnit.h
- | -- Looking for C++ include AudioUnit/AudioUnit.h - not found
- | -- Looking for C++ include AudioToolbox/AudioToolbox.h
- | -- Looking for C++ include AudioToolbox/AudioToolbox.h - not found
- | -- checking for module 'portaudio-2.0'
- | -- found portaudio-2.0, version 19
- | -- Performing Test PORTAUDIO2_FOUND
- | -- Performing Test PORTAUDIO2_FOUND - Success
- | -- Found PORTAUDIO: /usr/pkg/include/portaudio2
- | -- checking for module 'comedilib'
- | -- package 'comedilib' not found
- | --
- | -- Configuring gr-comedi support...
-- (May be) redundent lines in cmake options in Makefile
- -DCMAKE_INCLUDE_PATH="${PREFIX}/include/portaudio2 \
- -DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2 \
- -DCMAKE_INCLUDE_DIR="${PREFIX}/include/libusb-1.0 \
-
- pkg-config --cflags portaudio-2.0
- pkg-config --libs portaudio-2.0
- pkg-config --cflags libusb-1.0
- may return (correct) values but not utilized now
-
-- patches/patch-gnuradio_runtime_include_gnuradio_high__res__timer__h
- is a joke, should be corrected
-
-- FreeBSD ports has many patches for 3.7.2.1
- http://svnweb.freebsd.org/ports/head/comms/gnuradio/files/
-
-- Sub function status
- Marked . are included in minumum one (-core)
-
-.ENABLE_GR_ANALOG
-+ENABLE_GR_ATSC
-.ENABLE_GR_AUDIO
-.ENABLE_GR_BLOCKS
-+ENABLE_GR_CHANNELS
- ENABLE_GR_COMEDI
--ENABLE_GR_CTRLPORT .. wants rpcmanager::get()
-+ENABLE_GR_DIGITAL
-+ENABLE_GR_FCD
-+ENABLE_GR_FEC
-.ENABLE_GR_FFT
-.ENABLE_GR_FILTER
- ENABLE_GR_LOG
-+ENABLE_GR_NOAA
-+ENABLE_GR_PAGER
-+ENABLE_GR_QTGUI
-+ENABLE_GR_TRELLIS
-+ENABLE_GR_UHD
-+ENABLE_GR_UTILS
-+ENABLE_GR_VIDEO_SDL
-+ENABLE_GR_VOCODER
-+ENABLE_GR_WAVELET
-+ENABLE_GR_WXGUI
-
- ENABLE_BAD_BOOST
-:ENABLE_DEFAULT
-+ENABLE_DOXYGEN
-.ENABLE_GNURADIO_RUNTIME
- ENABLE_PERFORMANCE_COUNTERS
-+ENABLE_PYTHON
-+ENABLE_RUNTIME
-+ENABLE_SPHINX
- ENABLE_TESTING
-.ENABLE_VOLK
-
-(if ENABLE_DEFAULT=True with current other environment)
--- * python-support
--- * testing-support
--- * volk
--- * doxygen
--- * sphinx
--- * gnuradio-runtime
--- * gr-ctrlport
--- * gr-blocks
--- * gnuradio-companion
--- * gr-fec
--- * gr-fft
--- * gr-filter
--- * gr-analog
--- * gr-digital
--- * gr-dtv
--- * gr-atsc
--- * gr-audio
--- * * alsa
--- * * oss
--- * * jack
--- * * portaudio
--- * gr-channels
--- * gr-noaa
--- * gr-pager
--- * gr-qtgui
--- * gr-trellis
--- * gr-uhd
--- * gr-utils
--- * gr-video-sdl
--- * gr-vocoder
--- * gr-fcd
--- * gr-wavelet
--- * gr-wxgui
--- * gr-zeromq
+****************************************************************
+ recent make problem
+****************************************************************
+-- Checking for module SWIG
+-- Found SWIG version 2.0.12.
--
--- ######################################################
--- # Gnuradio disabled components
--- ######################################################
--- * gr-comedi
+-- Configuring python-support support...
+-- Dependency PYTHONLIBS_FOUND = TRUE
+-- Dependency SWIG_FOUND = TRUE
+-- Dependency SWIG_VERSION_CHECK = FALSE
+-- Dependency SIX_FOUND = TRUE
+CMake Error at cmake/Modules/GrComponent.cmake:75 (message):
+ user force-enabled python-support but configuration checked failed
+Call Stack (most recent call first):
+ CMakeLists.txt:373 (GR_REGISTER_COMPONENT)
+
+
+-- Configuring incomplete, errors occurred!
+See also "/tmp/wip/gnuradio-core/work/gnuradio-3.8.0.0/build/CMakeFiles/CMakeOutput.log".
+See also "/tmp/wip/gnuradio-core/work/gnuradio-3.8.0.0/build/CMakeFiles/CMakeError.log".
+*** Error code 1
+
diff --git a/gnuradio-core/distinfo b/gnuradio-core/distinfo
index c9457f7292..3f13662050 100644
--- a/gnuradio-core/distinfo
+++ b/gnuradio-core/distinfo
@@ -4,8 +4,7 @@ SHA1 (gnuradio-3.8.0.0.tar.gz) = 1f68b90073fc075de741d67c7569f2f2395e4cc2
RMD160 (gnuradio-3.8.0.0.tar.gz) = 9f7c41faa72ab6801abd6decfdb98edc710775f6
SHA512 (gnuradio-3.8.0.0.tar.gz) = 1a3be19f26183d0e953ad1b484de68eb8d452a80a58a76a3982191f6a7964f6f1ea7d37b0c7e309317965432c0b239ab5c3f4d1db60cdc26e8d65aec119cc7bc
Size (gnuradio-3.8.0.0.tar.gz) = 3557884 bytes
-SHA1 (patch-CMakeLists.txt) = 1e59a7475bc814dc4768e7a9c77894c6351a5726
SHA1 (patch-cmake_Modules_FindSphinx.cmake) = 1e42ad000962f4766810fbd322c80dad1f0b1c3c
-SHA1 (patch-gnuradio-runtime_lib_thread_thread__cc) = 58f0efaa9c9d401a45d8d5300aba8b6b1c4bb0a2
SHA1 (patch-gnuradio_runtime_include_gnuradio_high__res__timer__h) = 59ad8192e7ac76b2ce35cda68c378bc2abad20a5
SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = 565b4ada865395f19228511659bfc489a5a9583f
+SHA1 (patch-grc_script_gnuradio-companion) = 852f520670c0b9ec822b88aea331a1e052175340
diff --git a/gnuradio-core/patches/patch-gnuradio_runtime_lib_thread_thread_cc b/gnuradio-core/patches/patch-gnuradio_runtime_lib_thread_thread_cc
deleted file mode 100644
index cebc80e5a3..0000000000
--- a/gnuradio-core/patches/patch-gnuradio_runtime_lib_thread_thread_cc
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-gnuradio_runtime_lib_thread_thread_cc,v 1.5 2018/07/16 07:55:22 mef Exp $
-
-Extending for BSD
-
---- gnuradio-runtime/lib/thread/thread.cc.orig 2018-06-14 06:42:48.000000000 +0900
-+++ gnuradio-runtime/lib/thread/thread.cc 2018-07-08 07:51:13.971772414 +0900
-@@ -166,7 +166,7 @@ namespace gr {
-
-
- #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || \
-- defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
-+ defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)|| defined(__NetBSD__) || defined(__sun)
-
- namespace gr {
- namespace thread {
-@@ -284,6 +284,7 @@ namespace gr {
- void
- thread_bind_to_processor(gr_thread_t thread, const std::vector<int> &mask)
- {
-+#ifdef _GNU_SOURCE
- cpu_set_t set;
- size_t len = sizeof(cpu_set_t);
- std::vector<int> _mask = mask;
-@@ -299,6 +300,7 @@ namespace gr {
- s << "thread_bind_to_processor failed with error: " << ret << std::endl;
- throw std::runtime_error(s.str());
- }
-+#endif
- }
-
- void
-@@ -310,6 +312,7 @@ namespace gr {
- void
- thread_unbind(gr_thread_t thread)
- {
-+#ifdef _GNU_SOURCE
- cpu_set_t set;
- size_t len = sizeof(cpu_set_t);
-
-@@ -325,6 +328,7 @@ namespace gr {
- s << "thread_unbind failed with error: " << ret << std::endl;
- throw std::runtime_error(s.str());
- }
-+#endif
- }
-
- int
diff --git a/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt b/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
deleted file mode 100644
index 9855b173ce..0000000000
--- a/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gr-audio_lib_CMakeLists.txt,v 1.2 2018/07/16 07:55:22 mef Exp $
-
-Patch and SUBST to disable/enable ALSA depending on PKGOPTIONS.
-
---- gr-audio/lib/CMakeLists.txt.orig 2018-06-14 06:42:48.000000000 +0900
-+++ gr-audio/lib/CMakeLists.txt 2018-07-08 07:53:35.184868747 +0900
-@@ -42,7 +42,7 @@ endif(ENABLE_GR_CTRLPORT)
- ########################################################################
- ## ALSA Support
- ########################################################################
--find_package(ALSA)
-+@@ALSA@@find_package(ALSA)
-
- if((ALSA_FOUND) AND NOT (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") AND NOT (CMAKE_SYSTEM_NAME STREQUAL GNU))
-
diff --git a/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc b/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc
deleted file mode 100644
index b350ef4a3e..0000000000
--- a/gnuradio-core/patches/patch-gr-blocks_lib_socket__pdu__impl.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_socket__pdu__impl.cc,v 1.1 2019/07/08 17:50:55 ryoon Exp $
-
-* Fix build with boost-1.70.0
-
---- gr-blocks/lib/socket_pdu_impl.cc.orig 2019-04-20 09:58:09.000000000 +0000
-+++ gr-blocks/lib/socket_pdu_impl.cc
-@@ -165,7 +165,7 @@ namespace gr {
- void
- socket_pdu_impl::start_tcp_accept()
- {
-- tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay);
-+ tcp_connection::sptr new_connection = tcp_connection::make(static_cast<boost::asio::io_context&>(d_acceptor_tcp->get_executor().context()), d_rxbuf.size(), d_tcp_no_delay);
-
- d_acceptor_tcp->async_accept(new_connection->socket(),
- boost::bind(&socket_pdu_impl::handle_tcp_accept, this,
diff --git a/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc b/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc
deleted file mode 100644
index ef904952a8..0000000000
--- a/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_tcp__connection.cc,v 1.1 2019/07/08 17:50:55 ryoon Exp $
-
-* Fix build with boost-1.70.0
-
---- gr-blocks/lib/tcp_connection.cc.orig 2019-04-20 09:58:09.000000000 +0000
-+++ gr-blocks/lib/tcp_connection.cc
-@@ -31,12 +31,12 @@
- namespace gr {
- namespace blocks {
-
-- tcp_connection::sptr tcp_connection::make(boost::asio::io_service& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
-+ tcp_connection::sptr tcp_connection::make(boost::asio::io_context& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
- {
- return sptr(new tcp_connection(io_service, MTU, no_delay));
- }
-
-- tcp_connection::tcp_connection(boost::asio::io_service& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
-+ tcp_connection::tcp_connection(boost::asio::io_context& io_service, int MTU/*= 10000*/, bool no_delay/*=false*/)
- : d_socket(io_service)
- , d_block(NULL)
- , d_no_delay(no_delay)
diff --git a/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h b/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h
deleted file mode 100644
index c5a0e72795..0000000000
--- a/gnuradio-core/patches/patch-gr-blocks_lib_tcp__connection.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-gr-blocks_lib_tcp__connection.h,v 1.1 2019/07/08 17:50:55 ryoon Exp $
-
-* Fix build with boost-1.70.0
-
---- gr-blocks/lib/tcp_connection.h.orig 2019-04-20 09:58:09.000000000 +0000
-+++ gr-blocks/lib/tcp_connection.h
-@@ -42,12 +42,12 @@ namespace gr {
- basic_block *d_block;
- bool d_no_delay;
-
-- tcp_connection(boost::asio::io_service& io_service, int MTU=10000, bool no_delay=false);
-+ tcp_connection(boost::asio::io_context& io_service, int MTU=10000, bool no_delay=false);
-
- public:
- typedef boost::shared_ptr<tcp_connection> sptr;
-
-- static sptr make(boost::asio::io_service& io_service, int MTU=10000, bool no_delay=false);
-+ static sptr make(boost::asio::io_context& io_service, int MTU=10000, bool no_delay=false);
-
- boost::asio::ip::tcp::socket& socket() { return d_socket; };
-
diff --git a/gnuradio-core/patches/patch-grc_script_gnuradio-companion b/gnuradio-core/patches/patch-grc_script_gnuradio-companion
index 8c9adda7aa..f51700c5ea 100644
--- a/gnuradio-core/patches/patch-grc_script_gnuradio-companion
+++ b/gnuradio-core/patches/patch-grc_script_gnuradio-companion
@@ -3,13 +3,13 @@ $NetBSD: patch-grc_script_gnuradio-companion,v 1.4 2015/09/17 13:48:05 makoto Ex
Add message for NetBSD when failed to import gnuradio.
Or missing gnuradio-core package.
---- grc/scripts/gnuradio-companion.orig 2015-08-23 21:36:38.000000000 +0900
-+++ grc/scripts/gnuradio-companion 2015-08-23 21:38:19.000000000 +0900
-@@ -35,6 +35,7 @@ warnings.filterwarnings("always")
+--- grc/scripts/gnuradio-companion.orig 2019-08-10 06:40:34.000000000 +0900
++++ grc/scripts/gnuradio-companion 2019-09-16 21:26:17.217333967 +0900
+@@ -23,6 +23,7 @@ import warnings
GR_IMPORT_ERROR_MESSAGE = """\
Cannot import gnuradio.
+You may be missing gnuradio-core package or
- Is the python path environment variable set correctly?
+ Is the model path environment variable set correctly?
All OS: PYTHONPATH
Home |
Main Index |
Thread Index |
Old Index