audio/alsa-*: update to 1.1.1

Changes:	http://www.alsa-project.org/main/index.php/Changes_v1.1.0_v1.1.1
ABI:		https://people.freebsd.org/~jbeich/compat_reports/alsa-lib/1.1.0_to_1.1.1/compat_report.html

10 files changed, 14 insertions, 52 deletions

diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index 3953d32d396f..f0e4768ec8eb 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	alsa-lib
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	audio
 MASTER_SITES=	ALSA/lib \
 		GENTOO
diff --git a/audio/alsa-lib/distinfo b/audio/alsa-lib/distinfo
index 9c08cc676bef..20ba1b9360a8 100644
--- a/audio/alsa-lib/distinfo
+++ b/audio/alsa-lib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (alsa-lib-1.1.0.tar.bz2) = dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15
-SIZE (alsa-lib-1.1.0.tar.bz2) = 929874
+SHA256 (alsa-lib-1.1.1.tar.bz2) = 8ac76c3144ed2ed49da7622ab65ac5415205913ccbedde877972383cbc234269
+SIZE (alsa-lib-1.1.1.tar.bz2) = 932105
diff --git a/audio/alsa-lib/files/patch-src__timer__timer_hw.c b/audio/alsa-lib/files/patch-src__timer__timer_hw.c
deleted file mode 100644
index 8f21d3cd4139..000000000000
--- a/audio/alsa-lib/files/patch-src__timer__timer_hw.c
+++ /dev/null
@@ -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;
diff --git a/audio/alsa-lib/files/patch-src_topology_parser.c b/audio/alsa-lib/files/patch-src_topology_parser.c
deleted file mode 100644
index 30338b65d30f..000000000000
--- a/audio/alsa-lib/files/patch-src_topology_parser.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/topology/parser.c.orig	2015-11-09 07:39:18 UTC
-+++ src/topology/parser.c
-@@ -18,6 +18,7 @@
- 
- #include "list.h"
- #include "tplg_local.h"
-+#include <sys/stat.h>
- 
- /*
-  * Parse compound
diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile
index f14db5caf324..fd14877e1455 100644
--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	alsa-plugins
-PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	audio
 MASTER_SITES=	ALSA/plugins \
 		GENTOO
diff --git a/audio/alsa-plugins/distinfo b/audio/alsa-plugins/distinfo
index eea425837295..6548bf004a76 100644
--- a/audio/alsa-plugins/distinfo
+++ b/audio/alsa-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (alsa-plugins-1.1.0.tar.bz2) = 3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee
-SIZE (alsa-plugins-1.1.0.tar.bz2) = 366296
+SHA256 (alsa-plugins-1.1.1.tar.bz2) = 8ea4d1e082c36528a896a2581e5eb62d4dc2683238e353050d0d624e65f901f1
+SIZE (alsa-plugins-1.1.1.tar.bz2) = 366193
diff --git a/audio/alsa-plugins/files/patch-a52-pcm_a52.c b/audio/alsa-plugins/files/patch-a52-pcm_a52.c
deleted file mode 100644
index 4b89180b97e9..000000000000
--- a/audio/alsa-plugins/files/patch-a52-pcm_a52.c
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Anatol Pomozov <anatol.pomozov@gmail.com>
-http://git.alsa-project.org/?p=alsa-plugins.git;a=commitdiff;h=85ead33
-
---- a52/pcm_a52.c.orig	2015-10-27 13:34:06 UTC
-+++ a52/pcm_a52.c
-@@ -39,7 +39,7 @@
- #endif
- 
- #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 34, 0)
--#include <libavutil/audioconvert.h>
-+#include <libavutil/channel_layout.h>
- #include <libavutil/mem.h>
- #define USE_AVCODEC_FRAME
- #endif
diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile
index dbb2848631b9..23db27b3188e 100644
--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	alsa-utils
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	audio
 MASTER_SITES=	ALSA/utils \
 		GENTOO
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-pl
 USES=		gmake localbase shebangfix tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-udev-rules-dir="\$${prefix}/lib/udev"
-SHEBANG_FILES=	alsa-info/alsa-info.sh alsaconf/alsaconf.in
+SHEBANG_FILES=	alsa-info/alsa-info.sh alsaconf/alsaconf.in bat/alsabat-test.sh
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${.CURDIR}/../alsa-lib/files
 
diff --git a/audio/alsa-utils/distinfo b/audio/alsa-utils/distinfo
index 2816c2b01fd8..fc2a45f4a026 100644
--- a/audio/alsa-utils/distinfo
+++ b/audio/alsa-utils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (alsa-utils-1.1.0.tar.bz2) = 3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1
-SIZE (alsa-utils-1.1.0.tar.bz2) = 1181085
+SHA256 (alsa-utils-1.1.1.tar.bz2) = 89757c9abaf420831b088fce354d492acc170bd02bb50eb7392c175f594b8041
+SIZE (alsa-utils-1.1.1.tar.bz2) = 1186408
diff --git a/audio/alsa-utils/pkg-plist b/audio/alsa-utils/pkg-plist
index 42eaff403f35..60c87911f8ff 100644
--- a/audio/alsa-utils/pkg-plist
+++ b/audio/alsa-utils/pkg-plist
@@ -1,4 +1,5 @@
 bin/aconnect
+%%BAT%%bin/alsabat
 bin/alsaloop
 bin/alsamixer
 bin/alsatplg
@@ -11,7 +12,6 @@ bin/arecord
 bin/arecordmidi
 bin/aseqdump
 bin/aseqnet
-%%BAT%%bin/bat
 bin/iecset
 bin/speaker-test
 lib/udev/90-alsa-restore.rules
@@ -28,12 +28,14 @@ man/man1/arecord.1.gz
 man/man1/arecordmidi.1.gz
 man/man1/aseqdump.1.gz
 man/man1/aseqnet.1.gz
-%%BAT%%man/man1/bat.1.gz
 man/man1/iecset.1.gz
 man/man1/speaker-test.1.gz
+man/man1/alsa-info.sh.1.gz
+%%BAT%%man/man1/alsabat.1.gz
 %%MANPAGES%%man/man7/alsactl_init.7.gz
 man/man8/alsaconf.8.gz
 sbin/alsa-info.sh
+%%BAT%%sbin/alsabat-test.sh
 sbin/alsaconf
 sbin/alsactl
 share/alsa/init/00main