summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/CVE-2008-5824.patch23
-rw-r--r--meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/audiofile-0.2.6.patch67
-rw-r--r--meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/audiofile-m4_quote_fix.diff11
-rw-r--r--meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/audiofile-oldstyle.patch55
-rw-r--r--meta-oe/recipes-multimedia/audiofile/audiofile_0.2.7.bb (renamed from meta-oe/recipes-multimedia/audiofile/audiofile_0.2.6.bb)14
5 files changed, 5 insertions, 165 deletions
diff --git a/meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/CVE-2008-5824.patch b/meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/CVE-2008-5824.patch
deleted file mode 100644
index 31233d22b3..0000000000
--- a/meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/CVE-2008-5824.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1diff -Naur audiofile-0.2.6/libaudiofile/modules/msadpcm.c audiofile-0.2.6-mp/libaudiofile/modules/msadpcm.c
2--- audiofile-0.2.6/libaudiofile/modules/msadpcm.c 2004-03-06 07:39:23.000000000 +0100
3+++ audiofile-0.2.6-mp/libaudiofile/modules/msadpcm.c 2009-01-20 20:05:14.919961000 +0100
4@@ -129,8 +129,7 @@
5 ms_adpcm_state *state[2];
6
7 /* Calculate the number of bytes needed for decoded data. */
8- outputLength = msadpcm->samplesPerBlock * sizeof (int16_t) *
9- msadpcm->track->f.channelCount;
10+ outputLength = msadpcm->samplesPerBlock * sizeof (int16_t);
11
12 channelCount = msadpcm->track->f.channelCount;
13
14@@ -180,8 +179,7 @@
15 The first two samples have already been 'decoded' in
16 the block header.
17 */
18- samplesRemaining = (msadpcm->samplesPerBlock - 2) *
19- msadpcm->track->f.channelCount;
20+ samplesRemaining = msadpcm->samplesPerBlock - 2;
21
22 while (samplesRemaining > 0)
23 {
diff --git a/meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/audiofile-0.2.6.patch b/meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/audiofile-0.2.6.patch
deleted file mode 100644
index b73db7efdd..0000000000
--- a/meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/audiofile-0.2.6.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1--- test/instparamtest.c
2+++ test/instparamtest.c
3@@ -74,4 +74,5 @@
4 printf("release loop id: %ld\n", result);
5
6 afCloseFile(file);
7+ return 0;
8 }
9--- test/instparamwrite.c
10+++ test/instparamwrite.c
11@@ -52,4 +52,5 @@
12 afSetInstParamLong(file, AF_DEFAULT_INST, AF_INST_NUMCENTS_DETUNE, -30);
13
14 afCloseFile(file);
15+ return 0;
16 }
17--- test/loop.c
18+++ test/loop.c
19@@ -34,4 +34,5 @@
20 afSetLoopEnd(file, AF_DEFAULT_INST, 2, 4);
21
22 afCloseFile(file);
23+ return 0;
24 }
25--- test/twentyfour.c.xx 2005-09-16 22:38:59.000000000 +0200
26+++ test/twentyfour.c 2005-09-16 22:39:53.000000000 +0200
27@@ -36,7 +36,9 @@
28 #endif
29
30 #include <stdio.h>
31+#include <string.h>
32 #include <stdlib.h>
33+#include <unistd.h>
34 #include <audiofile.h>
35 #include <assert.h>
36
37--- test/pipe.c.xx 2005-09-16 22:39:36.000000000 +0200
38+++ test/pipe.c 2005-09-16 22:39:42.000000000 +0200
39@@ -36,6 +36,7 @@
40
41 #include <audiofile.h>
42 #include <stdio.h>
43+#include <string.h>
44 #include <stdlib.h>
45
46 #define SAMPLE_COUNT 12
47--- test/error.c.xx 2005-09-16 22:40:02.000000000 +0200
48+++ test/error.c 2005-09-16 22:40:11.000000000 +0200
49@@ -25,6 +25,7 @@
50
51 #include <stdio.h>
52 #include <stdlib.h>
53+#include <string.h>
54 #include <audiofile.h>
55
56 int expectedError;
57--- test/testmarkers.c.xx 2005-09-16 22:40:21.000000000 +0200
58+++ test/testmarkers.c 2005-09-16 22:40:41.000000000 +0200
59@@ -25,6 +25,8 @@
60
61 #include <stdio.h>
62 #include <stdlib.h>
63+#include <string.h>
64+#include <unistd.h>
65 #include <assert.h>
66 #include <audiofile.h>
67
diff --git a/meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/audiofile-m4_quote_fix.diff b/meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/audiofile-m4_quote_fix.diff
deleted file mode 100644
index 1c02bf86ea..0000000000
--- a/meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/audiofile-m4_quote_fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
1--- audiofile.m4
2+++ audiofile.m4
3@@ -9,7 +9,7 @@
4 dnl AM_PATH_AUDIOFILE([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
5 dnl Test for Audio File Library, and define AUDIOFILE_CFLAGS and AUDIOFILE_LIBS.
6 dnl
7-AC_DEFUN(AM_PATH_AUDIOFILE,
8+AC_DEFUN([AM_PATH_AUDIOFILE],
9 [dnl
10 dnl Get compiler flags and libraries from the audiofile-config script.
11 dnl
diff --git a/meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/audiofile-oldstyle.patch b/meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/audiofile-oldstyle.patch
deleted file mode 100644
index 1b21150d8c..0000000000
--- a/meta-oe/recipes-multimedia/audiofile/audiofile-0.2.6/audiofile-oldstyle.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1--- libaudiofile/g711.c
2+++ libaudiofile/g711.c
3@@ -81,10 +81,7 @@
4 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF};
5
6 static int
7-search(val, table, size)
8- int val;
9- short *table;
10- int size;
11+search(int val, short int *table, int size)
12 {
13 int i;
14
15@@ -115,8 +112,8 @@
16 * John Wiley & Sons, pps 98-111 and 472-476.
17 */
18 unsigned char
19-_af_linear2alaw(pcm_val)
20- int pcm_val; /* 2's complement (16-bit range) */
21+_af_linear2alaw(int pcm_val)
22+ /* 2's complement (16-bit range) */
23 {
24 int mask;
25 int seg;
26@@ -151,8 +148,7 @@
27 *
28 */
29 int
30-_af_alaw2linear(a_val)
31- unsigned char a_val;
32+_af_alaw2linear(unsigned char a_val)
33 {
34 int t;
35 int seg;
36@@ -269,8 +265,7 @@
37
38 /* A-law to u-law conversion */
39 static unsigned char
40-alaw2ulaw(aval)
41- unsigned char aval;
42+alaw2ulaw(unsigned char aval)
43 {
44 aval &= 0xff;
45 return ((aval & 0x80) ? (0xFF ^ _a2u[aval ^ 0xD5]) :
46@@ -279,8 +274,7 @@
47
48 /* u-law to A-law conversion */
49 static unsigned char
50-ulaw2alaw(uval)
51- unsigned char uval;
52+ulaw2alaw(unsigned char uval)
53 {
54 uval &= 0xff;
55 return ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) :
diff --git a/meta-oe/recipes-multimedia/audiofile/audiofile_0.2.6.bb b/meta-oe/recipes-multimedia/audiofile/audiofile_0.2.7.bb
index ed273c80eb..a21bec6b15 100644
--- a/meta-oe/recipes-multimedia/audiofile/audiofile_0.2.6.bb
+++ b/meta-oe/recipes-multimedia/audiofile/audiofile_0.2.7.bb
@@ -2,19 +2,15 @@ DESCRIPTION = "The Audio File Library provides a uniform and elegant \
2API for accessing a variety of audio file formats, such as AIFF/AIFF-C, \ 2API for accessing a variety of audio file formats, such as AIFF/AIFF-C, \
3WAVE, NeXT/Sun .snd/.au, Berkeley/IRCAM/CARL Sound File, Audio Visual \ 3WAVE, NeXT/Sun .snd/.au, Berkeley/IRCAM/CARL Sound File, Audio Visual \
4Research, Amiga IFF/8SVX, and NIST SPHERE." 4Research, Amiga IFF/8SVX, and NIST SPHERE."
5HOMEPAGE = "http://www.68k.org/~michael/audiofile/"
5SECTION = "libs" 6SECTION = "libs"
6LICENSE = "LGPLv2 && GPLv2" 7LICENSE = "LGPLv2 && GPLv2"
7LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
8 file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3" 9 file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
10PR = "r0"
9 11
10SRC_URI = "http://www.68k.org/~michael/audiofile/audiofile-${PV}.tar.gz \ 12SRC_URI = "http://www.68k.org/~michael/audiofile/${PN}-${PV}.tar.gz"
11 file://audiofile-m4_quote_fix.diff;striplevel=0 \ 13SRC_URI[md5sum] = "a39be317a7b1971b408805dc5e371862"
12 file://audiofile-oldstyle.patch;striplevel=0 \ 14SRC_URI[sha256sum] = "a61c4036c2600a645843f16bec4be166093a9df5f15b02c85291213aa9cf15a2"
13 file://audiofile-0.2.6.patch;striplevel=0 \
14 file://CVE-2008-5824.patch \
15"
16 15
17inherit autotools lib_package binconfig 16inherit autotools lib_package binconfig
18
19SRC_URI[md5sum] = "9c1049876cd51c0f1b12c2886cce4d42"
20SRC_URI[sha256sum] = "4b6167b56e21556fb07c9ef06962fe32817064c62181ba47afd3322e0d0f22a9"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-02-26 14:25:51 +0000