Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Akihiro Suda
aports
Commits
95409121
Commit
95409121
authored
8 years ago
by
Natanael Copa
Browse files
Options
Downloads
Patches
Plain Diff
main/alsa-lib: upgrade to 1.1.2
parent
8bf75a4b
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
main/alsa-lib/APKBUILD
+8
-8
8 additions, 8 deletions
main/alsa-lib/APKBUILD
main/alsa-lib/alsa-lib-poll.patch
+57
-44
57 additions, 44 deletions
main/alsa-lib/alsa-lib-poll.patch
with
65 additions
and
52 deletions
main/alsa-lib/APKBUILD
+
8
−
8
View file @
95409121
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
alsa-lib
pkgver
=
1.1.
1
pkgrel
=
3
pkgver
=
1.1.
2
pkgrel
=
0
pkgdesc
=
"An alternative implementation of Linux sound support"
url
=
"http://www.alsa-project.org"
arch
=
"all"
...
...
@@ -50,12 +50,12 @@ package() {
make
-j1
DESTDIR
=
"
$pkgdir
"
install
||
return
1
}
md5sums
=
"
881060d2c568f7f49db82c58df2f9ddc
alsa-lib-1.1.
1
.tar.bz2
59f635281241399e8783b077ce022dfc
alsa-lib-poll.patch
md5sums
=
"
1946e6438b8262a7b8fdadacd0e06ba7
alsa-lib-1.1.
2
.tar.bz2
8005b9b9c2aad55912f87e0829437c17
alsa-lib-poll.patch
1349b595ef97c42873b917b2cf7c0e37 alsa-lib-stdint.patch"
sha256sums
=
"
8ac76c3144ed2ed49da7622ab65ac5415205913ccbedde877972383cbc234269
alsa-lib-1.1.
1
.tar.bz2
6e3b26b5cc26ce81d196d22b020dc9870d8f7ff02ef05f62d62d43497e7d91f8
alsa-lib-poll.patch
sha256sums
=
"
d38dacd9892b06b8bff04923c380b38fb2e379ee5538935ff37e45b395d861d6
alsa-lib-1.1.
2
.tar.bz2
b4f5c664756868ba68b170b8b74f5deebdade3b83349e2073a500caece6e0af1
alsa-lib-poll.patch
5cd15e2bbccf72d04a20db9f11bdd4dee3342f5c365d8141450916e263d9aebc alsa-lib-stdint.patch"
sha512sums
=
"
dacd0a74adc682ac0034cbeba2de3d1a141e0ac2e564c9e04dae202ffaf87ef3a1e01307afc2fd2d9cfe679e5b101c379f9b6ea5f7ccceeed14a427bd5232bc7
alsa-lib-1.1.
1
.tar.bz2
19168fd85cac28baba42d0da9cb89ceefc7b15532c4fe0c2ff6e87294334dd364f87430f47ad612bd63240cdbb3b08165e48cfd7aa45489b5ad7286cd80e0f21
alsa-lib-poll.patch
sha512sums
=
"
a6c6675b1fd86955ef5072b9e6090795fc6b0b16f32481bece049e5f100e689be48b6416ff7cf36abfc67e0b94f420e08c15ff13a9701987d6bb69a8fa567e8a
alsa-lib-1.1.
2
.tar.bz2
bdf86a1b76b2e6e9b43af33989fe51e4900fa0c6f317d8d746f30c540df647dbe0f6d41ec35b36b1cf7e46cc5e910e0a62bc39c765f849356ecd6e98d1de5885
alsa-lib-poll.patch
2351262dade9a3c1a3de1b7d1a3a53a634a438b9b8aae7cc69e2b981500051f039e6381359b81392114ec6236e3d513b577bd4bf12c3d2ce1f871cd7651b2cab alsa-lib-stdint.patch"
This diff is collapsed.
Click to expand it.
main/alsa-lib/alsa-lib-poll.patch
+
57
−
44
View file @
95409121
diff -ru alsa-lib-1.1.0.orig/aserver/aserver.c alsa-lib-1.1.0/aserver/aserver.c
--- alsa-lib-1.1.0.orig/aserver/aserver.c 2015-11-09 09:39:18.000000000 +0200
+++ alsa-lib-1.1.0/aserver/aserver.c 2016-02-11 14:31:58.800479098 +0200
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 <sys/shm.h>
...
...
@@ -10,9 +11,10 @@ diff -ru alsa-lib-1.1.0.orig/aserver/aserver.c alsa-lib-1.1.0/aserver/aserver.c
#include <sys/un.h>
#include <sys/uio.h>
#include <stdio.h>
diff -ru alsa-lib-1.1.0.orig/include/asoundlib-head.h alsa-lib-1.1.0/include/asoundlib-head.h
--- alsa-lib-1.1.0.orig/include/asoundlib-head.h 2015-11-09 09:39:18.000000000 +0200
+++ alsa-lib-1.1.0/include/asoundlib-head.h 2016-02-11 14:31:58.800479098 +0200
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 <string.h>
#include <fcntl.h>
...
...
@@ -21,9 +23,10 @@ diff -ru alsa-lib-1.1.0.orig/include/asoundlib-head.h alsa-lib-1.1.0/include/aso
+#include <poll.h>
#include <errno.h>
#include <stdarg.h>
diff -ru alsa-lib-1.1.0.orig/include/asoundlib.h alsa-lib-1.1.0/include/asoundlib.h
--- alsa-lib-1.1.0.orig/include/asoundlib.h 2015-11-09 09:40:19.000000000 +0200
+++ alsa-lib-1.1.0/include/asoundlib.h 2016-02-11 14:31:58.800479098 +0200
diff --git a/include/asoundlib.h b/include/asoundlib.h
index 3c2766e..a546194 100644
--- a/include/asoundlib.h
+++ b/include/asoundlib.h
@@ -35,7 +35,7 @@
#include <string.h>
#include <fcntl.h>
...
...
@@ -33,9 +36,10 @@ diff -ru alsa-lib-1.1.0.orig/include/asoundlib.h alsa-lib-1.1.0/include/asoundli
#include <errno.h>
#include <stdarg.h>
#include <endian.h>
diff -ru alsa-lib-1.1.0.orig/include/local.h alsa-lib-1.1.0/include/local.h
--- alsa-lib-1.1.0.orig/include/local.h 2015-11-09 09:39:18.000000000 +0200
+++ alsa-lib-1.1.0/include/local.h 2016-02-11 14:31:58.797145726 +0200
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
...
...
@@ -44,22 +48,24 @@ diff -ru alsa-lib-1.1.0.orig/include/local.h alsa-lib-1.1.0/include/local.h
+#include <poll.h>
#include <sys/types.h>
#include <errno.h>
#include <linux/types.h>
diff -ru alsa-lib-1.1.0.orig/src/control/control.c alsa-lib-1.1.0/src/control/control.c
--- alsa-lib-1.1.0.orig/src/control/control.c 2015-11-09 09:39:18.000000000 +0200
+++ alsa-lib-1.1.0/src/control/control.c 2016-02-11 14:31:58.807145843 +0200
@@ -48,7 +48,7 @@
#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 <string.h>
#include <fcntl.h>
#include <signal.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <stdbool.h>
#include "control_local.h"
/**
diff -ru alsa-lib-1.1.0.orig/src/control/control_shm.c alsa-lib-1.1.0/src/control/control_shm.c
--- a
lsa-lib-1.1.0.orig
/src/control/control_shm.c
2015-11-09 09:39:18.000000000 +0200
+++
alsa-lib-1.1.0
/src/control/control_shm.c
2016-02-11 14:31:58.800479098 +0200
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 <fcntl.h>
#include <sys/shm.h>
...
...
@@ -69,10 +75,11 @@ diff -ru alsa-lib-1.1.0.orig/src/control/control_shm.c alsa-lib-1.1.0/src/contro
#include <sys/un.h>
#include <sys/uio.h>
#include <sys/mman.h>
diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm.c alsa-lib-1.1.0/src/pcm/pcm.c
--- alsa-lib-1.1.0.orig/src/pcm/pcm.c 2015-11-09 09:39:18.000000000 +0200
+++ alsa-lib-1.1.0/src/pcm/pcm.c 2016-02-11 14:31:58.833812820 +0200
@@ -634,7 +634,7 @@
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 <stdarg.h>
#include <signal.h>
#include <ctype.h>
...
...
@@ -81,9 +88,10 @@ diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm.c alsa-lib-1.1.0/src/pcm/pcm.c
#include <sys/mman.h>
#include <limits.h>
#include "pcm_local.h"
diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_direct.c alsa-lib-1.1.0/src/pcm/pcm_direct.c
--- alsa-lib-1.1.0.orig/src/pcm/pcm_direct.c 2015-11-09 09:39:18.000000000 +0200
+++ alsa-lib-1.1.0/src/pcm/pcm_direct.c 2016-02-11 14:31:58.837146193 +0200
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 <grp.h>
#include <sys/ioctl.h>
...
...
@@ -93,9 +101,10 @@ diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_direct.c alsa-lib-1.1.0/src/pcm/pcm_dir
#include <sys/shm.h>
#include <sys/sem.h>
#include <sys/wait.h>
diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_mmap.c alsa-lib-1.1.0/src/pcm/pcm_mmap.c
--- alsa-lib-1.1.0.orig/src/pcm/pcm_mmap.c 2015-11-09 09:39:18.000000000 +0200
+++ alsa-lib-1.1.0/src/pcm/pcm_mmap.c 2016-02-11 14:31:58.817145959 +0200
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 <stdio.h>
#include <malloc.h>
...
...
@@ -105,9 +114,10 @@ diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_mmap.c alsa-lib-1.1.0/src/pcm/pcm_mmap.
#include <sys/mman.h>
#ifdef HAVE_SYS_SHM_H
#include <sys/shm.h>
diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_share.c alsa-lib-1.1.0/src/pcm/pcm_share.c
--- alsa-lib-1.1.0.orig/src/pcm/pcm_share.c 2015-11-09 09:39:18.000000000 +0200
+++ alsa-lib-1.1.0/src/pcm/pcm_share.c 2016-02-11 14:31:58.820479332 +0200
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 <signal.h>
#include <math.h>
...
...
@@ -117,9 +127,10 @@ diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_share.c alsa-lib-1.1.0/src/pcm/pcm_shar
#include <pthread.h>
#include "pcm_local.h"
diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_shm.c alsa-lib-1.1.0/src/pcm/pcm_shm.c
--- alsa-lib-1.1.0.orig/src/pcm/pcm_shm.c 2015-11-09 09:39:18.000000000 +0200
+++ alsa-lib-1.1.0/src/pcm/pcm_shm.c 2016-02-11 14:31:58.820479332 +0200
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 <sys/ioctl.h>
#include <sys/shm.h>
...
...
@@ -129,10 +140,11 @@ diff -ru alsa-lib-1.1.0.orig/src/pcm/pcm_shm.c alsa-lib-1.1.0/src/pcm/pcm_shm.c
#include <sys/un.h>
#include <sys/mman.h>
#include <netinet/in.h>
diff -ru alsa-lib-1.1.0.orig/src/seq/seq.c alsa-lib-1.1.0/src/seq/seq.c
--- alsa-lib-1.1.0.orig/src/seq/seq.c 2015-11-09 09:39:18.000000000 +0200
+++ alsa-lib-1.1.0/src/seq/seq.c 2016-02-11 14:31:58.813812587 +0200
@@ -777,7 +777,7 @@
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)
*/
...
...
@@ -141,9 +153,10 @@ diff -ru alsa-lib-1.1.0.orig/src/seq/seq.c alsa-lib-1.1.0/src/seq/seq.c
#include "seq_local.h"
/****************************************************************************
diff -ru alsa-lib-1.1.0.orig/src/shmarea.c alsa-lib-1.1.0/src/shmarea.c
--- alsa-lib-1.1.0.orig/src/shmarea.c 2015-11-09 09:39:18.000000000 +0200
+++ alsa-lib-1.1.0/src/shmarea.c 2016-02-11 14:31:58.807145843 +0200
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 <malloc.h>
#include <string.h>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment