pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gnuradio-*: fix assorted pkglint warnings
Module Name: pkgsrc-wip
Committed By: Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By: tnn
Date: Mon Aug 3 19:47:01 2020 +0200
Changeset: 55661558938a1abab0e9800c0e1d0b033abc61c5
Modified Files:
gnuradio-channels/Makefile
gnuradio-companion/Makefile
gnuradio-core/Makefile
gnuradio-core/Makefile.common
gnuradio-core/PLIST
gnuradio-core/distinfo
gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
gnuradio-ctrlport/Makefile
gnuradio-ctrlport/buildlink3.mk
gnuradio-default/Makefile
gnuradio-digital/Makefile
gnuradio-doxygen/Makefile
gnuradio-dtv/Makefile
gnuradio-fec/Makefile
gnuradio-qtgui/Makefile
gnuradio-trellis/Makefile
gnuradio-uhd/Makefile
gnuradio-utils/Makefile
gnuradio-video-sdl/Makefile
gnuradio-vocoder/Makefile
gnuradio-wavelet/Makefile
gnuradio-zeromq/Makefile
Added Files:
gnuradio-core/patches/patch-grc_scripts_gnuradio-companion
gnuradio-core/version.mk
Removed Files:
gnuradio-core/Makefile.version
gnuradio-core/patches/patch-grc_script_gnuradio-companion
Log Message:
gnuradio-*: fix assorted pkglint warnings
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=55661558938a1abab0e9800c0e1d0b033abc61c5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gnuradio-channels/Makefile | 2 +-
gnuradio-companion/Makefile | 3 ++
gnuradio-core/Makefile | 2 +-
gnuradio-core/Makefile.common | 41 +++++++++++-----------
gnuradio-core/Makefile.version | 3 --
gnuradio-core/PLIST | 1 -
gnuradio-core/distinfo | 4 +--
.../patches/patch-gr-audio_lib_CMakeLists.txt | 3 ++
.../patches/patch-grc_script_gnuradio-companion | 15 --------
.../patches/patch-grc_scripts_gnuradio-companion | 15 ++++++++
gnuradio-core/version.mk | 3 ++
gnuradio-ctrlport/Makefile | 4 +--
gnuradio-ctrlport/buildlink3.mk | 2 +-
gnuradio-default/Makefile | 2 +-
gnuradio-digital/Makefile | 6 ++--
gnuradio-doxygen/Makefile | 4 +--
gnuradio-dtv/Makefile | 8 ++---
gnuradio-fec/Makefile | 2 +-
gnuradio-qtgui/Makefile | 2 +-
gnuradio-trellis/Makefile | 8 ++---
gnuradio-uhd/Makefile | 8 ++---
gnuradio-utils/Makefile | 4 +--
gnuradio-video-sdl/Makefile | 6 ++--
gnuradio-vocoder/Makefile | 6 ++--
gnuradio-wavelet/Makefile | 4 +--
gnuradio-zeromq/Makefile | 6 ++--
26 files changed, 85 insertions(+), 79 deletions(-)
diffs:
diff --git a/gnuradio-channels/Makefile b/gnuradio-channels/Makefile
index c069ec393b..6c158ca236 100644
--- a/gnuradio-channels/Makefile
+++ b/gnuradio-channels/Makefile
@@ -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
diff --git a/gnuradio-companion/Makefile b/gnuradio-companion/Makefile
index e9e45c3b1c..4fedda123b 100644
--- a/gnuradio-companion/Makefile
+++ b/gnuradio-companion/Makefile
@@ -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...
diff --git a/gnuradio-core/Makefile b/gnuradio-core/Makefile
index b87e496388..9905d4c421 100644
--- a/gnuradio-core/Makefile
+++ b/gnuradio-core/Makefile
@@ -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:
diff --git a/gnuradio-core/Makefile.common b/gnuradio-core/Makefile.common
index cb732828b9..a565704b97 100644
--- a/gnuradio-core/Makefile.common
+++ b/gnuradio-core/Makefile.common
@@ -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
diff --git a/gnuradio-core/Makefile.version b/gnuradio-core/Makefile.version
deleted file mode 100644
index eb9f19b3ff..0000000000
--- a/gnuradio-core/Makefile.version
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: Makefile.version,v 1.13 2019/06/21 16:02:16 mef Exp $
-
-VERSION= 3.8.1.0
diff --git a/gnuradio-core/PLIST b/gnuradio-core/PLIST
index 2cd2b96f19..b6d8ceb7d0 100644
--- a/gnuradio-core/PLIST
+++ b/gnuradio-core/PLIST
@@ -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
diff --git a/gnuradio-core/distinfo b/gnuradio-core/distinfo
index b7cb0b6a6d..e760dba9ac 100644
--- a/gnuradio-core/distinfo
+++ b/gnuradio-core/distinfo
@@ -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
diff --git a/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt b/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
index 1744145f51..8a89ea8de5 100644
--- a/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
+++ b/gnuradio-core/patches/patch-gr-audio_lib_CMakeLists.txt
@@ -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
diff --git a/gnuradio-core/patches/patch-grc_script_gnuradio-companion b/gnuradio-core/patches/patch-grc_script_gnuradio-companion
deleted file mode 100644
index f51700c5ea..0000000000
--- a/gnuradio-core/patches/patch-grc_script_gnuradio-companion
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-grc_script_gnuradio-companion,v 1.4 2015/09/17 13:48:05 makoto Exp $
-
-Add message for NetBSD when failed to import gnuradio.
-Or missing gnuradio-core package.
-
---- 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 model path environment variable set correctly?
- All OS: PYTHONPATH
diff --git a/gnuradio-core/patches/patch-grc_scripts_gnuradio-companion b/gnuradio-core/patches/patch-grc_scripts_gnuradio-companion
new file mode 100644
index 0000000000..f51700c5ea
--- /dev/null
+++ b/gnuradio-core/patches/patch-grc_scripts_gnuradio-companion
@@ -0,0 +1,15 @@
+$NetBSD: patch-grc_script_gnuradio-companion,v 1.4 2015/09/17 13:48:05 makoto Exp $
+
+Add message for NetBSD when failed to import gnuradio.
+Or missing gnuradio-core package.
+
+--- 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 model path environment variable set correctly?
+ All OS: PYTHONPATH
diff --git a/gnuradio-core/version.mk b/gnuradio-core/version.mk
new file mode 100644
index 0000000000..eb9f19b3ff
--- /dev/null
+++ b/gnuradio-core/version.mk
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.version,v 1.13 2019/06/21 16:02:16 mef Exp $
+
+VERSION= 3.8.1.0
diff --git a/gnuradio-ctrlport/Makefile b/gnuradio-ctrlport/Makefile
index fc2a363634..24607f8f74 100644
--- a/gnuradio-ctrlport/Makefile
+++ b/gnuradio-ctrlport/Makefile
@@ -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"
diff --git a/gnuradio-ctrlport/buildlink3.mk b/gnuradio-ctrlport/buildlink3.mk
index a50e0a2c93..faf491b588 100644
--- a/gnuradio-ctrlport/buildlink3.mk
+++ b/gnuradio-ctrlport/buildlink3.mk
@@ -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
diff --git a/gnuradio-default/Makefile b/gnuradio-default/Makefile
index b121785994..5af7e01559 100644
--- a/gnuradio-default/Makefile
+++ b/gnuradio-default/Makefile
@@ -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/
diff --git a/gnuradio-digital/Makefile b/gnuradio-digital/Makefile
index 441a57e5fe..618209474e 100644
--- a/gnuradio-digital/Makefile
+++ b/gnuradio-digital/Makefile
@@ -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
diff --git a/gnuradio-doxygen/Makefile b/gnuradio-doxygen/Makefile
index 6b12245f1e..833b8729c2 100644
--- a/gnuradio-doxygen/Makefile
+++ b/gnuradio-doxygen/Makefile
@@ -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}
diff --git a/gnuradio-dtv/Makefile b/gnuradio-dtv/Makefile
index e220dda6f6..8789bec96e 100644
--- a/gnuradio-dtv/Makefile
+++ b/gnuradio-dtv/Makefile
@@ -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
diff --git a/gnuradio-fec/Makefile b/gnuradio-fec/Makefile
index 0c19ef50f1..4d8880082e 100644
--- a/gnuradio-fec/Makefile
+++ b/gnuradio-fec/Makefile
@@ -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
diff --git a/gnuradio-qtgui/Makefile b/gnuradio-qtgui/Makefile
index d149703958..f21e1575fd 100644
--- a/gnuradio-qtgui/Makefile
+++ b/gnuradio-qtgui/Makefile
@@ -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
diff --git a/gnuradio-trellis/Makefile b/gnuradio-trellis/Makefile
index 54b88765f1..99f9e9806b 100644
--- a/gnuradio-trellis/Makefile
+++ b/gnuradio-trellis/Makefile
@@ -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
diff --git a/gnuradio-uhd/Makefile b/gnuradio-uhd/Makefile
index 21b9953bf1..133547fb5d 100644
--- a/gnuradio-uhd/Makefile
+++ b/gnuradio-uhd/Makefile
@@ -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
diff --git a/gnuradio-utils/Makefile b/gnuradio-utils/Makefile
index 9aef42b19a..de211a15b9 100644
--- a/gnuradio-utils/Makefile
+++ b/gnuradio-utils/Makefile
@@ -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"
diff --git a/gnuradio-video-sdl/Makefile b/gnuradio-video-sdl/Makefile
index 8a29fc2934..8e45b79fae 100644
--- a/gnuradio-video-sdl/Makefile
+++ b/gnuradio-video-sdl/Makefile
@@ -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
diff --git a/gnuradio-vocoder/Makefile b/gnuradio-vocoder/Makefile
index c063f7fc28..1c6c5ea0c0 100644
--- a/gnuradio-vocoder/Makefile
+++ b/gnuradio-vocoder/Makefile
@@ -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
diff --git a/gnuradio-wavelet/Makefile b/gnuradio-wavelet/Makefile
index b5d61bf65a..cc33c5e354 100644
--- a/gnuradio-wavelet/Makefile
+++ b/gnuradio-wavelet/Makefile
@@ -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"
diff --git a/gnuradio-zeromq/Makefile b/gnuradio-zeromq/Makefile
index e05ad0dedd..35d1aedcc8 100644
--- a/gnuradio-zeromq/Makefile
+++ b/gnuradio-zeromq/Makefile
@@ -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
Home |
Main Index |
Thread Index |
Old Index