[Midnightbsd-cvs] mports [21761] trunk/audio/alsa-lib: alsa-lib 1.1.2

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Aug 20 11:57:04 EDT 2016 

Revision: 21761
          http://svnweb.midnightbsd.org/mports/?rev=21761
Author:   laffer1
Date:     2016-08-20 11:57:03 -0400 (Sat, 20 Aug 2016)
Log Message:
-----------
alsa-lib 1.1.2

Modified Paths:
--------------
    trunk/audio/alsa-lib/Makefile
    trunk/audio/alsa-lib/distinfo
    trunk/audio/alsa-lib/files/asound.conf.sample
    trunk/audio/alsa-lib/files/linux/types.h
    trunk/audio/alsa-lib/pkg-plist

Added Paths:
-----------
    trunk/audio/alsa-lib/files/patch-include_pcm.h

Removed Paths:
-------------
    trunk/audio/alsa-lib/files/patch-include__pcm.h
    trunk/audio/alsa-lib/files/patch-src__async.c
    trunk/audio/alsa-lib/files/patch-src__pcm__pcm_direct.c
    trunk/audio/alsa-lib/files/patch-src__timer__timer_hw.c

Modified: trunk/audio/alsa-lib/Makefile
===================================================================
--- trunk/audio/alsa-lib/Makefile	2016-08-20 15:49:17 UTC (rev 21760)
+++ trunk/audio/alsa-lib/Makefile	2016-08-20 15:57:03 UTC (rev 21761)
@@ -1,10 +1,10 @@
 # $MidnightBSD$
 
 PORTNAME=	alsa-lib
-PORTVERSION=	1.0.29
+PORTVERSION=	1.1.2
 CATEGORIES=	audio
-MASTER_SITES=	ALSA/lib \
-		GENTOO/distfiles
+MASTER_SITES=	ftp://ftp.alsa-project.org/pub/lib/ \
+		GENTOO
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	ALSA compatibility library
@@ -11,11 +11,15 @@
 
 LICENSE=	lgpl2.1
 
-USES=		libtool:keepla tar:bzip2
+USES=		cpe libtool:keepla tar:bzip2
 USE_LDCONFIG=	yes
+CPE_VENDOR=	alsa
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	ac_cv_header_endian_h=no
 CONFIGURE_ARGS=	--with-pkgconfdir="\$${prefix}/libdata/pkgconfig"
 INSTALL_TARGET=	install-strip
+TEST_ENV=	${MAKE_ENV} ALSA_CONFIG_PATH="${FILESDIR}/asound.conf.sample"
+TEST_TARGET=	check
 CPPFLAGS+=	-I${FILESDIR}
 
 OPTIONS_DEFINE=	PYTHON
@@ -28,7 +32,7 @@
 	${REINPLACE_CMD} -e '/LIBS/ { s/-ldl//g; s/-lrt//g; }' \
 		-e 's/python-config/${PYTHON_CMD:T}-config/g' \
 		-e '/pythonlibs/s/--libs/--ldflags/' \
-		-e '/-D_GNU_SOURCE/d' \
+		-e '/_GNU_SOURCE/d' \
 		-e '/lt_cv_dlopen/s/-ldl//g' ${WRKSRC}/configure
 	${REINPLACE_CMD} '/LIBADD/s/-ldl//g' \
 		${WRKSRC}/modules/mixer/simple/Makefile.in

Modified: trunk/audio/alsa-lib/distinfo
===================================================================
--- trunk/audio/alsa-lib/distinfo	2016-08-20 15:49:17 UTC (rev 21760)
+++ trunk/audio/alsa-lib/distinfo	2016-08-20 15:57:03 UTC (rev 21761)
@@ -1,2 +1,2 @@
-SHA256 (alsa-lib-1.0.29.tar.bz2) = 73043c35eb9636be0f4af6a240235c213f12a25feb1f04aeeac8cb7e30fcbdd0
-SIZE (alsa-lib-1.0.29.tar.bz2) = 905417
+SHA256 (alsa-lib-1.1.2.tar.bz2) = d38dacd9892b06b8bff04923c380b38fb2e379ee5538935ff37e45b395d861d6
+SIZE (alsa-lib-1.1.2.tar.bz2) = 947423

Modified: trunk/audio/alsa-lib/files/asound.conf.sample
===================================================================
--- trunk/audio/alsa-lib/files/asound.conf.sample	2016-08-20 15:49:17 UTC (rev 21760)
+++ trunk/audio/alsa-lib/files/asound.conf.sample	2016-08-20 15:57:03 UTC (rev 21761)
@@ -1,25 +1,25 @@
 #
 # FreeBSD/OSS
 #
-pcm.!default {
-	type plug
-	slave.pcm.type oss
+pcm.oss {
+	type oss
+	hint.description "Open Sound System"
 }
 
-ctl.!default {
+ctl.oss {
 	type oss
 }
 
+pcm.!sysdefault pcm.plug:oss
+ctl.!sysdefault ctl.oss
+pcm.!default pcm.sysdefault
+ctl.!default ctl.sysdefault
+
 #
 # Pulseaudio
 #
-# pcm.!default {
-# 	type pulse
-# }
-# 
-# ctl.!default {
-# 	type pulse
-# }
+# pcm.!default pcm.pulse
+# ctl.!default ctl.pulse
 
 #
 # Remap all possible surround stuffs.

Modified: trunk/audio/alsa-lib/files/linux/types.h
===================================================================
--- trunk/audio/alsa-lib/files/linux/types.h	2016-08-20 15:49:17 UTC (rev 21760)
+++ trunk/audio/alsa-lib/files/linux/types.h	2016-08-20 15:57:03 UTC (rev 21761)
@@ -1,11 +1,15 @@
 #ifndef _LINUX_TYPES_H
 #define _LINUX_TYPES_H
 
+#include <sys/types.h>
+
 #define __bitwise
+#define __le16 __u16
+#define __le32 __u32
+#define __le64 __u64
 
-typedef int __kernel_pid_t;
+typedef pid_t __kernel_pid_t;
 typedef off_t __kernel_off_t;
 
-typedef uint32_t __u32;
 typedef uint64_t __u64;
 #endif /* _LINUX_TYPES_H */

Deleted: trunk/audio/alsa-lib/files/patch-include__pcm.h
===================================================================
--- trunk/audio/alsa-lib/files/patch-include__pcm.h	2016-08-20 15:49:17 UTC (rev 21760)
+++ trunk/audio/alsa-lib/files/patch-include__pcm.h	2016-08-20 15:57:03 UTC (rev 21761)
@@ -1,16 +0,0 @@
---- include/pcm.h~
-+++ include/pcm.h
-@@ -29,6 +29,13 @@
- #ifndef __ALSA_PCM_H
- #define __ALSA_PCM_H
- 
-+#ifndef ESTRPIPE
-+#define ESTRPIPE EPIPE
-+#endif
-+#ifndef EBADFD
-+#define EBADFD EBADF
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif

Copied: trunk/audio/alsa-lib/files/patch-include_pcm.h (from rev 21508, trunk/audio/alsa-lib/files/patch-include__pcm.h)
===================================================================
--- trunk/audio/alsa-lib/files/patch-include_pcm.h	                        (rev 0)
+++ trunk/audio/alsa-lib/files/patch-include_pcm.h	2016-08-20 15:57:03 UTC (rev 21761)
@@ -0,0 +1,16 @@
+--- include/pcm.h~
++++ include/pcm.h
+@@ -29,6 +29,13 @@
+ #ifndef __ALSA_PCM_H
+ #define __ALSA_PCM_H
+ 
++#ifndef ESTRPIPE
++#define ESTRPIPE EPIPE
++#endif
++#ifndef EBADFD
++#define EBADFD EBADF
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif

Deleted: trunk/audio/alsa-lib/files/patch-src__async.c
===================================================================
--- trunk/audio/alsa-lib/files/patch-src__async.c	2016-08-20 15:49:17 UTC (rev 21760)
+++ trunk/audio/alsa-lib/files/patch-src__async.c	2016-08-20 15:57:03 UTC (rev 21761)
@@ -1,28 +0,0 @@
-$NetBSD: patch-bk,v 1.1 2008/12/25 13:18:00 hasso Exp $
-
---- src/async.c~
-+++ src/async.c
-@@ -51,6 +51,15 @@ static LIST_HEAD(snd_async_handlers);
- 
- static void snd_async_handler(int signo ATTRIBUTE_UNUSED, siginfo_t *siginfo, void *context ATTRIBUTE_UNUSED)
- {
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
-+	/* XXX XXX XXX */
-+	struct list_head *i;
-+	list_for_each(i, &snd_async_handlers) {
-+		snd_async_handler_t *h = list_entry(i, snd_async_handler_t, glist);
-+		if (h->callback)
-+			h->callback(h);
-+	}
-+#else
- 	int fd;
- 	struct list_head *i;
- 	//assert(siginfo->si_code == SI_SIGIO);
-@@ -60,6 +69,7 @@ static void snd_async_handler(int signo 
- 		if (h->fd == fd && h->callback)
- 			h->callback(h);
- 	}
-+#endif
- }
- 
- /**

Deleted: trunk/audio/alsa-lib/files/patch-src__pcm__pcm_direct.c
===================================================================
--- trunk/audio/alsa-lib/files/patch-src__pcm__pcm_direct.c	2016-08-20 15:49:17 UTC (rev 21760)
+++ trunk/audio/alsa-lib/files/patch-src__pcm__pcm_direct.c	2016-08-20 15:57:03 UTC (rev 21761)
@@ -1,19 +0,0 @@
---- src/pcm/pcm_direct.c~
-+++ src/pcm/pcm_direct.c
-@@ -44,12 +44,16 @@
-  *
-  */
-  
-+#if defined(__NetBSD__)
-+typedef __semun semun;
-+#elif !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
- union semun {
- 	int              val;    /* Value for SETVAL */
- 	struct semid_ds *buf;    /* Buffer for IPC_STAT, IPC_SET */
- 	unsigned short  *array;  /* Array for GETALL, SETALL */
- 	struct seminfo  *__buf;  /* Buffer for IPC_INFO (Linux specific) */
- };
-+#endif
-  
- /*
-  * FIXME:

Deleted: trunk/audio/alsa-lib/files/patch-src__timer__timer_hw.c
===================================================================
--- trunk/audio/alsa-lib/files/patch-src__timer__timer_hw.c	2016-08-20 15:49:17 UTC (rev 21760)
+++ trunk/audio/alsa-lib/files/patch-src__timer__timer_hw.c	2016-08-20 15:57:03 UTC (rev 21761)
@@ -1,15 +0,0 @@
---- src/timer/timer_hw.c~
-+++ src/timer/timer_hw.c
-@@ -91,10 +91,12 @@ static int snd_timer_hw_async(snd_timer_
- 	}
- 	if (sig < 0)
- 		return 0;
-+#ifdef F_SETSIG
- 	if (fcntl(fd, F_SETSIG, (long)sig) < 0) {
- 		SYSERR("F_SETSIG failed");
- 		return -errno;
- 	}
-+#endif
- 	if (fcntl(fd, F_SETOWN, (long)pid) < 0) {
- 		SYSERR("F_SETOWN failed");
- 		return -errno;

Modified: trunk/audio/alsa-lib/pkg-plist
===================================================================
--- trunk/audio/alsa-lib/pkg-plist	2016-08-20 15:49:17 UTC (rev 21760)
+++ trunk/audio/alsa-lib/pkg-plist	2016-08-20 15:57:03 UTC (rev 21761)
@@ -8,7 +8,6 @@
 include/alsa/error.h
 include/alsa/global.h
 include/alsa/hwdep.h
-include/alsa/iatomic.h
 include/alsa/input.h
 include/alsa/mixer.h
 include/alsa/mixer_abst.h
@@ -25,6 +24,7 @@
 include/alsa/seq_event.h
 include/alsa/seq_midi_event.h
 include/alsa/seqmid.h
+include/alsa/sound/asoc.h
 include/alsa/sound/asound_fm.h
 include/alsa/sound/emu10k1.h
 include/alsa/sound/hdsp.h
@@ -31,8 +31,10 @@
 include/alsa/sound/hdspm.h
 include/alsa/sound/sb16_csp.h
 include/alsa/sound/sscape_ioctl.h
+include/alsa/sound/tlv.h
 include/alsa/sound/type_compat.h
 include/alsa/timer.h
+include/alsa/topology.h
 include/alsa/use-case.h
 include/alsa/version.h
 include/sys/asoundlib.h
@@ -130,6 +132,26 @@
 share/alsa/pcm/surround71.conf
 share/alsa/smixer.conf
 share/alsa/sndo-mixer.alisp
+share/alsa/topology/broadwell/broadwell.conf
+share/alsa/topology/sklrt286/codec0_in-cpr-1.bin
+share/alsa/topology/sklrt286/codec0_in-mi.bin
+share/alsa/topology/sklrt286/codec0_out-cpr-4.bin
+share/alsa/topology/sklrt286/codec0_out-mo.bin
+share/alsa/topology/sklrt286/codec1_out-cpr-5.bin
+share/alsa/topology/sklrt286/codec1_out-mo.bin
+share/alsa/topology/sklrt286/dmic01_hifi_in-cpr-3.bin
+share/alsa/topology/sklrt286/dmic01_hifi_in-mi.bin
+share/alsa/topology/sklrt286/hdmi1_pt_out-cpr-7.bin
+share/alsa/topology/sklrt286/hdmi1_pt_out-cpr-8.bin
+share/alsa/topology/sklrt286/hdmi2_pt_out-cpr-10.bin
+share/alsa/topology/sklrt286/hdmi2_pt_out-cpr-9.bin
+share/alsa/topology/sklrt286/hdmi3_pt_out-cpr-11.bin
+share/alsa/topology/sklrt286/hdmi3_pt_out-cpr-12.bin
+share/alsa/topology/sklrt286/media0_in-cpr-0.bin
+share/alsa/topology/sklrt286/media0_in-mi.bin
+share/alsa/topology/sklrt286/media0_out-cpr-6.bin
+share/alsa/topology/sklrt286/media0_out-mo.bin
+share/alsa/topology/sklrt286/skl_i2s.conf
 share/alsa/ucm/DAISY-I2S/DAISY-I2S.conf
 share/alsa/ucm/DAISY-I2S/HiFi.conf
 share/alsa/ucm/GoogleNyan/GoogleNyan.conf
@@ -158,5 +180,11 @@
 share/alsa/ucm/SDP4430/record
 share/alsa/ucm/SDP4430/voice
 share/alsa/ucm/SDP4430/voiceCall
+share/alsa/ucm/VEYRON-I2S/HiFi.conf
+share/alsa/ucm/VEYRON-I2S/VEYRON-I2S.conf
+share/alsa/ucm/broadwell-rt286/HiFi
+share/alsa/ucm/broadwell-rt286/broadwell-rt286.conf
+share/alsa/ucm/chtrt5645/HiFi.conf
+share/alsa/ucm/chtrt5645/chtrt5645.conf
 share/alsa/ucm/tegraalc5632/tegraalc5632.conf
 @sample etc/asound.conf.sample

More information about the Midnightbsd-cvs mailing list