summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-08-03 01:00:09 -0700
committerMichael Forney <mforney@mforney.org>2016-08-03 01:00:09 -0700
commit8cea40328a06212afce018217999073f0b3f20db (patch)
tree966a3e20c933ce213d97a4ac6f0533fcda7ab184
parentf44f4d09abe137d2cf035d9fd5d2a785e58f6f51 (diff)
alsa-utils: Update to 1.1.2
-rw-r--r--media/alsa-utils/.rev2
-rw-r--r--media/alsa-utils/aconfig.h6
-rw-r--r--media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch8
-rw-r--r--media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch6
m---------media/alsa-utils/src0
-rw-r--r--media/alsa-utils/version.h4
6 files changed, 13 insertions, 13 deletions
diff --git a/media/alsa-utils/.rev b/media/alsa-utils/.rev
index d00491fd..0cfbf088 100644
--- a/media/alsa-utils/.rev
+++ b/media/alsa-utils/.rev
@@ -1 +1 @@
-1
+2
diff --git a/media/alsa-utils/aconfig.h b/media/alsa-utils/aconfig.h
index dfa8c5f5..2d82c61e 100644
--- a/media/alsa-utils/aconfig.h
+++ b/media/alsa-utils/aconfig.h
@@ -30,13 +30,13 @@
#define PACKAGE "alsa-utils"
#define PACKAGE_BUGREPORT ""
#define PACKAGE_NAME "alsa-utils"
-#define PACKAGE_STRING "alsa-utils 1.1.1"
+#define PACKAGE_STRING "alsa-utils 1.1.2"
#define PACKAGE_TARNAME "alsa-utils"
#define PACKAGE_URL ""
-#define PACKAGE_VERSION "1.1.1"
+#define PACKAGE_VERSION "1.1.2"
#define SOUNDSDIR "/share/sounds/alsa"
#define TIME_WITH_SYS_TIME 1
-#define VERSION "1.1.1"
+#define VERSION "1.1.2"
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
#endif
diff --git a/media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch b/media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch
index cb04c76f..6423a770 100644
--- a/media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch
+++ b/media/alsa-utils/patch/0001-Include-poll.h-instead-of-sys-poll.h.patch
@@ -1,7 +1,7 @@
-From bf5b040672b67cbf69eadb46b699d7f814adbdd5 Mon Sep 17 00:00:00 2001
+From 16fb793861d8833c81b4a7bb0eb8372099699772 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 2 Jul 2016 23:48:43 -0700
-Subject: [PATCH 1/2] Include poll.h instead of sys/poll.h
+Subject: [PATCH] Include poll.h instead of sys/poll.h
---
amidi/amidi.c | 2 +-
@@ -38,7 +38,7 @@ index f9b09cb..8241148 100644
#include "amixer.h"
#include "../alsamixer/volume_mapping.h"
diff --git a/aplay/aplay.c b/aplay/aplay.c
-index 7acaa83..78823d8 100644
+index 2da7dda..172287b 100644
--- a/aplay/aplay.c
+++ b/aplay/aplay.c
@@ -43,7 +43,7 @@
@@ -77,5 +77,5 @@ index 24c5d21..05892e0 100644
#include "aconfig.h"
#include "version.h"
--
-2.9.0
+2.9.2
diff --git a/media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch b/media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch
index 47e151f2..83cf3821 100644
--- a/media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch
+++ b/media/alsa-utils/patch/0002-amixer.h-Just-include-version.h.patch
@@ -1,7 +1,7 @@
-From 9e890d47655e382702bcaba8cb449fb81f1d1876 Mon Sep 17 00:00:00 2001
+From be89553bd363678ab75c44b8e0630920aba52987 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sun, 3 Jul 2016 00:01:24 -0700
-Subject: [PATCH 2/2] amixer.h: Just include "version.h"
+Subject: [PATCH] amixer.h: Just include "version.h"
---
amixer/amixer.h | 2 +-
@@ -18,5 +18,5 @@ index 3588f04..0daa5b7 100644
-#include "../include/version.h"
+#include "version.h"
--
-2.9.0
+2.9.2
diff --git a/media/alsa-utils/src b/media/alsa-utils/src
-Subproject 96db90e98a6040f680f4ebca1880268a2e1ab6c
+Subproject 675619eb295f8eb35903ef227e6939a86d8c1e7
diff --git a/media/alsa-utils/version.h b/media/alsa-utils/version.h
index d9f7ffff..991790bc 100644
--- a/media/alsa-utils/version.h
+++ b/media/alsa-utils/version.h
@@ -4,9 +4,9 @@
#define SND_UTIL_MAJOR 1
#define SND_UTIL_MINOR 1
-#define SND_UTIL_SUBMINOR 1
+#define SND_UTIL_SUBMINOR 2
#define SND_UTIL_VERSION ((SND_UTIL_MAJOR<<16)|\
(SND_UTIL_MINOR<<8)|\
SND_UTIL_SUBMINOR)
-#define SND_UTIL_VERSION_STR "1.1.1"
+#define SND_UTIL_VERSION_STR "1.1.2"