Merge remote-tracking branch 'origin/branches/2017Q3' into devel

audio/dssi/Makefile

@@ -3,14 +3,15 @@
 
 PORTNAME=	dssi
 PORTVERSION=	1.1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
 MAINTAINER=	[email protected]
 COMMENT=	API for audio processing plugins
 
 LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat \
@@ -20,34 +21,24 @@ LIB_DEPENDS=	libdssialsacompat.so:audio/libdssialsacompat \
 		libjack.so:audio/jack
 RUN_DEPENDS=	${LOCALBASE}/include/ladspa.h:audio/ladspa
 
-USES=		gmake pathfix pkgconfig libtool
+USES=		gmake pathfix pkgconfig localbase libtool
 GNU_CONFIGURE=	yes
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+USE_XORG=	x11
 
 PORTDOCS=	ChangeLog README
 
 PORTEXAMPLES=	*
-
-EXAMPLESSRCDIR=		${WRKSRC}/examples
-
-EXAMPLES_FILES1=	dssi_analyse_plugin dssi_list_plugins \
-			dssi_osc_send dssi_osc_update
-
-EXAMPLES_FILES2=	LTS_qt trivial_sampler_qt
+EXAMPLESSRCDIR=	${WRKSRC}/examples
+EXAMPLES_FILES1=dssi_analyse_plugin dssi_list_plugins \
+		dssi_osc_send dssi_osc_update
+EXAMPLES_FILES2=LTS_qt trivial_sampler_qt
 
 OPTIONS_DEFINE=	DOCS EXAMPLES QT4
-OPTIONS_DEFAULT=	QT4
-
+OPTIONS_DEFAULT=QT4
 OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MQT4}
-USE_QT4=	corelib gui moc_build
+QT4_USE=	QT4=corelib,gui,moc_build
 QT_NONSTANDARD=	yes
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -59,26 +50,22 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		'/alsa >=/s|$$PKG_CONFIG|${FALSE}|' ${WRKSRC}/configure
 
-.if ! ${PORT_OPTIONS:MQT4}
+post-patch-QT4-off:
 	@${REINPLACE_CMD} -e \
 		'/QtCore >=/s|$$PKG_CONFIG|${FALSE}|' ${WRKSRC}/configure
-.endif
 
 post-install:
 .for l in trivial_synth less_trivial_synth trivial_sampler karplong
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/dssi/${l}.so
 .endfor
-
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_PROGRAM} ${EXAMPLES_FILES1:S|^|${EXAMPLESSRCDIR}/|} \
 		${STAGEDIR}${EXAMPLESDIR}
 
-.if ${PORT_OPTIONS:MQT4}
+post-install-QT4-on:
 	${INSTALL_PROGRAM} ${EXAMPLES_FILES2:S|^|${EXAMPLESSRCDIR}/|} \
 		${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>

audio/jack/Makefile

@@ -3,10 +3,8 @@
 
 PORTNAME=	jackit
 PORTVERSION=	0.125.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
-MASTER_SITES=	http://jackaudio.org/downloads/
-DISTNAME=	jack-audio-connection-kit-${PORTVERSION}
 
 MAINTAINER=	[email protected]
 COMMENT=	Low latency audio server
@@ -19,22 +17,36 @@ LIB_DEPENDS=	libsndfile.so:audio/libsndfile \
 		libcelt0.so:audio/celt \
 		libuuid.so:misc/e2fsprogs-libuuid
 
-GNU_CONFIGURE=	yes
+USES=		autoreconf gmake pathfix pkgconfig libtool localbase bdb
+USE_GITHUB=	yes
+GH_ACCOUNT=	jackaudio
+GH_PROJECT=	jack1
+GH_TAGNAME=	90f9dd3
+GH_TUPLE=	jackaudio:headers:07f1ecf:h/jack
+GH_TUPLE+=	jackaudio:tools:8d13c31:t/tools
+GH_TUPLE+=	jackaudio:example-clients:7fa0890:e/example-clients
 USE_LDCONFIG=	yes
-USES=		gmake pathfix pkgconfig libtool localbase bdb
+GNU_CONFIGURE=	yes
 USE_RC_SUBR=	jackd
 
 CONFIGURE_ARGS=	--disable-portaudio \
+		--enable-optimize \
 		--enable-force-install \
 		--with-default-tmpdir=/tmp
 
-CFLAGS+=	-I${BDB_INCLUDE_DIR}
-LIBS+=	-L${BDB_LIB_DIR}
-INSTALL_TARGET=	install-strip
+CFLAGS+=		-I${BDB_INCLUDE_DIR}
+LIBS+=			-L${BDB_LIB_DIR}
+INSTALL_TARGET=		install-strip
 
-OPTIONS_DEFINE=	ALSA DOXYGEN READLINE SNDIO
-OPTIONS_DEFAULT=READLINE
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		ALSA DOXYGEN READLINE SNDIO COOKEDMODE
+OPTIONS_DEFINE_i386=	DYNSIMD
+OPTIONS_DEFINE_amd64=	DYNSIMD
+OPTIONS_DEFAULT=	READLINE COOKEDMODE
+OPTIONS_DEFAULT_i386=	DYNSIMD
+OPTIONS_DEFAULT_amd64=	DYNSIMD
+OPTIONS_SUB=		yes
+COOKEDMODE_DESC=	Use OSS COOKEDMODE (OSS driver is broken without it)
+DYNSIMD_DESC=		Use dynamic SIMD selection (only i386/amd64)
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
@@ -50,21 +62,11 @@ READLINE_CONFIGURE_ENV_OFF=	ac_cv_lib_readline_readline=no \
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ENABLE=	sndio
 
+COOKEDMODE_CFLAGS=	-DOPTION_COOKEDMODE
+
+DYNSIMD_CONFIGURE_ENABLE=dynsimd
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|define USE_MLOCK|undef USE_MLOCK|' \
-		-e 's|alloca.h||' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e "s,-lpthread,-pthread," \
-		${WRKSRC}/configure ${WRKSRC}/libjack/Makefile.in \
-		${WRKSRC}/jackd/Makefile.in \
-		${WRKSRC}/example-clients/Makefile.in ${WRKSRC}/jack.pc.in
-	@${REINPLACE_CMD} -e "s,-lrt,," ${WRKSRC}/libjack/Makefile.in \
-		${WRKSRC}/jackd/Makefile.in \
-		${WRKSRC}/example-clients/Makefile.in
-	@${REINPLACE_CMD} -e "s,-ldl,," ${WRKSRC}/jackd/Makefile.in \
-		${WRKSRC}/example-clients/Makefile.in
-	@${REINPLACE_CMD} -e 's|md5sum|md5 -q|g' \
-		${WRKSRC}/jackd/Makefile.in
 	@${RM} ${WRKSRC}/doc/reference/html/*
 
 post-build:

audio/jack/distinfo

@@ -1,3 +1,9 @@
-TIMESTAMP = 1491234945
-SHA256 (jack-audio-connection-kit-0.125.0.tar.gz) = 3517b5bff82139a76b2b66fe2fd9a3b34b6e594c184f95a988524c575b11d444
-SIZE (jack-audio-connection-kit-0.125.0.tar.gz) = 1217977
+TIMESTAMP = 1500250305
+SHA256 (jackaudio-jack1-0.125.0-90f9dd3_GH0.tar.gz) = e0ba7dcf58fa934af51329cd329f466fe8d2bc180d07e4ab8be21ed80c60aa8a
+SIZE (jackaudio-jack1-0.125.0-90f9dd3_GH0.tar.gz) = 392822
+SHA256 (jackaudio-headers-07f1ecf_GH0.tar.gz) = 04a3bb87d278923985ba44045b7a27439c90776cc5d4a6016d062fc7a6aa5023
+SIZE (jackaudio-headers-07f1ecf_GH0.tar.gz) = 36704
+SHA256 (jackaudio-tools-8d13c31_GH0.tar.gz) = 23e6bc60c8cef4283677206f2687a408367203a725c091c923f48554ae6e8cc8
+SIZE (jackaudio-tools-8d13c31_GH0.tar.gz) = 45544
+SHA256 (jackaudio-example-clients-7fa0890_GH0.tar.gz) = 79e2ac1d38d7d77b1afb71aa97414c339e8c00613a5d9b725861232b5c995223
+SIZE (jackaudio-example-clients-7fa0890_GH0.tar.gz) = 16174

audio/jack/files/jackd.in

@@ -27,8 +27,10 @@ start_jackd() {
   if [ $jackd_rtprio = "YES" ]; then
     local rt="rtprio 1"
   fi
+  # log the date and parameters
+  echo -e "\n[`date`] Starting the daemon, user=$jackd_user rtprio=$jackd_rtprio args=\"$jackd_args\"" >> /var/log/${name}.log
   # daemon(8) should be able to set the realtime priority, but it isn't
-  $rt daemon -p /var/run/${name}.pid -u ${jackd_user} %%PREFIX%%/bin/jackd ${jackd_args} >/var/log/${name}.log 2>&1
+  $rt daemon -p /var/run/${name}.pid -o /var/log/${name}.log -u "${jackd_user}" %%PREFIX%%/bin/jackd ${jackd_args}
 }
 
 load_rc_config ${name}

audio/jack/files/patch-configure.ac

@@ -0,0 +1,10 @@
+--- configure.ac.orig	2017-01-10 10:20:51 UTC
++++ configure.ac
+@@ -172,6 +172,7 @@ case "${host_os}" in
+     # barrier code, this may be fixed in 5.3, stay tuned.
+     USE_BARRIER="no"
+     USE_MD5SUM=0
++    JACK_DO_NOT_MLOCK=0
+     ;;
+   openbsd*)
+     # pthread_barrier* not implemented

audio/jack/files/patch-drivers_oss_oss__driver.c

@@ -1,4 +1,4 @@
---- drivers/oss/oss_driver.c.orig	2016-02-23 15:13:53 UTC
+--- drivers/oss/oss_driver.c.orig	2017-01-10 10:20:51 UTC
 +++ drivers/oss/oss_driver.c
 @@ -23,6 +23,7 @@
 
@@ -83,7 +83,20 @@
  			dstidx += chcount;
  		}
  		break;
-@@ -441,19 +454,7 @@ static int oss_driver_start (oss_driver_
+@@ -429,7 +442,11 @@ static int oss_driver_detach (oss_driver
+ 
+ static int oss_driver_start (oss_driver_t *driver)
+ {
+-	int flags = 0;
++#if defined(OPTION_COOKEDMODE)
++	int cookedmode = 1;
++#else
++	int cookedmode = 0;
++#endif
+ 	int format;
+ 	int channels;
+ 	int samplerate;
+@@ -441,19 +458,7 @@ static int oss_driver_start (oss_driver_
  	const char *indev = driver->indev;
  	const char *outdev = driver->outdev;
  
@@ -104,7 +117,52 @@
  	driver->trigger = 0;
  	if (strcmp (indev, outdev) != 0) {
  		if (driver->capture_channels > 0) {
-@@ -705,7 +706,9 @@ static int oss_driver_start (oss_driver_
+@@ -464,7 +469,7 @@ static int oss_driver_start (oss_driver_
+ 					indev, __FILE__, __LINE__, errno);
+ 			}
+ #ifndef OSS_NO_COOKED_MODE
+-			ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags);
++			ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
+ #endif
+ 			fragsize = driver->period_size *
+ 				   driver->capture_channels * samplesize;
+@@ -479,7 +484,7 @@ static int oss_driver_start (oss_driver_
+ 					outdev, __FILE__, __LINE__, errno);
+ 			}
+ #ifndef OSS_NO_COOKED_MODE
+-			ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &flags);
++			ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
+ #endif
+ 			fragsize = driver->period_size *
+ 				   driver->playback_channels * samplesize;
+@@ -497,7 +502,7 @@ static int oss_driver_start (oss_driver_
+ 				return -1;
+ 			}
+ #ifndef OSS_NO_COOKED_MODE
+-			ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags);
++			ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
+ #endif
+ 		} else if (driver->capture_channels == 0 &&
+ 			   driver->playback_channels != 0) {
+@@ -510,7 +515,7 @@ static int oss_driver_start (oss_driver_
+ 				return -1;
+ 			}
+ #ifndef OSS_NO_COOKED_MODE
+-			ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &flags);
++			ioctl (outfd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
+ #endif
+ 		} else {
+ 			infd = outfd = open (indev, O_RDWR | O_EXCL);
+@@ -521,7 +526,7 @@ static int oss_driver_start (oss_driver_
+ 				return -1;
+ 			}
+ #ifndef OSS_NO_COOKED_MODE
+-			ioctl (infd, SNDCTL_DSP_COOKEDMODE, &flags);
++			ioctl (infd, SNDCTL_DSP_COOKEDMODE, &cookedmode);
+ #endif
+ 		}
+ 		if (infd >= 0 && outfd >= 0) {
+@@ -705,7 +710,9 @@ static int oss_driver_start (oss_driver_
  		sem_post (&driver->sem_start);
  	}
  
@@ -115,7 +173,7 @@
  	driver->next_periodtime = 0;
  	driver->iodelay = 0.0F;
  
-@@ -1143,6 +1146,23 @@ jack_driver_t * driver_initialize (jack_
+@@ -1143,6 +1150,23 @@ jack_driver_t * driver_initialize (jack_
  		pnode = jack_slist_next (pnode);
  	}
  
@@ -139,7 +197,7 @@
  	driver->sample_rate = sample_rate;
  	driver->period_size = period_size;
  	driver->nperiods = nperiods;
-@@ -1163,58 +1183,6 @@ jack_driver_t * driver_initialize (jack_
+@@ -1163,58 +1187,6 @@ jack_driver_t * driver_initialize (jack_
  	}
  	driver->infd = -1;
  	driver->outfd = -1;

audio/jack/files/patch-jackd_jackd.c

@@ -0,0 +1,22 @@
+--- jackd/jackd.c.orig	2017-07-17 17:10:09 UTC
++++ jackd/jackd.c
+@@ -521,11 +521,17 @@ jack_drivers_load ()
+
+ static void copyright (FILE* file)
+ {
+-	fprintf (file, "jackd " VERSION "\n"
++	fprintf (file, "jackd " VERSION " (COOKEDMODE=%s)\n"
+ 		 "Copyright 2001-2009 Paul Davis, Stephane Letz, Jack O'Quinn, Torben Hohn and others.\n"
+ 		 "jackd comes with ABSOLUTELY NO WARRANTY\n"
+ 		 "This is free software, and you are welcome to redistribute it\n"
+-		 "under certain conditions; see the file COPYING for details\n\n");
++		 "under certain conditions; see the file COPYING for details\n\n",
++#if defined(OPTION_COOKEDMODE)
++                 "on"
++#else
++                 "off"
++#endif
++                 );
+ }
+
+ static void usage (FILE *file)