Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Feb 2016 23:06:37 +0000 (UTC)
From:      Diane Bruce <db@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r409075 - in head/audio/dream: . files
Message-ID:  <201602172306.u1HN6bYs002693@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: db
Date: Wed Feb 17 23:06:37 2016
New Revision: 409075
URL: https://svnweb.freebsd.org/changeset/ports/409075

Log:
  Open-Source Software Implementation of a DRM (Digital Radio Mondiale) Receiver
  under the GNU General Public License (GPL)
  
  There was a previous dream port that had been removed. It was
  audio/dream||2009-01-06|Has expired: Needs DRM enabled in FAAD
  
  The Dream development team today releases Dream version 1.12.
  
  Dream is a DRM (Digital Radio Mondiale) software receiver and decoder.
  It is a very complete receiver, featuring compliant decoding of HE AAC v2
  audio streams, journaline decoding, a feature rich statistics section
  providing invaluable information about the streams being received, and automatic
  update of available stations from the web, among several other features.
  
  It also features a limited transmission mode, that uses the FAAC AAC encoder.
  
  Dream is multi-platform and has been tested on OSX, Win32 and Linux.
  
  Changes since version 1.11:
  
    - Fixed problem where users directories being cleared when clearing cache
    - Fixed timezone problems with EPG
    - Fixed problem when EPG is 4th service
  
  PR:		ports/207123
  Submitted by:	takefu@airport.fm

Added:
  head/audio/dream/
     - copied from r225340, head/audio/dream/
  head/audio/dream/files/patch-src__linux__pa_shm_ringbuffer.c   (contents, props changed)
  head/audio/dream/files/patch-src__sound__pa_ringbuffer.c   (contents, props changed)
Deleted:
  head/audio/dream/files/patch-common_GUI-QT_MultimediaDlg.cpp
  head/audio/dream/files/patch-common_MDI_PacketSocketQT.h
  head/audio/dream/files/patch-linux_source_soundcommon.cpp
Modified:
  head/audio/dream/Makefile   (contents, props changed)
  head/audio/dream/distinfo   (contents, props changed)
  head/audio/dream/pkg-descr   (contents, props changed)

Modified: head/audio/dream/Makefile
==============================================================================
--- head/audio/dream/Makefile	Tue Jan  6 18:48:25 2009	(r225340)
+++ head/audio/dream/Makefile	Wed Feb 17 23:06:37 2016	(r409075)
@@ -1,38 +1,59 @@
-# New ports collection makefile for:	Dream DRM Receiver
-# Date created:				1st september 2006
-# Whom:					Soeren Straaarup <xride@x12.dk>
-#
 # $FreeBSD$
 
 PORTNAME=	dream
-PORTVERSION=	1.6.25
-PORTREVISION=	4
-CATEGORIES=	audio hamradio
-MASTER_SITES=	SF/drm
-DISTNAME=	drm-${PORTVERSION}
-
-MAINTAINER=	xride@FreeBSD.org
-COMMENT=	Digital Radio Mondiale (DRM) software receiver
-
-LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
-		qwt4.4:${PORTSDIR}/x11-toolkits/qwt4 \
-		faad.0:${PORTSDIR}/audio/faad
-
-DEPRECATED=		Needs DRM enabled in FAAD
-EXPIRATION_DATE=	2009-01-06
-
-USE_QT_VER=	3
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include \
-		${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-PLIST_FILES=	bin/drm
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/include/qwt|${LOCALBASE}/include/qwt4|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-lqwt|-lqwt4|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|neaacdec.h|faad.h|g' ${WRKSRC}/common/sourcedecoders/AudioSourceDecoder.cpp
-	@${REINPLACE_CMD} -e 's|DRMCH_SBR_PS_STEREO|DRMCH_SBR_STEREO|g' ${WRKSRC}/common/sourcedecoders/AudioSourceDecoder.cpp
+PORTVERSION=	2.1.1
+CATEGORIES=	audio comms hamradio
+MASTER_SITES=	SF/drm/${PORTNAME}/${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-svn808
+
+MAINTAINER=	takefu@airport.fm
+COMMENT=	Software radio for AM and Digital Radio Mondiale (DRM)
+
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libhamlib.so:${PORTSDIR}/comms/hamlib\
+		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5\
+		libfftw3.so:${PORTSDIR}/math/fftw3
+
+USE_QT4=	qmake_build moc_build uic_build corelib gui network rcc webkit
+QT4_MAKE_ARGS=	INSTALL_ROOT=${STAGEDIR}
+USES=		gmake pkgconfig
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+OPTIONS_DEFINE=		SNDFILE OGG VORBIS FLAC OPUS SPEEX FAAD FAAC
+OPTIONS_RADIO=		DEVICE
+OPTIONS_RADIO_DEVICE=	PORTAUDIO PULSEAUDIO
+OPTIONS_DEFAULT=	PORTAUDIO SNDFILE
+OPTIONS_SUB=		yes
+
+PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+
+OGG_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
+SPEEX_LIB_DEPENDS=	libspeexdsp.so:${PORTSDIR}/audio/speexdsp
+FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
+FAAC_LIB_DEPENDS=	libfaac.so:${PORTSDIR}/audio/faac
+
+MANDIRS=	${PREFIX}/share/man/man1
+PLIST_FILES=	%%QT_BINDIR%%/dream share/man/man1/dream.1.gz
+
+pre-patch:
+	@${REINPLACE_CMD} -e 's|/opt|/usr|g' -e 's|/usr/local|${PREFIX}|g'\
+		-e 's|target.path = /usr/bin|target.path = ${STAGEDIR}${QT_BINDIR}|g'\
+		-e 's|/usr/share/man/man1|${STAGEDIR}${PREFIX}/share/man/man1|g'\
+		-e 's|INSTALLS += documentation||g'\
+		 ${WRKSRC}/dream.pro
+
+do-configure:
+	cd ${WRKSRC} &&\
+		${SETENV} ${MAKE_ENV} ${QMAKE} dream.pro ${QMAKE_ARGS}
+
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_MAN} ${WRKSRC}/linux/dream.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>

Modified: head/audio/dream/distinfo
==============================================================================
--- head/audio/dream/distinfo	Tue Jan  6 18:48:25 2009	(r225340)
+++ head/audio/dream/distinfo	Wed Feb 17 23:06:37 2016	(r409075)
@@ -1,3 +1,2 @@
-MD5 (drm-1.6.25.tar.gz) = 56d217db9c29a20799f2a340e8a67895
-SHA256 (drm-1.6.25.tar.gz) = def8a4db1eeb4ab46f4fd716ef21d9332d2ff553eff32f099c47779f4687fea6
-SIZE (drm-1.6.25.tar.gz) = 827306
+SHA256 (dream-2.1.1-svn808.tar.gz) = 417734a197ed596a08e75363c304be9b4595f2f21581bc64fec47c49f733bb05
+SIZE (dream-2.1.1-svn808.tar.gz) = 898761

Added: head/audio/dream/files/patch-src__linux__pa_shm_ringbuffer.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/dream/files/patch-src__linux__pa_shm_ringbuffer.c	Wed Feb 17 23:06:37 2016	(r409075)
@@ -0,0 +1,20 @@
+--- src/linux/pa_shm_ringbuffer.c.orig	2013-11-11 16:33:40 UTC
++++ src/linux/pa_shm_ringbuffer.c
+@@ -72,12 +72,13 @@
+  ****************/
+ 
+ #if defined(__APPLE__) || defined(__FreeBSD__)
+-#   include <libkern/OSAtomic.h>
++#include <sys/types.h>
++#   include <machine/atomic.h>
+ /* Here are the memory barrier functions. Mac OS X and FreeBSD only provide
+    full memory barriers, so the three types of barriers are the same. */
+-#   define PaUtil_FullMemoryBarrier()  OSMemoryBarrier()
+-#   define PaUtil_ReadMemoryBarrier()  OSMemoryBarrier()
+-#   define PaUtil_WriteMemoryBarrier() OSMemoryBarrier()
++#   define PaUtil_FullMemoryBarrier()  mb()
++#   define PaUtil_ReadMemoryBarrier()  rmb()
++#   define PaUtil_WriteMemoryBarrier() wmb()
+ #elif defined(__GNUC__)
+ /* GCC understands volatile asm and "memory" to mean it
+  * should not reorder memory read/writes */

Added: head/audio/dream/files/patch-src__sound__pa_ringbuffer.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/dream/files/patch-src__sound__pa_ringbuffer.c	Wed Feb 17 23:06:37 2016	(r409075)
@@ -0,0 +1,20 @@
+--- src/sound/pa_ringbuffer.c.orig	2013-11-11 16:33:41 UTC
++++ src/sound/pa_ringbuffer.c
+@@ -72,12 +72,13 @@
+  ****************/
+ 
+ #if defined(__APPLE__) || defined(__FreeBSD__)
+-#   include <libkern/OSAtomic.h>
++#   include <sys/types.h>
++#   include <machine/atomic.h>
+ /* Here are the memory barrier functions. Mac OS X and FreeBSD only provide
+    full memory barriers, so the three types of barriers are the same. */
+-#   define PaUtil_FullMemoryBarrier()  OSMemoryBarrier()
+-#   define PaUtil_ReadMemoryBarrier()  OSMemoryBarrier()
+-#   define PaUtil_WriteMemoryBarrier() OSMemoryBarrier()
++#   define PaUtil_FullMemoryBarrier()  mb()
++#   define PaUtil_ReadMemoryBarrier()  rmb()
++#   define PaUtil_WriteMemoryBarrier() wmb()
+ #elif defined(__GNUC__)
+ /* GCC understands volatile asm and "memory" to mean it
+  * should not reorder memory read/writes */

Modified: head/audio/dream/pkg-descr
==============================================================================
--- head/audio/dream/pkg-descr	Tue Jan  6 18:48:25 2009	(r225340)
+++ head/audio/dream/pkg-descr	Wed Feb 17 23:06:37 2016	(r409075)
@@ -1,5 +1,4 @@
-Dream is a software implementation of a Digital Radio Mondiale (DRM) receiver.
-All you need to receive DRM transmissions is a PC with a sound card and a
-modified analog short-wave (MW, LW) receiver.
+Open-Source Software Implementation of a DRM (Digital Radio Mondiale) Receiver
+under the GNU General Public License (GPL)
 
-WWW: http://drm.sourceforge.net/
+WWW: http://drm.sourceforge.net/wiki/index.php/Main_Page



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602172306.u1HN6bYs002693>