From cd545ba4774cff59e8902bc41686dcf41707736e Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Tue, 14 Nov 2017 22:16:31 -0800 Subject: alsa-lib: Update to 1.1.5 --- pkg/alsa-lib/config.h | 8 +- .../patch/0001-Add-include-alsa-symlink.patch | 21 +++ pkg/alsa-lib/patch/0001-Fix-poll.h-includes.patch | 178 --------------------- .../patch/0002-Add-include-alsa-symlink.patch | 21 --- pkg/alsa-lib/rev | 2 +- pkg/alsa-lib/src | 2 +- 6 files changed, 27 insertions(+), 205 deletions(-) create mode 100644 pkg/alsa-lib/patch/0001-Add-include-alsa-symlink.patch delete mode 100644 pkg/alsa-lib/patch/0001-Fix-poll.h-includes.patch delete mode 100644 pkg/alsa-lib/patch/0002-Add-include-alsa-symlink.patch (limited to 'pkg') diff --git a/pkg/alsa-lib/config.h b/pkg/alsa-lib/config.h index 27912b8d..26138fe4 100644 --- a/pkg/alsa-lib/config.h +++ b/pkg/alsa-lib/config.h @@ -39,17 +39,17 @@ #define HAVE_SYS_TYPES_H 1 #define HAVE_UNISTD_H 1 #define HAVE_USELOCALE 1 -#define HAVE_WORDEXP_H 1 +/* #undef HAVE_WORDEXP */ #define HAVE___THREAD 1 #define LT_OBJDIR ".libs/" /* #undef NDEBUG */ #define PACKAGE "alsa-lib" #define PACKAGE_BUGREPORT "" #define PACKAGE_NAME "alsa-lib" -#define PACKAGE_STRING "alsa-lib 1.1.4.1" +#define PACKAGE_STRING "alsa-lib 1.1.5" #define PACKAGE_TARNAME "alsa-lib" #define PACKAGE_URL "" -#define PACKAGE_VERSION "1.1.4.1" +#define PACKAGE_VERSION "1.1.5" #define SND_MAX_CARDS 32 #define STDC_HEADERS 1 #define SUPPORT_ALOAD "1" @@ -72,7 +72,7 @@ #ifndef __EXTENSIONS__ # define __EXTENSIONS__ 1 #endif -#define VERSION "1.1.4.1" +#define VERSION "1.1.5" #define VERSIONED_SYMBOLS /**/ /* #undef _MINIX */ /* #undef _POSIX_1_SOURCE */ diff --git a/pkg/alsa-lib/patch/0001-Add-include-alsa-symlink.patch b/pkg/alsa-lib/patch/0001-Add-include-alsa-symlink.patch new file mode 100644 index 00000000..b0cca7e7 --- /dev/null +++ b/pkg/alsa-lib/patch/0001-Add-include-alsa-symlink.patch @@ -0,0 +1,21 @@ +From 9d8d34c6a318c90f3414de2d73bbe6652d5637f6 Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Fri, 1 Jul 2016 20:09:02 -0700 +Subject: [PATCH] Add include/alsa symlink + +--- + include/alsa | 1 + + 1 file changed, 1 insertion(+) + create mode 120000 include/alsa + +diff --git a/include/alsa b/include/alsa +new file mode 120000 +index 00000000..945c9b46 +--- /dev/null ++++ b/include/alsa +@@ -0,0 +1 @@ ++. +\ No newline at end of file +-- +2.15.0 + diff --git a/pkg/alsa-lib/patch/0001-Fix-poll.h-includes.patch b/pkg/alsa-lib/patch/0001-Fix-poll.h-includes.patch deleted file mode 100644 index b4dc2291..00000000 --- a/pkg/alsa-lib/patch/0001-Fix-poll.h-includes.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 005c1bcf8cd87091af1106b85fb6cd39cac819ab Mon Sep 17 00:00:00 2001 -From: Michael Forney -Date: Fri, 1 Jul 2016 20:08:30 -0700 -Subject: [PATCH] Fix poll.h includes - ---- - aserver/aserver.c | 2 +- - include/asoundlib-head.h | 2 +- - include/local.h | 2 +- - src/control/control.c | 2 +- - src/control/control_shm.c | 2 +- - src/pcm/pcm.c | 2 +- - src/pcm/pcm_direct.c | 2 +- - src/pcm/pcm_mmap.c | 2 +- - src/pcm/pcm_share.c | 2 +- - src/pcm/pcm_shm.c | 2 +- - src/seq/seq.c | 2 +- - src/shmarea.c | 2 +- - 12 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/aserver/aserver.c b/aserver/aserver.c -index ac20706..46f731a 100644 ---- a/aserver/aserver.c -+++ b/aserver/aserver.c -@@ -20,7 +20,7 @@ - - #include - #include --#include -+#include - #include - #include - #include -diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h -index 1ec611e..21e32c6 100644 ---- a/include/asoundlib-head.h -+++ b/include/asoundlib-head.h -@@ -35,6 +35,6 @@ - #include - #include - #include --#include -+#include - #include - #include -diff --git a/include/local.h b/include/local.h -index 317f2e3..6a43a47 100644 ---- a/include/local.h -+++ b/include/local.h -@@ -47,7 +47,7 @@ - #error Header defining endianness not defined - #endif - #include --#include -+#include - #include - #include - #if defined(__linux__) -diff --git a/src/control/control.c b/src/control/control.c -index 6c00b8e..fd0c303 100644 ---- a/src/control/control.c -+++ b/src/control/control.c -@@ -90,7 +90,7 @@ I/O operations. - #include - #include - #include --#include -+#include - #include - #include "control_local.h" - -diff --git a/src/control/control_shm.c b/src/control/control_shm.c -index bd07d4a..9a2e268 100644 ---- a/src/control/control_shm.c -+++ b/src/control/control_shm.c -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c -index f832399..e9d502a 100644 ---- a/src/pcm/pcm.c -+++ b/src/pcm/pcm.c -@@ -650,7 +650,7 @@ playback devices. - #include - #include - #include --#include -+#include - #include - #include - #include "pcm_local.h" -diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c -index c3925cc..18f1dd5 100644 ---- a/src/pcm/pcm_direct.c -+++ b/src/pcm/pcm_direct.c -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c -index 1948289..4cf220a 100644 ---- a/src/pcm/pcm_mmap.c -+++ b/src/pcm/pcm_mmap.c -@@ -22,7 +22,7 @@ - #include - #include - #include --#include -+#include - #include - #ifdef HAVE_SYS_SHM_H - #include -diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c -index 5d8aaf2..21a57fc 100644 ---- a/src/pcm/pcm_share.c -+++ b/src/pcm/pcm_share.c -@@ -34,7 +34,7 @@ - #include - #include - #include --#include -+#include - #include - #include "pcm_local.h" - -diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c -index a815ac6..4ee958c 100644 ---- a/src/pcm/pcm_shm.c -+++ b/src/pcm/pcm_shm.c -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/src/seq/seq.c b/src/seq/seq.c -index 9279830..d2027cb 100644 ---- a/src/seq/seq.c -+++ b/src/seq/seq.c -@@ -777,7 +777,7 @@ void event_filter(snd_seq_t *seq, snd_seq_event_t *ev) - - */ - --#include -+#include - #include "seq_local.h" - - /**************************************************************************** -diff --git a/src/shmarea.c b/src/shmarea.c -index 9843aa8..eaa71f0 100644 ---- a/src/shmarea.c -+++ b/src/shmarea.c -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "list.h" --- -2.9.2 - diff --git a/pkg/alsa-lib/patch/0002-Add-include-alsa-symlink.patch b/pkg/alsa-lib/patch/0002-Add-include-alsa-symlink.patch deleted file mode 100644 index 915378df..00000000 --- a/pkg/alsa-lib/patch/0002-Add-include-alsa-symlink.patch +++ /dev/null @@ -1,21 +0,0 @@ -From e834c59dad7123ffe0fc1d27d4ee4be08f95e328 Mon Sep 17 00:00:00 2001 -From: Michael Forney -Date: Fri, 1 Jul 2016 20:09:02 -0700 -Subject: [PATCH] Add include/alsa symlink - ---- - include/alsa | 1 + - 1 file changed, 1 insertion(+) - create mode 120000 include/alsa - -diff --git a/include/alsa b/include/alsa -new file mode 120000 -index 0000000..945c9b4 ---- /dev/null -+++ b/include/alsa -@@ -0,0 +1 @@ -+. -\ No newline at end of file --- -2.9.0 - diff --git a/pkg/alsa-lib/rev b/pkg/alsa-lib/rev index 7ed6ff82..1e8b3149 100644 --- a/pkg/alsa-lib/rev +++ b/pkg/alsa-lib/rev @@ -1 +1 @@ -5 +6 diff --git a/pkg/alsa-lib/src b/pkg/alsa-lib/src index 5bcf449d..2bacd704 160000 --- a/pkg/alsa-lib/src +++ b/pkg/alsa-lib/src @@ -1 +1 @@ -Subproject commit 5bcf449df5f2a4d4ca056c81f2e499a11722fcca +Subproject commit 2bacd7042b785e99591671b6464a3c88e4ed5b4b -- cgit v1.2.3