[Midnightbsd-cvs] mports [16105] update alsa plugins list to 1.0.27

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Mar 23 14:43:41 EDT 2014 

Revision: 16105
          http://svnweb.midnightbsd.org/mports/?rev=16105
Author:   laffer1
Date:     2014-03-23 14:43:41 -0400 (Sun, 23 Mar 2014)
Log Message:
-----------
update alsa plugins list to 1.0.27

Modified Paths:
--------------
    trunk/audio/alsa-plugins/Makefile
    trunk/audio/alsa-plugins/distinfo
    trunk/audio/alsa-plugins/files/alsa-plugins.patch
    trunk/audio/alsa-plugins/files/patch-oss-ctl_oss.c
    trunk/audio/alsa-plugins/pkg-plist

Added Paths:
-----------
    trunk/audio/alsa-plugins/files/patch-ffmpeg-version

Property Changed:
----------------
    trunk/audio/alsa-plugins/files/alsa-plugins.patch
    trunk/audio/alsa-plugins/files/patch-arcam-av-arcam_av.c
    trunk/audio/alsa-plugins/files/patch-configure
    trunk/audio/alsa-plugins/files/patch-jack-pcm_jack.c
    trunk/audio/alsa-plugins/files/patch-oss-ctl_oss.c
    trunk/audio/alsa-plugins/files/patch-oss-pcm_oss.c
    trunk/audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c

Modified: trunk/audio/alsa-plugins/Makefile
===================================================================
--- trunk/audio/alsa-plugins/Makefile	2014-03-23 17:38:10 UTC (rev 16104)
+++ trunk/audio/alsa-plugins/Makefile	2014-03-23 18:43:41 UTC (rev 16105)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	alsa-plugins
-PORTVERSION=	1.0.26
+PORTVERSION=	1.0.27
 CATEGORIES=	audio
 MASTER_SITES=	ALSA/plugins \
 		GENTOO/distfiles
@@ -8,6 +8,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	ALSA compatibility library plugins
+
 LICENSE=	gpl2
 
 LIB_DEPENDS=	asound:${PORTSDIR}/audio/alsa-lib
@@ -14,19 +15,40 @@
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig
+USES=		pkgconfig
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_LDCONFIG=	${PREFIX}/lib/alsa-lib
+EXTRA_PATCHES+=	${FILESDIR}/alsa-plugins.patch
 
-OPTIONS_DEFINE=	ARIFF_OSS JACK FFMPEG PULSEAUDIO SAMPLERATE SPEEX
-ARIFF_OSS_DESC=	BSD-specific OSS plugin
+OPTIONS_DEFAULT=BUFSZ_P2 IO_PTR
+OPTIONS_DEFINE=	JACK FFMPEG PULSEAUDIO SAMPLERATE SPEEX
+OPTIONS_SUB=	${OPTIONS_DEFINE}
 
+OPTIONS_GROUP=	OSS
+OPTIONS_GROUP_OSS=IO_PTR BLKCNT_P2 BUFSZ_P2 VERBOSE
+
+IO_PTR_DESC=	Precise playback/recording pointer
+BLKCNT_P2_DESC=	Restrict number of fragments to ^2 aligned
+BUFSZ_P2_DESC=	Restrict buffer size to ^2 aligned (breaks aplay)
+VERBOSE_DESC=	Print debugging messages
+
 .include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MARIFF_OSS} || ${OSVERSION} < 4000
-EXTRA_PATCHES+=	${FILESDIR}/alsa-plugins.patch
+.if ${PORT_OPTIONS:MIO_PTR}
+CFLAGS+=	-DFREEBSD_OSS_USE_IO_PTR
 .endif
 
+.if ${PORT_OPTIONS:MBLKCNT_P2}
+CFLAGS+=	-DFREEBSD_OSS_BLKCNT_P2
+.endif
+
+.if ${PORT_OPTIONS:MBUFSZ_P2}
+CFLAGS+=	-DFREEBSD_OSS_BUFSZ_P2
+.endif
+
+.if ${PORT_OPTIONS:MVERBOSE}
+CFLAGS+=	-DFREEBSD_OSS_DEBUG_VERBOSE
+.endif
+
 .if ${PORT_OPTIONS:MJACK}
 .if empty(PORT_OPTIONS:MSAMPLERATE)
 IGNORE=			JACK audio support requires SAMPLERATE

Modified: trunk/audio/alsa-plugins/distinfo
===================================================================
--- trunk/audio/alsa-plugins/distinfo	2014-03-23 17:38:10 UTC (rev 16104)
+++ trunk/audio/alsa-plugins/distinfo	2014-03-23 18:43:41 UTC (rev 16105)
@@ -1,2 +1,2 @@
-SHA256 (alsa-plugins-1.0.26.tar.bz2) = 03515134d2009db4dfb2769e0ab0e1fb517c8140ffdfd64a984be968e81c9f1f
-SIZE (alsa-plugins-1.0.26.tar.bz2) = 361017
+SHA256 (alsa-plugins-1.0.27.tar.bz2) = 0bbd0c37c2dd7baf16363afb2e58169ffb0f9c0a70031b3b6235594630f3ab35
+SIZE (alsa-plugins-1.0.27.tar.bz2) = 363593

Modified: trunk/audio/alsa-plugins/files/alsa-plugins.patch
===================================================================
--- trunk/audio/alsa-plugins/files/alsa-plugins.patch	2014-03-23 17:38:10 UTC (rev 16104)
+++ trunk/audio/alsa-plugins/files/alsa-plugins.patch	2014-03-23 18:43:41 UTC (rev 16105)
@@ -42,7 +42,7 @@
  	oss->ext.private_data = oss;
 --- oss/pcm_oss.c.orig	2009-08-31 21:09:41.000000000 +0800
 +++ oss/pcm_oss.c	2009-09-28 14:54:12.000000000 +0800
-@@ -22,17 +22,55 @@
+@@ -22,17 +22,48 @@
  #include <sys/ioctl.h>
  #include <alsa/asoundlib.h>
  #include <alsa/pcm_external.h>
@@ -54,18 +54,11 @@
 +#define ARRAY_SIZE(x)	(sizeof(x) / sizeof(*(x)))
 +
 +#ifdef __FreeBSD__
-+/* #define FREEBSD_OSS_USE_IO_PTR	1 */
-+/* #define FREEBSD_OSS_BLKCNT_P2	1 */
-+/* #define FREEBSD_OSS_DEBUG_VERBOSE	1 */
-+#undef FREEBSD_OSS_USE_IO_PTR	/* _IPTR is buggy ... Grr... */
-+#undef FREEBSD_OSS_BLKCNT_P2
-+#undef FREEBSD_OSS_DEBUG_VERBOSE
-+
 +#define FREEBSD_OSS_RATE_MIN	1
 +#define FREEBSD_OSS_RATE_MAX	384000
 +
 +#define FREEBSD_OSS_CHANNELS_MIN	1
-+#if __FreeBSD_version >= 800096
++#ifndef __DragonFly__
 +#define FREEBSD_OSS_CHANNELS_MAX	8
 +#else
 +#define FREEBSD_OSS_CHANNELS_MAX	2
@@ -73,7 +66,7 @@
 +
 +#define FREEBSD_OSS_BUFSZ_MAX	131072
 +#define FREEBSD_OSS_BLKCNT_MIN	2
-+#define FREEBSD_OSS_BLKSZ_MIN	16 /* (FREEBSD_OSS_CHANNEL_MAX * 4) */
++#define FREEBSD_OSS_BLKSZ_MIN	16 /* (FREEBSD_OSS_CHANNELS_MAX * 4) */
 +
 +#define FREEBSD_OSS_BUFSZ_MIN	(FREEBSD_OSS_BLKCNT_MIN * FREEBSD_OSS_BLKSZ_MIN)
 +#define FREEBSD_OSS_BLKCNT_MAX	(FREEBSD_OSS_BUFSZ_MAX / FREEBSD_OSS_BUFSZ_MIN)
@@ -461,7 +454,7 @@
  
  	if ((flags = fcntl(oss->fd, F_GETFL)) < 0) {
  		err = -errno;
-@@ -229,10 +530,128 @@
+@@ -229,10 +530,146 @@
  	return 0;
  }
  
@@ -478,6 +471,9 @@
 +#ifdef FREEBSD_OSS_BLKCNT_P2
 +	unsigned int period_list[30];
 +#endif
++#ifdef FREEBSD_OSS_BUFSZ_P2
++	unsigned int bufsz_list[30];
++#endif
 +	unsigned int nformats;
 +	unsigned int format[ARRAY_SIZE(oss_formats_tab)];
 +#if 0
@@ -580,6 +576,21 @@
 +	if (err < 0)
 +		return err;
 +
++#ifdef FREEBSD_OSS_BUFSZ_P2
++	tmp = 0;
++	for (i = 1; i < 31 && tmp < ARRAY_SIZE(bufsz_list); i++) {
++		if ((1 << i) > FREEBSD_OSS_BUFSZ_MAX)
++			break;
++		if ((1 << i) < FREEBSD_OSS_BUFSZ_MIN)
++			continue;
++		bufsz_list[tmp++] = 1 << i;
++	}
++
++	if (tmp > 0)
++		err = snd_pcm_ioplug_set_param_list(io,
++		    SND_PCM_IOPLUG_HW_BUFFER_BYTES, tmp, bufsz_list);
++	else
++#endif
 +	/* buffer size , not strictly ^2 */
 +	err = snd_pcm_ioplug_set_param_minmax(io,
 +	    SND_PCM_IOPLUG_HW_BUFFER_BYTES, FREEBSD_OSS_BUFSZ_MIN,


Property changes on: trunk/audio/alsa-plugins/files/alsa-plugins.patch
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/audio/alsa-plugins/files/patch-arcam-av-arcam_av.c
===================================================================
--- trunk/audio/alsa-plugins/files/patch-arcam-av-arcam_av.c	2014-03-23 17:38:10 UTC (rev 16104)
+++ trunk/audio/alsa-plugins/files/patch-arcam-av-arcam_av.c	2014-03-23 18:43:41 UTC (rev 16105)

Property changes on: trunk/audio/alsa-plugins/files/patch-arcam-av-arcam_av.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/audio/alsa-plugins/files/patch-configure
===================================================================
--- trunk/audio/alsa-plugins/files/patch-configure	2014-03-23 17:38:10 UTC (rev 16104)
+++ trunk/audio/alsa-plugins/files/patch-configure	2014-03-23 18:43:41 UTC (rev 16105)

Property changes on: trunk/audio/alsa-plugins/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Added: trunk/audio/alsa-plugins/files/patch-ffmpeg-version
===================================================================
--- trunk/audio/alsa-plugins/files/patch-ffmpeg-version	                        (rev 0)
+++ trunk/audio/alsa-plugins/files/patch-ffmpeg-version	2014-03-23 18:43:41 UTC (rev 16105)
@@ -0,0 +1,13 @@
+Index: a52/pcm_a52.c
+===================================================================
+--- a52/pcm_a52.c
++++ a52/pcm_a52.c
+@@ -27,7 +27,7 @@
+ #include <alsa/pcm_plugin.h>
+ #include AVCODEC_HEADER
+ 
+-#if LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MINOR >= 34
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,34,0)
+ #include <libavutil/audioconvert.h>
+ #include <libavutil/mem.h>
+ #define USE_AVCODEC_FRAME

Index: trunk/audio/alsa-plugins/files/patch-jack-pcm_jack.c
===================================================================
--- trunk/audio/alsa-plugins/files/patch-jack-pcm_jack.c	2014-03-23 17:38:10 UTC (rev 16104)
+++ trunk/audio/alsa-plugins/files/patch-jack-pcm_jack.c	2014-03-23 18:43:41 UTC (rev 16105)

Property changes on: trunk/audio/alsa-plugins/files/patch-jack-pcm_jack.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/audio/alsa-plugins/files/patch-oss-ctl_oss.c
===================================================================
--- trunk/audio/alsa-plugins/files/patch-oss-ctl_oss.c	2014-03-23 17:38:10 UTC (rev 16104)
+++ trunk/audio/alsa-plugins/files/patch-oss-ctl_oss.c	2014-03-23 18:43:41 UTC (rev 16105)
@@ -12,3 +12,12 @@
  
  typedef struct snd_ctl_oss {
  	snd_ctl_ext_t ext;
+@@ -52,7 +56,7 @@ static const char *const vol_devices[SOU
+ 	[SOUND_MIXER_CD] =	"CD Playback Volume",
+ 	[SOUND_MIXER_IMIX] =	"Monitor Mix Playback Volume",
+ 	[SOUND_MIXER_ALTPCM] =	"Headphone Playback Volume",
+-	[SOUND_MIXER_RECLEV] =	"Capture Volume",
++	[SOUND_MIXER_RECLEV] =	"Master Capture Volume",
+ 	[SOUND_MIXER_IGAIN] =	"Capture Volume",
+ 	[SOUND_MIXER_OGAIN] =	"Playback Volume",
+ 	[SOUND_MIXER_LINE1] =	"Aux Playback Volume",


Property changes on: trunk/audio/alsa-plugins/files/patch-oss-ctl_oss.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/audio/alsa-plugins/files/patch-oss-pcm_oss.c
===================================================================
--- trunk/audio/alsa-plugins/files/patch-oss-pcm_oss.c	2014-03-23 17:38:10 UTC (rev 16104)
+++ trunk/audio/alsa-plugins/files/patch-oss-pcm_oss.c	2014-03-23 18:43:41 UTC (rev 16105)

Property changes on: trunk/audio/alsa-plugins/files/patch-oss-pcm_oss.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c
===================================================================
--- trunk/audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c	2014-03-23 17:38:10 UTC (rev 16104)
+++ trunk/audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c	2014-03-23 18:43:41 UTC (rev 16105)

Property changes on: trunk/audio/alsa-plugins/files/patch-usb_stream-pcm_usb_stream.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/audio/alsa-plugins/pkg-plist
===================================================================
--- trunk/audio/alsa-plugins/pkg-plist	2014-03-23 17:38:10 UTC (rev 16104)
+++ trunk/audio/alsa-plugins/pkg-plist	2014-03-23 18:43:41 UTC (rev 16105)
@@ -1,19 +1,19 @@
-%%PULSE%%lib/alsa-lib/libasound_module_conf_pulse.la
-%%PULSE%%lib/alsa-lib/libasound_module_conf_pulse.so
+%%PULSEAUDIO%%lib/alsa-lib/libasound_module_conf_pulse.la
+%%PULSEAUDIO%%lib/alsa-lib/libasound_module_conf_pulse.so
 lib/alsa-lib/libasound_module_ctl_arcam_av.la
 lib/alsa-lib/libasound_module_ctl_arcam_av.so
 lib/alsa-lib/libasound_module_ctl_oss.la
 lib/alsa-lib/libasound_module_ctl_oss.so
-%%PULSE%%lib/alsa-lib/libasound_module_ctl_pulse.la
-%%PULSE%%lib/alsa-lib/libasound_module_ctl_pulse.so
-%%LAVC%%lib/alsa-lib/libasound_module_pcm_a52.la
-%%LAVC%%lib/alsa-lib/libasound_module_pcm_a52.so
+%%PULSEAUDIO%%lib/alsa-lib/libasound_module_ctl_pulse.la
+%%PULSEAUDIO%%lib/alsa-lib/libasound_module_ctl_pulse.so
+%%FFMPEG%%lib/alsa-lib/libasound_module_pcm_a52.la
+%%FFMPEG%%lib/alsa-lib/libasound_module_pcm_a52.so
 %%JACK%%lib/alsa-lib/libasound_module_pcm_jack.la
 %%JACK%%lib/alsa-lib/libasound_module_pcm_jack.so
 lib/alsa-lib/libasound_module_pcm_oss.la
 lib/alsa-lib/libasound_module_pcm_oss.so
-%%PULSE%%lib/alsa-lib/libasound_module_pcm_pulse.la
-%%PULSE%%lib/alsa-lib/libasound_module_pcm_pulse.so
+%%PULSEAUDIO%%lib/alsa-lib/libasound_module_pcm_pulse.la
+%%PULSEAUDIO%%lib/alsa-lib/libasound_module_pcm_pulse.so
 %%SPEEX%%lib/alsa-lib/libasound_module_pcm_speex.la
 %%SPEEX%%lib/alsa-lib/libasound_module_pcm_speex.so
 lib/alsa-lib/libasound_module_pcm_upmix.la
@@ -22,12 +22,12 @@
 lib/alsa-lib/libasound_module_pcm_usb_stream.so
 lib/alsa-lib/libasound_module_pcm_vdownmix.la
 lib/alsa-lib/libasound_module_pcm_vdownmix.so
-%%LAVC%%lib/alsa-lib/libasound_module_rate_lavcrate.la
-%%LAVC%%lib/alsa-lib/libasound_module_rate_lavcrate.so
-%%LAVC%%lib/alsa-lib/libasound_module_rate_lavcrate_fast.so
-%%LAVC%%lib/alsa-lib/libasound_module_rate_lavcrate_faster.so
-%%LAVC%%lib/alsa-lib/libasound_module_rate_lavcrate_high.so
-%%LAVC%%lib/alsa-lib/libasound_module_rate_lavcrate_higher.so
+%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavcrate.la
+%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavcrate.so
+%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavcrate_fast.so
+%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavcrate_faster.so
+%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavcrate_high.so
+%%FFMPEG%%lib/alsa-lib/libasound_module_rate_lavcrate_higher.so
 %%SAMPLERATE%%lib/alsa-lib/libasound_module_rate_samplerate.la
 %%SAMPLERATE%%lib/alsa-lib/libasound_module_rate_samplerate.so
 %%SAMPLERATE%%lib/alsa-lib/libasound_module_rate_samplerate_best.so
@@ -38,5 +38,5 @@
 %%SPEEX%%lib/alsa-lib/libasound_module_rate_speexrate.so
 %%SPEEX%%lib/alsa-lib/libasound_module_rate_speexrate_best.so
 %%SPEEX%%lib/alsa-lib/libasound_module_rate_speexrate_medium.so
-%%PULSE%%share/alsa/alsa.conf.d/50-pulseaudio.conf
-%%PULSE%%share/alsa/alsa.conf.d/99-pulseaudio-default.conf.example
+%%PULSEAUDIO%%share/alsa/alsa.conf.d/50-pulseaudio.conf
+%%PULSEAUDIO%%share/alsa/alsa.conf.d/99-pulseaudio-default.conf.example

More information about the Midnightbsd-cvs mailing list