Update to gnuradio-3.8.2.0. Drop maintainership.
Some notable changes to the package with this release: - move from Qt4 to Qt5 - move from Python 2 to Python 3 - drop dependency on py-gtk2 ok (and testing and much prodding from) rsadowski@
This commit is contained in:
parent
515f7abb2c
commit
8d25b1e274
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.5 2019/07/12 20:43:47 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.6 2020/10/13 09:04:51 bentley Exp $
|
||||
|
||||
COMMENT = signal-processing toolkit for SDR (software-defined radio)
|
||||
|
||||
DISTNAME = gnuradio-3.7.13.4
|
||||
REVISION = 2
|
||||
V = 3.8.2.0
|
||||
DISTNAME = gnuradio-$V
|
||||
|
||||
SHARED_LIBS += gnuradio-analog 0.0 # 3.7
|
||||
SHARED_LIBS += gnuradio-atsc 0.0 # 3.7
|
||||
@ -33,47 +33,58 @@ CATEGORIES = comms
|
||||
|
||||
HOMEPAGE = https://www.gnuradio.org/
|
||||
|
||||
MAINTAINER = Anthony J. Bentley <anthony@anjbe.name>
|
||||
|
||||
# GPLv3+
|
||||
PERMIT_PACKAGE = Yes
|
||||
|
||||
WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB}
|
||||
WANTLIB += QtCore QtGui SDL boost_atomic-mt boost_chrono-mt boost_date_time-mt
|
||||
WANTLIB += boost_filesystem-mt boost_program_options-mt boost_regex-mt
|
||||
WANTLIB += boost_system-mt boost_thread-mt c fftw3f fftw3f_threads
|
||||
WANTLIB += gsl gslcblas gsm iconv jack log4cpp m orc-0.4 portaudio qwt
|
||||
WANTLIB += usb-1.0 zmq
|
||||
WANTLIB += Qt5Core Qt5Gui Qt5Widgets SDL boost_atomic-mt boost_chrono-mt
|
||||
WANTLIB += boost_date_time-mt boost_filesystem-mt boost_program_options-mt
|
||||
WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c fftw3f
|
||||
WANTLIB += fftw3f_threads gmp gmpxx gsl gslcblas gsm iconv jack
|
||||
WANTLIB += log4cpp m orc-0.4 portaudio qwt-qt5 zmq
|
||||
|
||||
MASTER_SITES = https://www.gnuradio.org/releases/gnuradio/
|
||||
MASTER_SITES = https://github.com/gnuradio/gnuradio/releases/download/v$V/
|
||||
|
||||
COMPILER = base-clang ports-gcc base-gcc
|
||||
|
||||
MODULES = devel/cmake \
|
||||
lang/python
|
||||
lang/python \
|
||||
x11/qt5
|
||||
|
||||
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
|
||||
|
||||
BUILD_DEPENDS = ${RUN_DEPENDS} \
|
||||
devel/cppunit \
|
||||
devel/py-six \
|
||||
devel/py-click${MODPY_FLAVOR} \
|
||||
devel/py-click-plugins${MODPY_FLAVOR} \
|
||||
devel/py-gobject3${MODPY_FLAVOR} \
|
||||
devel/py-six${MODPY_FLAVOR} \
|
||||
devel/swig \
|
||||
devel/xdg-utils \
|
||||
math/py-numpy${MODPY_FLAVOR} \
|
||||
net/cppzmq \
|
||||
textproc/py-yaml${MODPY_FLAVOR} \
|
||||
textproc/xmlto \
|
||||
www/py-mako
|
||||
www/py-mako${MODPY_FLAVOR} \
|
||||
x11/py-qt5${MODPY_FLAVOR}
|
||||
|
||||
RUN_DEPENDS = devel/desktop-file-utils \
|
||||
devel/py-cheetah \
|
||||
math/py-numpy \
|
||||
devel/py-cheetah${MODPY_FLAVOR} \
|
||||
graphics/py-matplotlib${MODPY_FLAVOR} \
|
||||
math/py-networkx${MODPY_FLAVOR} \
|
||||
math/py-numpy${MODPY_FLAVOR} \
|
||||
math/py-scipy${MODPY_FLAVOR} \
|
||||
misc/shared-mime-info \
|
||||
textproc/py-lxml \
|
||||
x11/py-gtk2 \
|
||||
x11/py-qt4 \
|
||||
x11/py-wxPython
|
||||
textproc/py-lxml${MODPY_FLAVOR} \
|
||||
textproc/py-yaml${MODPY_FLAVOR} \
|
||||
x11/gtk+3,-guic
|
||||
|
||||
LIB_DEPENDS = audio/jack \
|
||||
audio/gsm \
|
||||
audio/portaudio-svn \
|
||||
devel/boost \
|
||||
devel/boost,-md \
|
||||
devel/gmp,-cxx \
|
||||
devel/gsl \
|
||||
devel/libusb1 \
|
||||
devel/log4cpp \
|
||||
@ -81,10 +92,9 @@ LIB_DEPENDS = audio/jack \
|
||||
devel/sdl \
|
||||
math/fftw3,float \
|
||||
net/zeromq \
|
||||
x11/qwt
|
||||
x11/qwt,qt5
|
||||
|
||||
CONFIGURE_ARGS =-DENABLE_DOXYGEN=OFF \
|
||||
-DENABLE_GR_COMEDI=OFF \
|
||||
-DENABLE_GR_UHD=OFF \
|
||||
-DGR_PKG_DOC_DIR="${PREFIX}/share/doc/gnuradio" \
|
||||
-DGR_PKG_CONF_DIR="${PREFIX}/share/examples/gnuradio/conf.d" \
|
||||
@ -99,8 +109,5 @@ post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/{applications,mime}
|
||||
mv ${PREFIX}/share/gnuradio/examples/* ${PREFIX}/share/examples/gnuradio
|
||||
rmdir ${PREFIX}/share/gnuradio/examples
|
||||
cd ${PREFIX}/share/gnuradio/grc/freedesktop/ && \
|
||||
mv gnuradio-grc.desktop ${PREFIX}/share/applications && \
|
||||
mv gnuradio-grc.xml ${PREFIX}/share/mime
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (gnuradio-3.7.13.4.tar.gz) = xTbCaLHpwk8SBrvIgaWBmsRuZi9Oi+re1vP0QdNQLw0=
|
||||
SIZE (gnuradio-3.7.13.4.tar.gz) = 4546663
|
||||
SHA256 (gnuradio-3.8.2.0.tar.gz) = Pik1QamsjXhmB2K66LgMD2GVs0lOHFDAGp/XnMYLtiQ=
|
||||
SIZE (gnuradio-3.8.2.0.tar.gz) = 3567802
|
||||
|
@ -1,14 +1,14 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2018/09/10 06:58:22 bentley Exp $
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.2 2020/10/13 09:04:51 bentley Exp $
|
||||
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -282,7 +282,7 @@ string(COMPARE EQUAL "${CMAKE_INSTALL_PREFIX}" "/usr"
|
||||
@@ -299,7 +299,7 @@ string(COMPARE EQUAL "${CMAKE_INSTALL_PREFIX}" "/usr"
|
||||
if(isusr)
|
||||
set(SYSCONFDIR "/${GR_CONF_DIR}" CACHE PATH "System configuration directory")
|
||||
SET(SYSCONFDIR "/${GR_CONF_DIR}" CACHE PATH "System configuration directory")
|
||||
else(isusr)
|
||||
- set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}" CACHE PATH "System configuration directory" FORCE)
|
||||
+ set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}" CACHE PATH "System configuration directory")
|
||||
- SET(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}" CACHE PATH "System configuration directory" FORCE)
|
||||
+ SET(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}" CACHE PATH "System configuration directory")
|
||||
endif(isusr)
|
||||
|
||||
set(GR_PKG_CONF_DIR ${SYSCONFDIR}/${CMAKE_PROJECT_NAME}/conf.d CACHE PATH "Path to install package configs")
|
||||
SET(GR_PKG_CONF_DIR ${SYSCONFDIR}/${CMAKE_PROJECT_NAME}/conf.d CACHE PATH "Path to install package configs")
|
||||
|
@ -1,24 +1,24 @@
|
||||
$OpenBSD: patch-gnuradio-runtime_lib_thread_thread_cc,v 1.1.1.1 2018/09/10 06:58:22 bentley Exp $
|
||||
$OpenBSD: patch-gnuradio-runtime_lib_thread_thread_cc,v 1.2 2020/10/13 09:04:51 bentley Exp $
|
||||
|
||||
Index: gnuradio-runtime/lib/thread/thread.cc
|
||||
--- gnuradio-runtime/lib/thread/thread.cc.orig
|
||||
+++ gnuradio-runtime/lib/thread/thread.cc
|
||||
@@ -166,7 +166,8 @@ namespace gr {
|
||||
@@ -147,7 +147,7 @@ void set_thread_name(gr_thread_t thread, std::string n
|
||||
|
||||
|
||||
#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || \
|
||||
- defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
|
||||
+ defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \
|
||||
+ defined(__OpenBSD__)
|
||||
#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || \
|
||||
defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \
|
||||
- defined(__NetBSD__)
|
||||
+ defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
|
||||
namespace gr {
|
||||
namespace thread {
|
||||
@@ -250,7 +251,9 @@ namespace gr {
|
||||
#include <sstream>
|
||||
#include <stdexcept>
|
||||
namespace thread {
|
||||
@@ -219,7 +219,9 @@ void set_thread_name(gr_thread_t thread, std::string n
|
||||
#else
|
||||
|
||||
#include <pthread.h>
|
||||
+#ifndef __OpenBSD__
|
||||
#include <sys/prctl.h>
|
||||
+#endif
|
||||
#include <sstream>
|
||||
#include <stdexcept>
|
||||
|
||||
namespace gr {
|
||||
namespace thread {
|
||||
|
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-gr-dtv_lib_CMakeLists_txt,v 1.1 2019/10/03 13:39:45 naddy Exp $
|
||||
|
||||
Make SSE2 check clang compatible on ARM
|
||||
https://github.com/gnuradio/gnuradio/commit/83c0b7c0651a1959ac118c67154fce50541755df
|
||||
|
||||
Index: gr-dtv/lib/CMakeLists.txt
|
||||
--- gr-dtv/lib/CMakeLists.txt.orig
|
||||
+++ gr-dtv/lib/CMakeLists.txt
|
||||
@@ -117,7 +117,12 @@ if (MSVC)
|
||||
CHECK_C_COMPILER_FLAG ("/arch:SSE2" SSE2_SUPPORTED)
|
||||
endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
else ()
|
||||
- CHECK_C_COMPILER_FLAG ("-msse2" SSE2_SUPPORTED)
|
||||
+ # The "correct" way to test this would be to run
|
||||
+ # check_c_compiler_flag("-msse2")
|
||||
+ # ...but that's not reliable, in particular, on Clang and ARM, it will
|
||||
+ # return TRUE when it shouldn't. Hence, we compile this snippet
|
||||
+ # manually.
|
||||
+ check_c_source_compiles("#include <emmintrin.h>\nint main(){__m128i m0, m1, m2; m0 = _mm_add_epi8(m1, m2);}" SSE2_SUPPORTED)
|
||||
endif(MSVC)
|
||||
|
||||
if(SSE2_SUPPORTED)
|
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-volk_lib_CMakeLists_txt,v 1.1.1.1 2018/09/10 06:58:22 bentley Exp $
|
||||
--- volk/lib/CMakeLists.txt.orig Tue Aug 9 17:53:06 2016
|
||||
+++ volk/lib/CMakeLists.txt Tue Aug 9 17:54:40 2016
|
||||
@@ -264,15 +264,15 @@ endif()
|
||||
if(NOT CROSSCOMPILE_MULTILIB AND CPU_IS_x86)
|
||||
include(CheckTypeSize)
|
||||
check_type_size("void*[8]" SIZEOF_CPU BUILTIN_TYPES_ONLY)
|
||||
- if (${SIZEOF_CPU} EQUAL 64)
|
||||
+ if ("${SIZEOF_CPU}" STREQUAL "64")
|
||||
OVERRULE_ARCH(32 "CPU width is 64 bits")
|
||||
endif()
|
||||
- if (${SIZEOF_CPU} EQUAL 32)
|
||||
+ if ("${SIZEOF_CPU}" STREQUAL "32")
|
||||
OVERRULE_ARCH(64 "CPU width is 32 bits")
|
||||
endif()
|
||||
|
||||
#MSVC 64 bit does not have MMX, overrule it
|
||||
- if (${SIZEOF_CPU} EQUAL 64 AND MSVC)
|
||||
+ if ("${SIZEOF_CPU}" EQUAL "64" AND MSVC)
|
||||
OVERRULE_ARCH(mmx "No MMX for Win64")
|
||||
endif()
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user