Thu Nov 26 20:53:52 2015 UTC ()
don't forget to install audio config examples, fixes osx


(wiedi)
diff -r1.50 -r1.51 pkgsrc/ham/gnuradio-core/Makefile
diff -r1.8 -r1.9 pkgsrc/ham/gnuradio-core/Makefile.common
diff -r1.20 -r1.21 pkgsrc/ham/gnuradio-core/PLIST
diff -r1.1 -r1.2 pkgsrc/ham/gnuradio-core/PLIST.Darwin
cvs diff -r1.50 -r1.51 pkgsrc/ham/gnuradio-core/Makefile (expand / switch to unified diff)

--- pkgsrc/ham/gnuradio-core/Makefile 2015/09/01 04:13:43 1.50
+++ pkgsrc/ham/gnuradio-core/Makefile 2015/11/26 20:53:52 1.51
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.50 2015/09/01 04:13:43 mef Exp $ 1# $NetBSD: Makefile,v 1.51 2015/11/26 20:53:52 wiedi Exp $
2 2
3PKGNAME= gnuradio-core-${VERSION} 3PKGNAME= gnuradio-core-${VERSION}
 4PKGREVISION= 1
4COMMENT= Core part of GNU Radio, all others need this 5COMMENT= Core part of GNU Radio, all others need this
5 6
6PLIST_MINUS= # empty 7PLIST_MINUS= # empty
7.include "Makefile.common" 8.include "Makefile.common"
8 9
9#CONF_FILES+= ${EGDIR}/gnuradio-runtime.conf ${PKG_SYSCONFDIR}/gnuradio-runtime.conf 10#CONF_FILES+= ${EGDIR}/gnuradio-runtime.conf ${PKG_SYSCONFDIR}/gnuradio-runtime.conf
10#CONF_FILES+= ${EGDIR}/gr-audio-jack.conf ${PKG_SYSCONFDIR}/gr-audio-jack.conf 11#CONF_FILES+= ${EGDIR}/gr-audio-jack.conf ${PKG_SYSCONFDIR}/gr-audio-jack.conf
11#CONF_FILES+= ${EGDIR}/gr-audio-portaudio.conf ${PKG_SYSCONFDIR}/gr-audio-portaudio.conf 12#CONF_FILES+= ${EGDIR}/gr-audio-portaudio.conf ${PKG_SYSCONFDIR}/gr-audio-portaudio.conf
12#CONF_FILES+= ${EGDIR}/gr-audio.conf ${PKG_SYSCONFDIR}/gr-audio.conf 13#CONF_FILES+= ${EGDIR}/gr-audio.conf ${PKG_SYSCONFDIR}/gr-audio.conf
13 14
14.include "../../mk/oss.buildlink3.mk" 15.include "../../mk/oss.buildlink3.mk"
15.if ${OSS_TYPE} != "none" 16.if ${OSS_TYPE} != "none"
16#CONF_FILES+= ${EGDIR}/gr-audio-oss.conf ${PKG_SYSCONFDIR}/gr-audio-oss.conf 17#CONF_FILES+= ${EGDIR}/gr-audio-oss.conf ${PKG_SYSCONFDIR}/gr-audio-oss.conf
cvs diff -r1.8 -r1.9 pkgsrc/ham/gnuradio-core/Makefile.common (expand / switch to unified diff)

--- pkgsrc/ham/gnuradio-core/Makefile.common 2015/09/01 04:13:43 1.8
+++ pkgsrc/ham/gnuradio-core/Makefile.common 2015/11/26 20:53:52 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.8 2015/09/01 04:13:43 mef Exp $ 1# $NetBSD: Makefile.common,v 1.9 2015/11/26 20:53:52 wiedi Exp $
2# This Makefile fragment is included in the package Makefiles for 2# This Makefile fragment is included in the package Makefiles for
3# GNU Radio distributed packages (they all share common configure and build 3# GNU Radio distributed packages (they all share common configure and build
4# settings). 4# settings).
5# used by ham/gnuradio-atsc/Makefile 5# used by ham/gnuradio-atsc/Makefile
6# used by ham/gnuradio-channels/Makefile 6# used by ham/gnuradio-channels/Makefile
7# used by ham/gnuradio-companion/Makefile 7# used by ham/gnuradio-companion/Makefile
8# used by ham/gnuradio-core/Makefile 8# used by ham/gnuradio-core/Makefile
9# used by ham/gnuradio-ctrlport/Makefile 9# used by ham/gnuradio-ctrlport/Makefile
10 10
11# used by ham/gnuradio-digital/Makefile 11# used by ham/gnuradio-digital/Makefile
12# used by ham/gnuradio-doxygen/Makefile 12# used by ham/gnuradio-doxygen/Makefile
13# used by ham/gnuradio-dtv/Makefile 13# used by ham/gnuradio-dtv/Makefile
14# used by ham/gnuradio-fcd/Makefile 14# used by ham/gnuradio-fcd/Makefile
@@ -83,27 +83,27 @@ CMAKE_ARGS+= -DENABLE_GR_FILTER=ON @@ -83,27 +83,27 @@ CMAKE_ARGS+= -DENABLE_GR_FILTER=ON
83CMAKE_ARGS+= -DENABLE_PYTHON=ON 83CMAKE_ARGS+= -DENABLE_PYTHON=ON
84CMAKE_ARGS+= -DENABLE_VOLK=ON 84CMAKE_ARGS+= -DENABLE_VOLK=ON
85 85
86# Default setting (for pkgsrc) 86# Default setting (for pkgsrc)
87CMAKE_ARGS+= -Wno-dev 87CMAKE_ARGS+= -Wno-dev
88CMAKE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE 88CMAKE_ARGS+= -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
89CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH=${PREFIX}/include/portaudio2 89CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH=${PREFIX}/include/portaudio2
90CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2 90CMAKE_ARGS+= -DCMAKE_LIBRARY_PATH=${PREFIX}/lib/portaudio2
91CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2 91CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH=${PREFIX}/lib:${PREFIX}/lib/portaudio2
92CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE 92CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
93CMAKE_ARGS+= -DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0 93CMAKE_ARGS+= -DLIBUSB_INCLUDE_DIR=${PREFIX}/include/libusb-1.0
94 94
95CMAKE_ARGS+= -DGR_LIBRARY_DIR=${PREFIX}/lib 95CMAKE_ARGS+= -DGR_LIBRARY_DIR=${PREFIX}/lib
96CMAKE_ARGS+= -DGR_PREFSDIR=${DESTDIR}${PREFIX}/share/ 96CMAKE_ARGS+= -DGR_PREFSDIR=${PREFIX}/share/gnuradio/examples/
97 97
98CMAKE_ARGS+= -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include 98CMAKE_ARGS+= -DZEROMQ_INCLUDE_DIRS=${PREFIX}/include
99CMAKE_ARG_PATH= ../ 99CMAKE_ARG_PATH= ../
100 100
101.include "options.mk" 101.include "options.mk"
102 102
103# disable/enable ALSA, see also patches/patch-gr-audio_lib_CMakeLists.txt 103# disable/enable ALSA, see also patches/patch-gr-audio_lib_CMakeLists.txt
104SUBST_CLASSES+= alsa 104SUBST_CLASSES+= alsa
105SUBST_MESSAGE.alsa= Arrange the patched line depepending on alsa is in PKG_OPTIONS or not 105SUBST_MESSAGE.alsa= Arrange the patched line depepending on alsa is in PKG_OPTIONS or not
106SUBST_FILES.alsa+= gr-audio/lib/CMakeLists.txt 106SUBST_FILES.alsa+= gr-audio/lib/CMakeLists.txt
107## The value of ${ALSA_ENABLED} is either '#' or '' by options.mk. 107## The value of ${ALSA_ENABLED} is either '#' or '' by options.mk.
108SUBST_SED.alsa= -e 's,@@ALSA@@,${ALSA_ENABLED},' 108SUBST_SED.alsa= -e 's,@@ALSA@@,${ALSA_ENABLED},'
109SUBST_STAGE.alsa= post-patch 109SUBST_STAGE.alsa= post-patch
cvs diff -r1.20 -r1.21 pkgsrc/ham/gnuradio-core/PLIST (expand / switch to unified diff)

--- pkgsrc/ham/gnuradio-core/PLIST 2015/09/01 04:13:43 1.20
+++ pkgsrc/ham/gnuradio-core/PLIST 2015/11/26 20:53:52 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.20 2015/09/01 04:13:43 mef Exp $ 1@comment $NetBSD: PLIST,v 1.21 2015/11/26 20:53:52 wiedi Exp $
2bin/gnuradio-config-info 2bin/gnuradio-config-info
3bin/gr_filter_design 3bin/gr_filter_design
4bin/volk-config-info 4bin/volk-config-info
5bin/volk_modtool 5bin/volk_modtool
6bin/volk_profile 6bin/volk_profile
7include/gnuradio/analog/agc.h 7include/gnuradio/analog/agc.h
8include/gnuradio/analog/agc2.h 8include/gnuradio/analog/agc2.h
9include/gnuradio/analog/agc2_cc.h 9include/gnuradio/analog/agc2_cc.h
10include/gnuradio/analog/agc2_ff.h 10include/gnuradio/analog/agc2_ff.h
11include/gnuradio/analog/agc3_cc.h 11include/gnuradio/analog/agc3_cc.h
12include/gnuradio/analog/agc_cc.h 12include/gnuradio/analog/agc_cc.h
13include/gnuradio/analog/agc_ff.h 13include/gnuradio/analog/agc_ff.h
14include/gnuradio/analog/api.h 14include/gnuradio/analog/api.h
@@ -930,26 +930,30 @@ share/gnuradio/examples/filter/fft_filte @@ -930,26 +930,30 @@ share/gnuradio/examples/filter/fft_filte
930share/gnuradio/examples/filter/filter_taps.grc 930share/gnuradio/examples/filter/filter_taps.grc
931share/gnuradio/examples/filter/fir_filter_ccc.py 931share/gnuradio/examples/filter/fir_filter_ccc.py
932share/gnuradio/examples/filter/fir_filter_fff.py 932share/gnuradio/examples/filter/fir_filter_fff.py
933share/gnuradio/examples/filter/gr_filtdes_api.py 933share/gnuradio/examples/filter/gr_filtdes_api.py
934share/gnuradio/examples/filter/gr_filtdes_callback.py 934share/gnuradio/examples/filter/gr_filtdes_callback.py
935share/gnuradio/examples/filter/gr_filtdes_live_upd.py 935share/gnuradio/examples/filter/gr_filtdes_live_upd.py
936share/gnuradio/examples/filter/gr_filtdes_restrict.py 936share/gnuradio/examples/filter/gr_filtdes_restrict.py
937share/gnuradio/examples/filter/interpolate.py 937share/gnuradio/examples/filter/interpolate.py
938share/gnuradio/examples/filter/reconstruction.py 938share/gnuradio/examples/filter/reconstruction.py
939share/gnuradio/examples/filter/resampler.py 939share/gnuradio/examples/filter/resampler.py
940share/gnuradio/examples/filter/resampler_demo.grc 940share/gnuradio/examples/filter/resampler_demo.grc
941share/gnuradio/examples/filter/synth_filter.py 941share/gnuradio/examples/filter/synth_filter.py
942share/gnuradio/examples/filter/synth_to_chan.py 942share/gnuradio/examples/filter/synth_to_chan.py
 943share/gnuradio/examples/gnuradio-runtime.conf
 944share/gnuradio/examples/gr-audio-jack.conf
 945share/gnuradio/examples/gr-audio-portaudio.conf
 946share/gnuradio/examples/gr-audio.conf
943share/gnuradio/examples/metadata/file_metadata_sink.grc 947share/gnuradio/examples/metadata/file_metadata_sink.grc
944share/gnuradio/examples/metadata/file_metadata_source.grc 948share/gnuradio/examples/metadata/file_metadata_source.grc
945share/gnuradio/examples/metadata/file_metadata_vector_sink.grc 949share/gnuradio/examples/metadata/file_metadata_vector_sink.grc
946share/gnuradio/examples/metadata/file_metadata_vector_source.grc 950share/gnuradio/examples/metadata/file_metadata_vector_source.grc
947share/gnuradio/examples/mp-sched/README 951share/gnuradio/examples/mp-sched/README
948share/gnuradio/examples/mp-sched/affinity_set.py 952share/gnuradio/examples/mp-sched/affinity_set.py
949share/gnuradio/examples/mp-sched/plot_flops.py 953share/gnuradio/examples/mp-sched/plot_flops.py
950share/gnuradio/examples/mp-sched/run_synthetic.py 954share/gnuradio/examples/mp-sched/run_synthetic.py
951share/gnuradio/examples/mp-sched/synthetic.py 955share/gnuradio/examples/mp-sched/synthetic.py
952share/gnuradio/examples/mp-sched/wfm_rcv_pll_to_wav.py 956share/gnuradio/examples/mp-sched/wfm_rcv_pll_to_wav.py
953share/gnuradio/examples/network/audio_sink.py 957share/gnuradio/examples/network/audio_sink.py
954share/gnuradio/examples/network/audio_source.py 958share/gnuradio/examples/network/audio_source.py
955share/gnuradio/examples/network/dial_tone_sink.py 959share/gnuradio/examples/network/dial_tone_sink.py
cvs diff -r1.1 -r1.2 pkgsrc/ham/gnuradio-core/PLIST.Darwin (expand / switch to unified diff)

--- pkgsrc/ham/gnuradio-core/PLIST.Darwin 2015/01/27 06:03:17 1.1
+++ pkgsrc/ham/gnuradio-core/PLIST.Darwin 2015/11/26 20:53:52 1.2
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1@comment $NetBSD: PLIST.Darwin,v 1.1 2015/01/27 06:03:17 dbj Exp $ 1@comment $NetBSD: PLIST.Darwin,v 1.2 2015/11/26 20:53:52 wiedi Exp $
2include/gnuradio/audio/osx_impl.h 2include/gnuradio/audio/osx_impl.h
3share/examples/gnuradio/conf.d/gr-audio-osx.conf 3share/gnuradio/examples/gr-audio-osx.conf