MFH: r419665

audio/alsa-{lib,utils}: update to 1.1.2

Changes:	http://www.alsa-project.org/main/index.php/Changes_v1.1.1_v1.1.2
ABI:		http://abi-laboratory.pro/tracker/compat_report/alsa/1.1.1/1.1.2/6d65a/abi_compat_report.html
Approved by:	ports-secteam (feld)

7 files changed, 38 insertions, 11 deletions

diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index ab80e31..60ff396 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	alsa-lib
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/lib/ \
 		GENTOO
@@ -17,6 +16,7 @@ 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"
diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo
index 20ba1b9..ef2e685 100644
--- a/audio/alsa-lib/distinfo
+++ b/audio/alsa-lib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (alsa-lib-1.1.1.tar.bz2) = 8ac76c3144ed2ed49da7622ab65ac5415205913ccbedde877972383cbc234269
-SIZE (alsa-lib-1.1.1.tar.bz2) = 932105
+SHA256 (alsa-lib-1.1.2.tar.bz2) = d38dacd9892b06b8bff04923c380b38fb2e379ee5538935ff37e45b395d861d6
+SIZE (alsa-lib-1.1.2.tar.bz2) = 947423
diff --git a/audio/alsa-lib/files/endian.h b/audio/alsa-lib/files/endian.h
new file mode 100644
index 0000000..f85d33e
--- /dev/null
+++ b/audio/alsa-lib/files/endian.h
@@ -0,0 +1,4 @@
+#ifndef _ENDIAN_H
+#define	_ENDIAN_H
+#include <linux/types.h>
+#endif /* _ENDIAN_H */
diff --git a/audio/alsa-lib/files/linux/types.h b/audio/alsa-lib/files/linux/types.h
index e6167fc..b6de02a 100644
--- a/audio/alsa-lib/files/linux/types.h
+++ b/audio/alsa-lib/files/linux/types.h
@@ -11,7 +11,5 @@
 typedef pid_t __kernel_pid_t;
 typedef off_t __kernel_off_t;
 
-typedef uint16_t __u16;
-typedef uint32_t __u32;
 typedef uint64_t __u64;
 #endif /* _LINUX_TYPES_H */
diff --git a/audio/alsa-lib/pkg-plist b/audio/alsa-lib/pkg-plist
index bcc41e7..9d1cbcd 100644
--- a/audio/alsa-lib/pkg-plist
+++ b/audio/alsa-lib/pkg-plist
@@ -8,7 +8,6 @@ include/alsa/control_external.h
 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
@@ -134,6 +133,25 @@ 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
@@ -162,7 +180,11 @@ share/alsa/ucm/SDP4430/hifiLP
 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
diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile
index 313ec0c..b8ef018 100644
--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	alsa-utils
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/utils/ \
 		GENTOO
@@ -23,7 +23,7 @@ INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${.CURDIR}/../alsa-lib/files
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	BAT MANPAGES NLS
+OPTIONS_DEFINE=	BAT MANPAGES NLS SAMPLERATE
 OPTIONS_DEFAULT=BAT MANPAGES
 
 BAT_DESC=	Basic Audio Tester support
@@ -37,6 +37,9 @@ NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=nls
 NLS_LIBS=	-lintl
 
+SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate
+SAMPLERATE_CONFIGURE_ENV_OFF=ac_cv_header_samplerate_h=no
+
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/LIBS/s/-ldl//g; /LIBRT/s/-lrt//g;' \
 		${WRKSRC}/configure
diff --git a/audio/alsa-utils/distinfo b/audio/alsa-utils/distinfo
index fc2a45f..1ff95fc 100644
--- a/audio/alsa-utils/distinfo
+++ b/audio/alsa-utils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (alsa-utils-1.1.1.tar.bz2) = 89757c9abaf420831b088fce354d492acc170bd02bb50eb7392c175f594b8041
-SIZE (alsa-utils-1.1.1.tar.bz2) = 1186408
+SHA256 (alsa-utils-1.1.2.tar.bz2) = 7af603c0877d1251599d65b4fbc372e63a54371b888f5c26c6a86ac1d0519071
+SIZE (alsa-utils-1.1.2.tar.bz2) = 1193140