aboutsummaryrefslogtreecommitdiffstats
path: root/main/alsa-lib
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-06-18 07:15:35 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-06-18 07:16:39 +0000
commita1116db5707a67ebbd7f5fbdf2e48ac24c30b4b1 (patch)
tree63fc83bae34d5c9582f0f3ecf8724de17a045378 /main/alsa-lib
parent308ba51d5404aae4ea63341035fe40e3239b8d4f (diff)
downloadaports-a1116db5707a67ebbd7f5fbdf2e48ac24c30b4b1.tar.gz
aports-a1116db5707a67ebbd7f5fbdf2e48ac24c30b4b1.tar.bz2
aports-a1116db5707a67ebbd7f5fbdf2e48ac24c30b4b1.tar.xz
main/alsa-lib: upgrade to 1.0.28
Diffstat (limited to 'main/alsa-lib')
-rw-r--r--main/alsa-lib/APKBUILD29
-rw-r--r--main/alsa-lib/alsa-lib-portable-mutex.patch33
-rw-r--r--main/alsa-lib/alsa-lib_kernel_off_t.patch10
-rw-r--r--main/alsa-lib/fix-headers.patch65
4 files changed, 9 insertions, 128 deletions
diff --git a/main/alsa-lib/APKBUILD b/main/alsa-lib/APKBUILD
index 719dbed2ab..6e7e775f6a 100644
--- a/main/alsa-lib/APKBUILD
+++ b/main/alsa-lib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alsa-lib
-pkgver=1.0.27.2
-pkgrel=3
+pkgver=1.0.28
+pkgrel=0
pkgdesc="An alternative implementation of Linux sound support"
url="http://www.alsa-project.org"
arch="all"
@@ -11,9 +11,7 @@ subpackages="$pkgname-dev"
source="http://alsa.cybermirror.org/lib/$pkgname-$pkgver.tar.bz2
alsa-lib_pcm_h.patch
alsa-lib_mixed_types.patch
- alsa-lib_kernel_off_t.patch
- alsa-lib-portable-mutex.patch
- fix-headers.patch"
+ "
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
@@ -52,21 +50,12 @@ package() {
find "$pkgdir" -iname *.la -delete
}
-md5sums="69129a7c37697f81ac092335e9fa452b alsa-lib-1.0.27.2.tar.bz2
+md5sums="c9e21b88a2b3e6e12ea7ba0f3b271fc3 alsa-lib-1.0.28.tar.bz2
4018a2f02d7c93935b6a8fa0bc3f2191 alsa-lib_pcm_h.patch
-d949fb5ff425e70f1896f7231f30469e alsa-lib_mixed_types.patch
-1c730d98856f5753c8a12794e616b543 alsa-lib_kernel_off_t.patch
-53be16ad5e552d62730dd8386f32569d alsa-lib-portable-mutex.patch
-5c927fa03f965c949ae78599a07e358d fix-headers.patch"
-sha256sums="690ed393e7efd4fc7e3a2d2cda5449298ca0c895197e5914e350882012430d19 alsa-lib-1.0.27.2.tar.bz2
+d949fb5ff425e70f1896f7231f30469e alsa-lib_mixed_types.patch"
+sha256sums="3c074b85dde1b30e78ef4995579765833e5b693fbbd8f834c335e080cb734a6d alsa-lib-1.0.28.tar.bz2
faa8efc9b2e5d110d0daffe473c86efcbc6305a7eafd016b1334581db466dbdf alsa-lib_pcm_h.patch
-ac2b77959404ea81d2f1a539c9c0e9e15b5c2c452285712aa10b6f8da8f9eefa alsa-lib_mixed_types.patch
-ec7a8cb2b82d59b137f40df9e6bc3de1519a150c7c2718f9906b721ef4fd6e63 alsa-lib_kernel_off_t.patch
-fa2ada95443835aead2e3a5a23262242885f4b1297779d94c3545aa137b05858 alsa-lib-portable-mutex.patch
-f04295f6a876f8808f40186b99f49e9f432704340aae4f63b146b55812e7d1dc fix-headers.patch"
-sha512sums="3fa9160e001cf21ddc6332c3748f8aa27bd1b514616fd1a9993c34128fe99d07e2dfc5f1a9177e1c17456d1361496f90bf3552f940fd85c6ea5ac9bbc30fe8ce alsa-lib-1.0.27.2.tar.bz2
+ac2b77959404ea81d2f1a539c9c0e9e15b5c2c452285712aa10b6f8da8f9eefa alsa-lib_mixed_types.patch"
+sha512sums="a08430d0beb4a751b1608d148f4fc3d1077a689f5f7197b830a2768d66238b69de2614448d56643fbcb3141faa06ab361b7a8579cce4303304bce8c10de01f08 alsa-lib-1.0.28.tar.bz2
0ea37cda27b440c82f0bc0e34f67d423678d348874c18063036e4347f961bbbce4074ed0aaa518d25d0cedd73818e66e1cbc30c6ff4bf9e6479f64012df0199c alsa-lib_pcm_h.patch
-990d83a761958f350749fda57def15c73890afeae4fa303dc6af36c453a723a2c98d3cf8f44344da539e6c3224d96bfa91861e59126ec2a3d97dc4c0f36fbc61 alsa-lib_mixed_types.patch
-800362bbc8823afdd04480c319c2a9a2d8823712197e8c59af4c4ef80602435aace12a75fcdf5a9824d01e16397568636141980bff08f098f1ad4b794486834e alsa-lib_kernel_off_t.patch
-6bacd0db2be2140150cecc31062726c9ec3a367cf6da114828ae98dace2233b2ac4c7bc74318e125aa7eafbb3085fecc017ac51b7414546b2803230d610bb925 alsa-lib-portable-mutex.patch
-2cc59c0130bbb69f88bf70ed47c14cff226b7a6ac6a8c3d2da74577a0c0a5a7ba9a14c2881af56f7e41795e7f12aad1b0173750aaba88792ce06b23f0c6f25c3 fix-headers.patch"
+990d83a761958f350749fda57def15c73890afeae4fa303dc6af36c453a723a2c98d3cf8f44344da539e6c3224d96bfa91861e59126ec2a3d97dc4c0f36fbc61 alsa-lib_mixed_types.patch"
diff --git a/main/alsa-lib/alsa-lib-portable-mutex.patch b/main/alsa-lib/alsa-lib-portable-mutex.patch
deleted file mode 100644
index 5ef530c38a..0000000000
--- a/main/alsa-lib/alsa-lib-portable-mutex.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- alsa-lib-1.0.27.2.orig/src/conf.c
-+++ alsa-lib-1.0.27.2/src/conf.c
-@@ -427,8 +427,8 @@
- #ifndef DOC_HIDDEN
-
- #ifdef HAVE_LIBPTHREAD
--static pthread_mutex_t snd_config_update_mutex =
-- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+static pthread_mutex_t snd_config_update_mutex;
-+static pthread_once_t snd_config_update_mutex_once = PTHREAD_ONCE_INIT;
- #endif
-
- struct _snd_config {
-@@ -472,8 +472,19 @@
-
- #ifdef HAVE_LIBPTHREAD
-
-+static void snd_config_init_mutex(void)
-+{
-+ pthread_mutexattr_t attr;
-+
-+ pthread_mutexattr_init(&attr);
-+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-+ pthread_mutex_init(&snd_config_update_mutex, &attr);
-+ pthread_mutexattr_destroy(&attr);
-+}
-+
- static inline void snd_config_lock(void)
- {
-+ pthread_once(&snd_config_update_mutex_once, snd_config_init_mutex);
- pthread_mutex_lock(&snd_config_update_mutex);
- }
-
diff --git a/main/alsa-lib/alsa-lib_kernel_off_t.patch b/main/alsa-lib/alsa-lib_kernel_off_t.patch
deleted file mode 100644
index 5884e8a9cd..0000000000
--- a/main/alsa-lib/alsa-lib_kernel_off_t.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- alsa-lib-1.0.27.2.org/include/local.h
-+++ alsa-lib-1.0.27.2/include/local.h
-@@ -116,7 +116,6 @@
- /* kill and replace kernel-specific types */
- #define __user
- #define __force
--#define __kernel_off_t off_t
-
- #include <sound/asound.h>
-
diff --git a/main/alsa-lib/fix-headers.patch b/main/alsa-lib/fix-headers.patch
deleted file mode 100644
index 942cb97266..0000000000
--- a/main/alsa-lib/fix-headers.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- alsa-lib-1.0.27.2.orig/include/asoundlib-head.h
-+++ alsa-lib-1.0.27.2/include/asoundlib-head.h
-@@ -36,7 +36,7 @@
- #include <fcntl.h>
- #include <assert.h>
- #include <endian.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <errno.h>
- #include <stdarg.h>
-
---- alsa-lib-1.0.27.2.orig/include/asoundlib.h
-+++ alsa-lib-1.0.27.2/include/asoundlib.h
-@@ -36,7 +36,7 @@
- #include <fcntl.h>
- #include <assert.h>
- #include <endian.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <errno.h>
- #include <stdarg.h>
-
---- alsa-lib-1.0.27.2.orig/include/global.h
-+++ alsa-lib-1.0.27.2/include/global.h
-@@ -133,18 +133,6 @@
-
- int snd_user_file(const char *file, char **result);
-
--#if !defined(_POSIX_C_SOURCE) && !defined(_POSIX_SOURCE)
--struct timeval {
-- time_t tv_sec; /* seconds */
-- long tv_usec; /* microseconds */
--};
--
--struct timespec {
-- time_t tv_sec; /* seconds */
-- long tv_nsec; /* nanoseconds */
--};
--#endif
--
- /** Timestamp */
- typedef struct timeval snd_timestamp_t;
- /** Hi-res timestamp */
---- alsa-lib-1.0.27.2.orig/include/local.h
-+++ alsa-lib-1.0.27.2/include/local.h
-@@ -30,7 +30,7 @@
- #include <assert.h>
- #include <endian.h>
- #include <stdarg.h>
--#include <sys/poll.h>
-+#include <poll.h>
- #include <errno.h>
- #include <linux/ioctl.h>
-
---- alsa-lib-1.0.27.2.orig/src/shmarea.c
-+++ alsa-lib-1.0.27.2/src/shmarea.c
-@@ -19,7 +19,7 @@
- */
-
- #include <stdio.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <errno.h>
- #include <sys/poll.h>