svn commit: r321572 - in head/comms/dabstick-radio: . files
Juergen Lock
nox at FreeBSD.org
Sat Jun 22 13:28:43 UTC 2013
Author: nox
Date: Sat Jun 22 13:28:41 2013
New Revision: 321572
URL: http://svnweb.freebsd.org/changeset/ports/321572
Log:
- Update to 0.95 .
- The DAB(+) receiver app now needs MMX and SSE2 so might not run on
some old i386 systems, on the other hand it uses considerably
less CPU than previous versions.
- Add spectrum-viewer app.
- More release notes in %%PREFIX%%/share/doc/dabstick-radio/README-0.95 .
Added:
head/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mm_malloc.h (contents, props changed)
head/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro (contents, props changed)
Deleted:
head/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp
Modified:
head/comms/dabstick-radio/Makefile
head/comms/dabstick-radio/distinfo
head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro
head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro
Modified: head/comms/dabstick-radio/Makefile
==============================================================================
--- head/comms/dabstick-radio/Makefile Sat Jun 22 13:23:21 2013 (r321571)
+++ head/comms/dabstick-radio/Makefile Sat Jun 22 13:28:41 2013 (r321572)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= dabstick-radio
-PORTVERSION= 0.92
+PORTVERSION= 0.95
CATEGORIES= comms audio hamradio
MASTER_SITES= http://www.sdr-j.tk/
EXTRACT_SUFX= .tgz
@@ -15,6 +15,7 @@ LICENSE= GPLv2
LIB_DEPENDS+= rtlsdr:${PORTSDIR}/comms/rtl-sdr \
qwt:${PORTSDIR}/x11-toolkits/qwt5 \
portaudio.2:${PORTSDIR}/audio/portaudio2 \
+ sndfile:${PORTSDIR}/audio/libsndfile \
avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} \
fftw3:${PORTSDIR}/math/fftw3 \
faad:${PORTSDIR}/audio/faad
@@ -27,11 +28,19 @@ QMAKE_DABSTICK= ${QMAKE} -unix PREFIX=${
MAKE_ENV+= FFMPEG_SUFFIX=${FFMPEG_SUFFIX}
MAKE_JOBS_SAFE= yes
-PORTDOCS= dab-manual.pdf
-PLIST_FILES+= bin/dabreceiver bin/fmreceiver
+PORTDOCS= *
+PLIST_FILES+= bin/dabreceiver bin/fmreceiver bin/spectrum-viewer
.include <bsd.port.pre.mk>
+.if (${OSVERSION} >= 901000) && exists(${DESTDIR}/usr/bin/clang)
+CC= clang
+CXX= clang++
+CPP= clang-cpp
+.else
+USE_GCC= 4.6+
+.endif
+
.if ${OSVERSION} < 800069
IGNORE= requires FreeBSD 8.0 or later
.endif
@@ -41,20 +50,25 @@ do-configure:
${QMAKE_DABSTICK} Makefile fmreceiver.pro
cd ${WRKSRC}/dabreceiver-V2 && ${SETENV} ${MAKE_ENV} \
${QMAKE_DABSTICK} Makefile dabreceiver.pro
+ cd ${WRKSRC}/spectrum-viewer && ${SETENV} ${MAKE_ENV} \
+ ${QMAKE_DABSTICK} Makefile spectrum-viewer.pro
do-build:
cd ${WRKSRC}/fmreceiver-dab && ${SETENV} ${MAKE_ENV} \
- ${MAKE} ${_MAKE_JOBS}
+ ${MAKE} ${_MAKE_JOBS} CC=${CC} CXX=${CXX} LINK=${CXX}
cd ${WRKSRC}/dabreceiver-V2 && ${SETENV} ${MAKE_ENV} \
- ${MAKE} ${_MAKE_JOBS}
+ ${MAKE} ${_MAKE_JOBS} CC=${CC} CXX=${CXX} LINK=${CXX}
+ cd ${WRKSRC}/spectrum-viewer && ${SETENV} ${MAKE_ENV} \
+ ${MAKE} ${_MAKE_JOBS} CC=${CC} CXX=${CXX} LINK=${CXX}
do-install:
${INSTALL} ${WRKSRC}/fmreceiver-dab/fmreceiver \
${WRKSRC}/dabreceiver-V2/dabreceiver \
+ ${WRKSRC}/spectrum-viewer/spectrum-viewer \
${PREFIX}/bin
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/dab-manual.pdf ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/dab-manual.pdf ${WRKSRC}/README-${PORTVERSION} ${DOCSDIR}
.endif
.include <bsd.port.post.mk>
Modified: head/comms/dabstick-radio/distinfo
==============================================================================
--- head/comms/dabstick-radio/distinfo Sat Jun 22 13:23:21 2013 (r321571)
+++ head/comms/dabstick-radio/distinfo Sat Jun 22 13:28:41 2013 (r321572)
@@ -1,2 +1,2 @@
-SHA256 (dabstick-radio-0.92.tgz) = 66f263e1971718f8e44471a02aa126dd7ae8bef644dec8bc1e9a44f819e61724
-SIZE (dabstick-radio-0.92.tgz) = 524169
+SHA256 (dabstick-radio-0.95.tgz) = 753e31ab9720c18fbf9484460520cdcc3ee48c98b2f4d9f413bd1267775c67a8
+SIZE (dabstick-radio-0.95.tgz) = 606458
Added: head/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mm_malloc.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mm_malloc.h Sat Jun 22 13:28:41 2013 (r321572)
@@ -0,0 +1,12 @@
+--- dabreceiver-V2/backend/mm_malloc.h.orig
++++ dabreceiver-V2/backend/mm_malloc.h
+@@ -40,7 +40,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #if defined(_WIN32) || defined(_WIN64)
+ #define MALLOC(a) _mm_malloc(a, 16)
+ #else
++#ifndef __FreeBSD__
+ #include <malloc.h>
++#endif
+ #define MALLOC(a) memalign(16, a)
+ #endif
+
Modified: head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro
==============================================================================
--- head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro Sat Jun 22 13:23:21 2013 (r321571)
+++ head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro Sat Jun 22 13:28:41 2013 (r321572)
@@ -1,6 +1,6 @@
--- dabreceiver-V2/dabreceiver.pro.orig
+++ dabreceiver-V2/dabreceiver.pro
-@@ -138,39 +138,39 @@ LIBS += -lfaad
+@@ -147,40 +147,41 @@ LIBS += -lsndfile
#}
#for fedora use the second set
@@ -10,30 +10,21 @@
- INCLUDEPATH += /usr/include/qwt5-qt4
- INCLUDEPATH += /usr/include/
- INCLUDEPATH += /usr/include/ffmpeg
-- LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lfftw3 -lrtlsdr -ldl -lz
-+#unix {
-+# HEADERS += ../input/dabstick.h
-+# SOURCES += ../input/dabstick.cpp
-+# INCLUDEPATH += /usr/include/qwt5-qt4
-+# INCLUDEPATH += /usr/include/
-+# INCLUDEPATH += /usr/include/ffmpeg
-+# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lfftw3 -lrtlsdr -ldl -lz
- #uncomment the following line when using the libav package for ffmpeg
- #rather than the "built-in" code for KJMP
+-# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3f -lrtlsdr -ldl -lz
+- LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl -lz
+-#uncomment the following line when using the libav package for ffmpeg
+-#rather than the "built-in" code for KJMP
- LIBS+= -lavcodec -lavdevice -lavutil -lavformat -lswresample -lswscale -lavfilter
-+# LIBS+= -lavcodec -lavdevice -lavutil -lavformat -lswresample -lswscale -lavfilter
- #uncomment the following line when using the faad library
+-#uncomment the following line when using the faad library
- LIBS += -lfaad
-+# LIBS += -lfaad
- #Normal operation under Linux is to uncomment both lines.
- #If otherwise: also adjust the define(s) in dab-constants.h
+-#Normal operation under Linux is to uncomment both lines.
+-#If otherwise: also adjust the define(s) in dab-constants.h
-}
-+#}
-
- ##for FreeBSD use the third set (Thanks to Juergen Lock)
--#unix {
+-
+-##for FreeBSD use the third set (Thanks to Juergen Lock)
+ #unix {
-# QMAKE_CXXFLAGS += -D__FREEBSD__
--# HEADERS += ../input/dabstick.h
+ # HEADERS += ../input/dabstick.h
-# SOURCES += ../input/dabstick.cpp
-# INCLUDEPATH += ${LOCALBASE}/include/qwt
-# INCLUDEPATH += ${LOCALBASE}/include/portaudio2
@@ -43,9 +34,27 @@
-# QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2
-# QMAKE_LIBDIR += ${LOCALBASE}/lib/ffmpeg${FFMPEG_SUFFIX}
-# QMAKE_LIBDIR += ${LOCALBASE}/lib
--# LIBS+= -lqwt -lusb -lrt -lportaudio -lfftw3 -lrtlsdr -lz
+-# LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -lz
++# SOURCES += ../input/dabstick.cpp
++# INCLUDEPATH += /usr/include/qwt5-qt4
++# INCLUDEPATH += /usr/include/
++# INCLUDEPATH += /usr/include/ffmpeg
++## LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3f -lrtlsdr -ldl -lz
++# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl -lz
+ ##uncomment the following line when using the libav package for ffmpeg
+-# LIBS+= -lavcodec${FFMPEG_SUFFIX} -lavdevice${FFMPEG_SUFFIX} -lavutil${FFMPEG_SUFFIX} -lavformat${FFMPEG_SUFFIX} -lswresample${FFMPEG_SUFFIX} -lswscale${FFMPEG_SUFFIX} -lavfilter${FFMPEG_SUFFIX}
++##rather than the "built-in" code for KJMP
++# LIBS+= -lavcodec -lavdevice -lavutil -lavformat -lswresample -lswscale -lavfilter
+ ##uncomment the following line when using the faad library
+ # LIBS += -lfaad
++##Normal operation under Linux is to uncomment both lines.
++##If otherwise: also adjust the define(s) in dab-constants.h
+ #}
+
++##for FreeBSD use the third set (Thanks to Juergen Lock)
+unix {
-+ QMAKE_CXXFLAGS += -D__FREEBSD__
++ QMAKE_CXXFLAGS += -D__FREEBSD__ -mmmx -msse2
++ QMAKE_CFLAGS += -D__FREEBSD__ -mmmx -msse2
+ HEADERS += ../input/dabstick.h
+ SOURCES += ../input/dabstick.cpp
+ INCLUDEPATH += ${LOCALBASE}/include/qwt
@@ -56,13 +65,10 @@
+ QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2
+ QMAKE_LIBDIR += ${LOCALBASE}/lib/ffmpeg${FFMPEG_SUFFIX}
+ QMAKE_LIBDIR += ${LOCALBASE}/lib
-+ LIBS+= -lqwt -lusb -lrt -lportaudio -lfftw3 -lrtlsdr -lz
- ##uncomment the following line when using the libav package for ffmpeg
--# LIBS+= -lavcodec${FFMPEG_SUFFIX} -lavdevice${FFMPEG_SUFFIX} -lavutil${FFMPEG_SUFFIX} -lavformat${FFMPEG_SUFFIX} -lswresample${FFMPEG_SUFFIX} -lswscale${FFMPEG_SUFFIX} -lavfilter${FFMPEG_SUFFIX}
++ LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -lz
++#uncomment the following line when using the libav package for ffmpeg
+ LIBS+= -lavcodec${FFMPEG_SUFFIX} -lavdevice${FFMPEG_SUFFIX} -lavutil${FFMPEG_SUFFIX} -lavformat${FFMPEG_SUFFIX} -lswresample${FFMPEG_SUFFIX} -lswscale${FFMPEG_SUFFIX} -lavfilter${FFMPEG_SUFFIX}
- ##uncomment the following line when using the faad library
--# LIBS += -lfaad
--#}
++#uncomment the following line when using the faad library
+ LIBS += -lfaad
+}
-
++
Modified: head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro
==============================================================================
--- head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro Sat Jun 22 13:23:21 2013 (r321571)
+++ head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro Sat Jun 22 13:28:41 2013 (r321572)
@@ -1,6 +1,6 @@
--- fmreceiver-dab/fmreceiver.pro.orig
+++ fmreceiver-dab/fmreceiver.pro
-@@ -121,26 +121,26 @@ LIBS += -lstdc++
+@@ -121,26 +121,27 @@ LIBS += -lstdc++
#}
#for fedora use the second set
@@ -10,7 +10,7 @@
- INCLUDEPATH += /usr/include/qwt5-qt4
- INCLUDEPATH += /usr/local/include
- INCLUDEPATH += /usr/include/
-- LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lfftw3 -lrtlsdr -ldl
+- LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl
-}
+#unix {
+# HEADERS += ../input/dabstick.h
@@ -18,7 +18,7 @@
+# INCLUDEPATH += /usr/include/qwt5-qt4
+# INCLUDEPATH += /usr/local/include
+# INCLUDEPATH += /usr/include/
-+# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lfftw3 -lrtlsdr -ldl
++# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl
+#}
#for FreeBSD use the third set (thanks Juergen Lock)
@@ -32,18 +32,19 @@
-# INCLUDEPATH += /usr/include/
-# QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2
-# QMAKE_LIBDIR += ${LOCALBASE}/lib
--# LIBS+= -lqwt -lusb -lrt -lportaudio -lfftw3f -lrtlsdr
+-# LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr
-#}
+unix {
-+ QMAKE_CXXFLAGS += -D__FREEBSD__
-+ HEADERS += ../input/dabstick.h
-+ SOURCES += ../input/dabstick.cpp
++ QMAKE_CXXFLAGS += -D__FREEBSD__ -mmmx -msse2
++ QMAKE_CFLAGS += -D__FREEBSD__ -mmmx -msse2
++ HEADERS += ../input/dabstick.h
++ SOURCES += ../input/dabstick.cpp
+ INCLUDEPATH += ${LOCALBASE}/include/qwt
-+ INCLUDEPATH += ${LOCALBASE}/include/portaudio2
++ INCLUDEPATH += ${LOCALBASE}/include/portaudio2
+ INCLUDEPATH += ${LOCALBASE}/include
+ INCLUDEPATH += /usr/include/
+ QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2
+ QMAKE_LIBDIR += ${LOCALBASE}/lib
-+ LIBS+= -lqwt -lusb -lrt -lportaudio -lfftw3 -lrtlsdr
++ LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr
+}
#
Added: head/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro Sat Jun 22 13:28:41 2013 (r321572)
@@ -0,0 +1,48 @@
+--- spectrum-viewer/spectrum-viewer.pro.orig
++++ spectrum-viewer/spectrum-viewer.pro
+@@ -63,24 +63,27 @@ LIBS += -lsamplerate
+ #}
+
+ #for fedora use the second set
+-unix {
+- HEADERS += ../input/dabstick.h
+- SOURCES += ../input/dabstick.cpp
+- INCLUDEPATH += /usr/include/qwt5-qt4
+- INCLUDEPATH += /usr/include/
+- INCLUDEPATH += /usr/local/include
+- LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lfftw3 -lrtlsdr -ldl
+-}
++#unix {
++# HEADERS += ../input/dabstick.h
++# SOURCES += ../input/dabstick.cpp
++# INCLUDEPATH += /usr/include/qwt5-qt4
++# INCLUDEPATH += /usr/include/
++# INCLUDEPATH += /usr/local/include
++# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lfftw3 -lrtlsdr -ldl
++#}
+
+ #for FreeBSD use the third set (thanks Juergen Lock)
+-#unix {
+-# QMAKE_CXXFLAGS += -D__FREEBSD__
+-# HEADERS += ../input/dabstick.h
+-# SOURCES += ../input/dabstick.cpp
+-# INCLUDEPATH += ${LOCALBASE}/include/qwt
+-# INCLUDEPATH += ${LOCALBASE}/include
+-# INCLUDEPATH += /usr/include/
+-# QMAKE_LIBDIR += ${LOCALBASE}/lib
+-# LIBS+= -lqwt -lusb -lrt -lfftw3 -lrtlsdr
+-#}
++unix {
++ QMAKE_CXXFLAGS += -D__FREEBSD__ -mmmx -msse2
++ QMAKE_CFLAGS += -D__FREEBSD__ -mmmx -msse2
++ HEADERS += ../input/dabstick.h
++ SOURCES += ../input/dabstick.cpp
++ INCLUDEPATH += ${LOCALBASE}/include/qwt
++ INCLUDEPATH += ${LOCALBASE}/include/portaudio2
++ INCLUDEPATH += ${LOCALBASE}/include
++ INCLUDEPATH += /usr/include/
++ QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2
++ QMAKE_LIBDIR += ${LOCALBASE}/lib
++ LIBS+= -lqwt -lusb -lrt -lfftw3 -lrtlsdr
++}
+ #
More information about the svn-ports-all
mailing list