summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-21 16:29:58 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-21 16:29:58 +0000
commit3272856cb4631fb05a806ca3c50c2ea82d3d1112 (patch)
tree61717aef93fedc2771789aeb9a5feedfd0f97ecc /media-libs/alsa-lib
parentold (diff)
downloadgentoo-2-3272856cb4631fb05a806ca3c50c2ea82d3d1112.tar.gz
gentoo-2-3272856cb4631fb05a806ca3c50c2ea82d3d1112.tar.bz2
gentoo-2-3272856cb4631fb05a806ca3c50c2ea82d3d1112.zip
old
(Portage version: 2.2_rc38/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/alsa-lib')
-rw-r--r--media-libs/alsa-lib/Manifest5
-rw-r--r--media-libs/alsa-lib/files/alsa-lib-1.0.10_rc3-hardened.patch12
-rw-r--r--media-libs/alsa-lib/files/alsa-lib-1.0.14a-softfloat.patch24
-rw-r--r--media-libs/alsa-lib/files/alsa-lib-1.0.17-pcm-rewind-forward-return.patch38
-rw-r--r--media-libs/alsa-lib/files/alsa-lib-1.0.17-pcm-rewind-forward.patch36
-rw-r--r--media-libs/alsa-lib/files/alsa-lib-1.0.17-sframe-type.patch39
6 files changed, 0 insertions, 154 deletions
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index ecab0556961f..fe93a2779eb9 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,8 +1,3 @@
-AUX alsa-lib-1.0.10_rc3-hardened.patch 454 RMD160 d54236456b960ade362dccb484c91fff3856f825 SHA1 62be7f19c9bb19d9895ede8b0d390a03ba9a141f SHA256 7de3d237e3c20d45a3b9582989a600e4a297cbe652d03d2cd50c5c6b6ffb1742
-AUX alsa-lib-1.0.14a-softfloat.patch 639 RMD160 8c063d6013b503d89432bff5601ae2b8b90fec06 SHA1 588037d100e32a664a37a9e900c12694174cce6c SHA256 651780f8d1c50a87e659a0659cb74f1802309f26096ab1120af411338f7d2fe2
-AUX alsa-lib-1.0.17-pcm-rewind-forward-return.patch 1687 RMD160 15f88952a2a330e503f2035b900daf63b2f3f807 SHA1 cc135c0ff631348117f06254687672a0f92b45a3 SHA256 d41ab3f14c97d9827ddfaeeaf3bd99fe49e32609d111a10be5b520253479e9a2
-AUX alsa-lib-1.0.17-pcm-rewind-forward.patch 1303 RMD160 acb1efa8e46f2e0deff9c991e8970049ffd5d7c7 SHA1 94e82d0a9be113d6d28bf8e801ef10055861ac76 SHA256 def947b2758aa4b4dd99045562e6279276203e84dd99896ebc58947377507b84
-AUX alsa-lib-1.0.17-sframe-type.patch 1532 RMD160 367a8a22f6995b3f35e1d4c4658020753ea80099 SHA1 b8fc27a9015de3517413cbd80f7c9fa30d605bdf SHA256 aa7f8b08e45af278b868a26d3f3da9bc0ba97785c26e1d16f005da2fdd6b974f
DIST alsa-lib-1.0.17a.tar.bz2 789428 RMD160 ff4c8478bbc421225628419e4ffcb10be47c7826 SHA1 b79a6ee7040a59df5b5c066aced517881495fa87 SHA256 ace3d9c57eae65c7f292704b49c3806a1f90ce2cdeb4aca1e5abf021127ad3ed
DIST alsa-lib-1.0.19.tar.bz2 792682 RMD160 0ba7f8b1bd311fd9adc7cb1f80e2d3b23b1b303a SHA1 d1e320cad0ef902db2417de1c3520fc19af0af32 SHA256 32ee26d93a25963fdc49b4b5ccd014749d675e33f419022c646a61c31a4a2886
DIST alsa-lib-1.0.20.tar.bz2 794728 RMD160 8e0b48367abdd9d5746d2dc537014b1449e65e05 SHA1 0e6acce4301a4b3924e268a78e8c979a55cc8f88 SHA256 15f8d0eef1da10c62136107e7b585bc8beb9c9e9b7ad177654097f8c15e57a63
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.10_rc3-hardened.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.10_rc3-hardened.patch
deleted file mode 100644
index a064c702dc4a..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.10_rc3-hardened.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: alsa-lib-1.0.10rc3/test/Makefile.am
-===================================================================
---- alsa-lib-1.0.10rc3.orig/test/Makefile.am
-+++ alsa-lib-1.0.10rc3/test/Makefile.am
-@@ -16,6 +16,6 @@ queue_timer_LDADD=../src/libasound.la
- code_CFLAGS=-Wall -pipe -g -O2
-
- INCLUDES=-I$(top_srcdir)/include
--AM_CFLAGS=-static -Wall -pipe -g
-+AM_CFLAGS=-Wall -pipe -g
-
- EXTRA_DIST=seq-decoder.c seq-sender.c midifile.h midifile.c midifile.3
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.14a-softfloat.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.14a-softfloat.patch
deleted file mode 100644
index 9a34b932e50a..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.14a-softfloat.patch
+++ /dev/null
@@ -1,24 +0,0 @@
----
- configure.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/configure.in
-+++ b/configure.in
-@@ -185,7 +185,7 @@ AC_ARG_WITH(softfloat,
- [do you have floating point unit on this machine? (optional)]),
- [ AC_DEFINE(HAVE_SOFT_FLOAT, "1", [Avoid calculation in float])
- softfloat=yes ],)
--if test "$softloat" = "yes" ; then
-+if test "$softfloat" = "yes" ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
-@@ -414,7 +414,7 @@ if test "$HAVE_LIBPTHREAD" != "yes"; the
- build_pcm_share="no"
- fi
-
--if test "$softfloat" != "yes"; then
-+if test "$softfloat" = "yes"; then
- build_pcm_lfloat="no"
- fi
-
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.17-pcm-rewind-forward-return.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.17-pcm-rewind-forward-return.patch
deleted file mode 100644
index d3d6f9398f03..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.17-pcm-rewind-forward-return.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Lennart Poettering <mznyfn@0pointer.de>
-Date: Fri, 18 Jul 2008 19:24:38 +0000 (+0200)
-Subject: fix return value of snd_pcm_rewind()/snd_pcm_forward() to return how much actually ...
-X-Git-Url: http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=8d3fb3102f672a7b09be92811e89d49f89c1742b
-
-fix return value of snd_pcm_rewind()/snd_pcm_forward() to return how much actually has been rewound, instead of what actually could have rewound
-
-Make snd_pcm_plugin_rewind()/_forward() actually return how much has
-been rewound/forwarded instead of how much could have been
-rewounded/forwarded. This makes the code actually do what the
-documentation of snd_pcm_rewind() suggests.
-
-Signed-off-by: Lennart Poettering <lennart@poettering.net>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
-
-diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
-index b377cb2..c4f5b4a 100644
---- a/src/pcm/pcm_plugin.c
-+++ b/src/pcm/pcm_plugin.c
-@@ -222,7 +222,7 @@ static snd_pcm_sframes_t snd_pcm_plugin_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t
- frames = plugin->client_frames(pcm, sframes);
- snd_pcm_mmap_appl_backward(pcm, (snd_pcm_uframes_t) frames);
- snd_atomic_write_end(&plugin->watom);
-- return n;
-+ return (snd_pcm_sframes_t) frames;
- }
-
- static snd_pcm_sframes_t snd_pcm_plugin_forwardable(snd_pcm_t *pcm)
-@@ -255,7 +255,7 @@ static snd_pcm_sframes_t snd_pcm_plugin_forward(snd_pcm_t *pcm, snd_pcm_uframes_
- frames = plugin->client_frames(pcm, sframes);
- snd_pcm_mmap_appl_forward(pcm, (snd_pcm_uframes_t) frames);
- snd_atomic_write_end(&plugin->watom);
-- return n;
-+ return (snd_pcm_sframes_t) frames;
- }
-
- static snd_pcm_sframes_t snd_pcm_plugin_write_areas(snd_pcm_t *pcm,
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.17-pcm-rewind-forward.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.17-pcm-rewind-forward.patch
deleted file mode 100644
index 80945aaa1a58..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.17-pcm-rewind-forward.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Lennart Poettering <mznyfn@0pointer.de>
-Date: Fri, 18 Jul 2008 19:21:23 +0000 (+0200)
-Subject: clamp snd_pcm_rewind()/snd_pcm_forward() into the right direction
-X-Git-Url: http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=0fbfe2d8d6aac06e6615b7109ffc1fea8c62dee6
-
-clamp snd_pcm_rewind()/snd_pcm_forward() into the right direction
-
-The clamping of the input parameter in snd_pcm_rewind()/_forward() is
-in the wrong direction.
-
-Signed-off-by: Lennart Poettering <lennart@poettering.net>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
-
-diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
-index c73a02b..c199d8d 100644
---- a/src/pcm/pcm_plugin.c
-+++ b/src/pcm/pcm_plugin.c
-@@ -203,7 +203,7 @@ static snd_pcm_sframes_t snd_pcm_plugin_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t
- snd_pcm_sframes_t n = snd_pcm_mmap_hw_avail(pcm);
- snd_pcm_sframes_t sframes;
-
-- if ((snd_pcm_uframes_t)n > frames)
-+ if ((snd_pcm_uframes_t)n < frames)
- frames = n;
- if (frames == 0)
- return 0;
-@@ -236,7 +236,7 @@ static snd_pcm_sframes_t snd_pcm_plugin_forward(snd_pcm_t *pcm, snd_pcm_uframes_
- snd_pcm_sframes_t n = snd_pcm_mmap_avail(pcm);
- snd_pcm_uframes_t sframes;
-
-- if ((snd_pcm_uframes_t)n > frames)
-+ if ((snd_pcm_uframes_t)n < frames)
- frames = n;
- if (frames == 0)
- return 0;
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.17-sframe-type.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.17-sframe-type.patch
deleted file mode 100644
index e36c41b50962..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.17-sframe-type.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Lennart Poettering <mznyfn@0pointer.de>
-Date: Fri, 18 Jul 2008 19:22:50 +0000 (+0200)
-Subject: fix type of internally used sframes variable, to avoid unnecessary casts
-X-Git-Url: http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=15769ead725b7c215dedd4ea5196955086d2044a
-
-fix type of internally used sframes variable, to avoid unnecessary casts
-
-This minor patch fixes the type of the sframes variable in
-snd_pcm_plugin_forward(). With this fix we need to cast less and the
-code is less confusing.
-
-Signed-off-by: Lennart Poettering <lennart@poettering.net>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
-
-diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c
-index c199d8d..b377cb2 100644
---- a/src/pcm/pcm_plugin.c
-+++ b/src/pcm/pcm_plugin.c
-@@ -234,7 +234,7 @@ static snd_pcm_sframes_t snd_pcm_plugin_forward(snd_pcm_t *pcm, snd_pcm_uframes_
- {
- snd_pcm_plugin_t *plugin = pcm->private_data;
- snd_pcm_sframes_t n = snd_pcm_mmap_avail(pcm);
-- snd_pcm_uframes_t sframes;
-+ snd_pcm_sframes_t sframes;
-
- if ((snd_pcm_uframes_t)n < frames)
- frames = n;
-@@ -246,8 +246,8 @@ static snd_pcm_sframes_t snd_pcm_plugin_forward(snd_pcm_t *pcm, snd_pcm_uframes_
- else
- sframes = frames;
- snd_atomic_write_begin(&plugin->watom);
-- sframes = INTERNAL(snd_pcm_forward)(plugin->gen.slave, (snd_pcm_uframes_t) sframes);
-- if ((snd_pcm_sframes_t) sframes < 0) {
-+ sframes = INTERNAL(snd_pcm_forward)(plugin->gen.slave, sframes);
-+ if (sframes < 0) {
- snd_atomic_write_end(&plugin->watom);
- return sframes;
- }