rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gnuradio-*: fix assorted pkglint warnings

This commit is contained in:
Tobias Nygren 2020-08-03 19:47:01 +02:00
parent f95c8a8ac9
commit 5566155893
24 changed files with 66 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnuradio-channels/Makefile
View File

@ -8,7 +8,7 @@ COMMENT= Signal processing blocks to simulate channel models of GNU Radio
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_CHANNELS=ON
CMAKE_ARGS+= -DENABLE_GRC=True
CMAKE_ARGS+= -DENABLE_GRC=ON
PLIST_MINUS+= companion

3
gnuradio-companion/Makefile
View File

@ -18,6 +18,9 @@ REPLACE_BASH= grc/scripts/freedesktop/grc_setup_freedesktop.in
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GRC=ON
ICON_THEMES= yes
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
# -- Configuring gnuradio-companion support...

2
gnuradio-core/Makefile
View File

@ -18,7 +18,7 @@ PLIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.oss
.endif
# set default as minimum
CMAKE_ARGS+= -DENABLE_DEFAULT=False
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
# Take care CONF_FILES stuff (The same code in Nocore.mk)
#post-install:

39
gnuradio-core/Makefile.common
View File

@ -2,25 +2,26 @@
# This Makefile fragment is included in the package Makefiles for
# GNU Radio distributed packages (they all share common configure and build
# settings).
# used by ham/gnuradio-channels/Makefile
# used by ham/gnuradio-companion/Makefile
# used by ham/gnuradio-core/Makefile
# used by ham/gnuradio-ctrlport/Makefile
# used by ham/gnuradio-digital/Makefile
# used by ham/gnuradio-doxygen/Makefile
# used by ham/gnuradio-dtv/Makefile
# used by ham/gnuradio-fcd/Makefile
# used by ham/gnuradio-fec/Makefile
# used by ham/gnuradio-qtgui/Makefile
# used by ham/gnuradio-trellis/Makefile
# used by ham/gnuradio-uhd/Makefile
# used by ham/gnuradio-utils/Makefile
# used by ham/gnuradio-video-sdl/Makefile
# used by ham/gnuradio-vocoder/Makefile
# used by ham/gnuradio-wavelet/Makefile
# used by ham/gnuradio-zeromq/Makefile
.include "../../wip/gnuradio-core/Makefile.version"
# used by wip/gnuradio-channels/Makefile
# used by wip/gnuradio-companion/Makefile
# used by wip/gnuradio-core/Makefile
# used by wip/gnuradio-ctrlport/Makefile
# used by wip/gnuradio-digital/Makefile
# used by wip/gnuradio-doxygen/Makefile
# used by wip/gnuradio-dtv/Makefile
# used by wip/gnuradio-fcd/Makefile
# used by wip/gnuradio-fec/Makefile
# used by wip/gnuradio-qtgui/Makefile
# used by wip/gnuradio-trellis/Makefile
# used by wip/gnuradio-uhd/Makefile
# used by wip/gnuradio-utils/Makefile
# used by wip/gnuradio-video-sdl/Makefile
# used by wip/gnuradio-vocoder/Makefile
# used by wip/gnuradio-wavelet/Makefile
# used by wip/gnuradio-zeromq/Makefile
.include "../../wip/gnuradio-core/version.mk"
DISTNAME?= gnuradio-${VERSION}
CATEGORIES+= ham
@ -106,7 +107,7 @@ CMAKE_ARG_PATH= ../
SUBST_CLASSES+= boost
SUBST_MESSAGE.boost= prepend boost placeholders with namespace
SUBST_FILES.boost= */lib/*.cc
SUBST_SED.boost= 's, _1), boost::placeholders::_1),'
SUBST_SED.boost= -e 's, _1), boost::placeholders::_1),'
SUBST_STAGE.boost= pre-configure
# disable/enable ALSA, see also patches/patch-gr-audio_lib_CMakeLists.txt

1
gnuradio-core/PLIST
View File

@ -764,7 +764,6 @@ share/gnuradio/examples/filter/synth_filter.py
share/gnuradio/examples/filter/synth_to_chan.py
share/gnuradio/examples/gnuradio-runtime.conf
share/gnuradio/examples/gr-audio-jack.conf
share/gnuradio/examples/gr-audio-oss.conf
share/gnuradio/examples/gr-audio-portaudio.conf
share/gnuradio/examples/gr-audio.conf
share/gnuradio/examples/gr_log_default.conf

4
gnuradio-core/distinfo
View File

@ -6,6 +6,6 @@ SHA512 (gnuradio-3.8.1.0.tar.gz) = d1ada5b36c32aefd5915e4aa33beafd06aaaa00654f5a
Size (gnuradio-3.8.1.0.tar.gz) = 3567141 bytes
SHA1 (patch-cmake_Modules_FindSphinx.cmake) = 1e42ad000962f4766810fbd322c80dad1f0b1c3c
SHA1 (patch-gnuradio_runtime_include_gnuradio_high__res__timer__h) = 59ad8192e7ac76b2ce35cda68c378bc2abad20a5
SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 822fe211b8f043cc80bcc586dd68eb0f3af87af3
SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 9adacb93a20b2be596a23985306cbfd5f93c80a8
SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = 565b4ada865395f19228511659bfc489a5a9583f
SHA1 (patch-grc_script_gnuradio-companion) = 852f520670c0b9ec822b88aea331a1e052175340
SHA1 (patch-grc_scripts_gnuradio-companion) = 852f520670c0b9ec822b88aea331a1e052175340

3
gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
View File

@ -1,5 +1,8 @@
$NetBSD$
If alsa is present on the system but the PKG_OPTION disabled we
should not use it.
--- gr-audio/lib/CMakeLists.txt.orig 2019-08-09 21:40:34.000000000 +0000
+++ gr-audio/lib/CMakeLists.txt
@@ -35,7 +35,7 @@ list(APPEND gr_audio_confs ${CMAKE_CURRE

0
gnuradio-core/patches/patch-grc_script_gnuradio-companion → gnuradio-core/patches/patch-grc_scripts_gnuradio-companion
View File

0
gnuradio-core/Makefile.version → gnuradio-core/version.mk
View File

4
gnuradio-ctrlport/Makefile
View File

@ -5,7 +5,7 @@ COMMENT= New set of hooks into GNU Radio to allow a remote client to attach
.include "../../wip/gnuradio-core/Makefile.common"
.include "../../wip/gnuradio-core/Nocore.mk"
CMAKE_ARGS+= -DENABLE_DEFAULT=False
CMAKE_ARGS+= -DENABLE_GR_CTRLPORT=True
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_CTRLPORT=ON
.include "../../mk/bsd.pkg.mk"

2
gnuradio-ctrlport/buildlink3.mk
View File

@ -7,7 +7,7 @@ GNURADIO_CTRLPORT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-ctrlport+= gnuradio-ctrlport>=3.8.1.0
BUILDLINK_ABI_DEPENDS.gnuradio-ctrlport+= gnuradio-ctrlport>=3.8.1.0
BUILDLINK_PKGSRCDIR.gnuradio-ctrlport?= ../../wip/gnuradio-ctrlport
BUILDLINK_PKGSRCDIR.gnuradio-ctrlport?= ../../wip/gnuradio-ctrlport
.endif # GNURADIO_CTRLPORT_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-ctrlport

2
gnuradio-default/Makefile
View File

@ -50,7 +50,7 @@ DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
DEPENDS+= ${PYPKGPREFIX}-qwt-qt4-[0-9]*:../../x11/py-qwt-qt4
# -------- R E S E T H E R E -------------
CMAKE_ARGS+= -DENABLE_DEFAULT=True
CMAKE_ARGS+= -DENABLE_DEFAULT=ON
post-patch:
${CP} ${PKGDIR}/../gnuradio-zeromq/files/zmq.hpp ${WRKSRC}/gr-zeromq/include/

6
gnuradio-digital/Makefile
View File

@ -8,9 +8,9 @@ COMMENT= Digital related algorithms for GNU Radio
# link to libgnuradio-fft.so.${PKGVERSON_NOREV}
.include "../../wip/gnuradio-core/buildlink3.mk"
CMAKE_ARGS+= -DENABLE_DEFAULT=False
CMAKE_ARGS+= -DENABLE_GR_DIGITAL=True
CMAKE_ARGS+= -DENABLE_GRC=True
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_DIGITAL=ON
CMAKE_ARGS+= -DENABLE_GRC=ON
PLIST_MINUS+= companion

4
gnuradio-doxygen/Makefile
View File

@ -13,9 +13,9 @@ BUILD_DEPENDS+= graphviz-[0-9]*:../../graphics/graphviz
DEPENDS+= web2c-[0-9]*:../../print/web2c
# in case those packages are already installed by other requirement..
DEPENDS+= texlive-collection-latex-[0-9]*:../../meta-pkgs/texlive-collection-latex
DEPENDS+= tex-newunicodechar-[-0-9]*:../../print/tex-newunicodechar
DEPENDS+= tex-newunicodechar-[0-9]*:../../print/tex-newunicodechar
CMAKE_ARGS+= -DENABLE_DEFAULT=False
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_DOXYGEN=ON
CMAKE_ARGS+= -DENABLE_SPHINX=ON
CMAKE_ARGS+= -DSPHINX_EXECUTABLE=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}

8
gnuradio-dtv/Makefile
View File

@ -6,10 +6,10 @@ COMMENT= Various digital television standards of GNU Radio
.include "../../wip/gnuradio-core/Makefile.common"
.include "../../wip/gnuradio-core/Nocore.mk"
CMAKE_ARGS+= -DENABLE_DEFAULT=False
CMAKE_ARGS+= -DENABLE_GR_DTV=True
CMAKE_ARGS+= -DENABLE_GR_FEC=True
CMAKE_ARGS+= -DENABLE_GRC=True
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_DTV=ON
CMAKE_ARGS+= -DENABLE_GR_FEC=ON
CMAKE_ARGS+= -DENABLE_GRC=ON
PLIST_MINUS+= fec companion

2
gnuradio-fec/Makefile
View File

@ -8,7 +8,7 @@ COMMENT= Forward Error Correction blocks, utilities, & examples of GNU Radio
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_FEC=ON
CMAKE_ARGS+= -DENABLE_GRC=True
CMAKE_ARGS+= -DENABLE_GRC=ON
PLIST_MINUS+= companion

2
gnuradio-qtgui/Makefile
View File

@ -10,7 +10,7 @@ COMMENT= Qt GUI module of GNU Radio
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_QTGUI=ON
CMAKE_ARGS+= -DENABLE_GRC=True
CMAKE_ARGS+= -DENABLE_GRC=ON
PLIST_MINUS+= companion

8
gnuradio-trellis/Makefile
View File

@ -6,10 +6,10 @@ COMMENT= Trellis-based encoding and decoding algorithms for GNU Radio
.include "../../wip/gnuradio-core/Makefile.common"
.include "../../wip/gnuradio-core/Nocore.mk"
CMAKE_ARGS+= -DENABLE_DEFAULT=False
CMAKE_ARGS+= -DENABLE_GR_TRELLIS=True
CMAKE_ARGS+= -DENABLE_GR_DIGITAL=True
CMAKE_ARGS+= -DENABLE_GRC=True
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_TRELLIS=ON
CMAKE_ARGS+= -DENABLE_GR_DIGITAL=ON
CMAKE_ARGS+= -DENABLE_GRC=ON
DEPENDS+= gnuradio-digital-[0-9]*:../../wip/gnuradio-digital
DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto

8
gnuradio-uhd/Makefile
View File

@ -6,10 +6,10 @@ COMMENT= Uhd-based encoding and decoding algorithms for GNU Radio
.include "../../wip/gnuradio-core/Makefile.common"
.include "../../wip/gnuradio-core/Nocore.mk"
CMAKE_ARGS+= -DENABLE_DEFAULT=False
CMAKE_ARGS+= -DENABLE_GR_UHD=True
CMAKE_ARGS+= -DENABLE_PYTHON=True
CMAKE_ARGS+= -DENABLE_GRC=True
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_UHD=ON
CMAKE_ARGS+= -DENABLE_PYTHON=ON
CMAKE_ARGS+= -DENABLE_GRC=ON
PLIST_MINUS+= companion

4
gnuradio-utils/Makefile
View File

@ -9,8 +9,8 @@ COMMENT= Utilities in GNU Radio
DEPENDS+= ${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
#CONF_FILES+= ${EGDIR}/modtool.conf ${PKG_SYSCONFDIR}/modtool.conf
CMAKE_ARGS+= -DENABLE_DEFAULT=False
CMAKE_ARGS+= -DENABLE_GR_UTILS=True
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_UTILS=ON
.include "../../devel/SDL/buildlink3.mk"

6
gnuradio-video-sdl/Makefile
View File

@ -6,10 +6,10 @@ COMMENT= SDL (Simple DirectMedia Layer) bindings for GNU Radio
.include "../../wip/gnuradio-core/Makefile.common"
.include "../../wip/gnuradio-core/Nocore.mk"
CMAKE_ARGS+= -DENABLE_DEFAULT=False
CMAKE_ARGS+= -DENABLE_GR_VIDEO_SDL=True
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_VIDEO_SDL=ON
CMAKE_ARGS+= -DSDL_INCLUDE_DIR=${PREFIX}/include/SDL
CMAKE_ARGS+= -DENABLE_GRC=True
CMAKE_ARGS+= -DENABLE_GRC=ON
PLIST_MINUS+= companion

6
gnuradio-vocoder/Makefile
View File

@ -6,9 +6,9 @@ COMMENT= All available vocoders in GNU Radio
.include "../../wip/gnuradio-core/Makefile.common"
.include "../../wip/gnuradio-core/Nocore.mk"
CMAKE_ARGS+= -DENABLE_DEFAULT=False
CMAKE_ARGS+= -DENABLE_GR_VOCODER=True
CMAKE_ARGS+= -DENABLE_GRC=True
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_VOCODER=ON
CMAKE_ARGS+= -DENABLE_GRC=ON
PLIST_MINUS+= companion

4
gnuradio-wavelet/Makefile
View File

@ -6,8 +6,8 @@ COMMENT= Wavelet transform of GNU Radio
.include "../../wip/gnuradio-core/Makefile.common"
.include "../../wip/gnuradio-core/Nocore.mk"
CMAKE_ARGS+= -DENABLE_DEFAULT=False
CMAKE_ARGS+= -DENABLE_GR_WAVELET=True
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_WAVELET=ON
.include "../../math/gsl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

6
gnuradio-zeromq/Makefile
View File

@ -14,10 +14,10 @@ COMMENT= All of the zeromq blocks, utilities, and examples
.include "../../wip/gnuradio-core/Makefile.common"
.include "../../wip/gnuradio-core/Nocore.mk"
CMAKE_ARGS+= -DENABLE_DEFAULT=False
CMAKE_ARGS+= -DENABLE_GR_ZEROMQ=True
CMAKE_ARGS+= -DENABLE_DEFAULT=OFF
CMAKE_ARGS+= -DENABLE_GR_ZEROMQ=ON
CMAKE_ARGS+= -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
CMAKE_ARGS+= -DENABLE_GRC=True
CMAKE_ARGS+= -DENABLE_GRC=ON
PLIST_MINUS+= companion