allow this to build with gcc3

This commit is contained in:
naddy 2011-08-28 14:13:51 +00:00
parent 49e91c2d57
commit 921e3eb263
4 changed files with 60 additions and 2 deletions

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-configure,v 1.1 2011/08/28 14:13:51 naddy Exp $
-Wextra is not supported by gcc < 4.
--- configure.orig Tue Aug 23 19:02:06 2011
+++ configure Tue Aug 23 19:02:21 2011
@@ -11787,7 +11787,7 @@ CFLAGS="$saved_CFLAGS $SYMBOL_VISIBILITY"
if test $ac_cv_c_compiler_gnu = yes ; then
- CFLAGS="$CFLAGS -W -Wstrict-prototypes -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wno-parentheses -Wno-unused-parameter -Wno-sign-compare"
+ CFLAGS="$CFLAGS -W -Wstrict-prototypes -Wall -Wcast-align -Wnested-externs -Wshadow -Wno-parentheses -Wno-unused-parameter -Wno-sign-compare"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrintf" >&5

View File

@ -1,9 +1,22 @@
$OpenBSD: patch-libcelt_celt_c,v 1.3 2011/04/05 14:17:55 dcoppa Exp $
$OpenBSD: patch-libcelt_celt_c,v 1.4 2011/08/28 14:13:51 naddy Exp $
Allow building with gcc3.
Missing commas (from upstream git)
--- libcelt/celt.c.orig Tue Dec 21 03:14:48 2010
+++ libcelt/celt.c Thu Dec 30 14:11:11 2010
+++ libcelt/celt.c Tue Aug 23 20:59:10 2011
@@ -316,8 +316,8 @@ static void compute_mdcts(const CELTMode *mode, int sh
/** Compute the IMDCT and apply window for all sub-frames and
all channels in a frame */
static void compute_inv_mdcts(const CELTMode *mode, int shortBlocks, celt_sig *X,
- celt_sig * restrict out_mem[],
- celt_sig * restrict overlap_mem[], int _C, int LM)
+ celt_sig * restrict * out_mem,
+ celt_sig * restrict * overlap_mem, int _C, int LM)
{
int c;
const int C = CHANNELS(_C);
@@ -428,9 +428,9 @@ static void comb_filter(celt_word32 *y, celt_word32 *x
static const signed char tf_select_table[4][8] = {

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-libcelt_pitch_c,v 1.3 2011/08/28 14:13:51 naddy Exp $
Allow building with gcc3.
--- libcelt/pitch.c.orig Tue Aug 23 21:01:27 2011
+++ libcelt/pitch.c Tue Aug 23 21:01:45 2011
@@ -98,7 +98,7 @@ static void find_best_pitch(celt_word32 *xcorr, celt_w
}
#include "plc.h"
-void pitch_downsample(celt_sig * restrict x[], celt_word16 * restrict x_lp, int len, int end, int _C, celt_sig * restrict xmem, celt_word16 * restrict filt_mem)
+void pitch_downsample(celt_sig * restrict * x, celt_word16 * restrict x_lp, int len, int end, int _C, celt_sig * restrict xmem, celt_word16 * restrict filt_mem)
{
int i;
celt_word32 ac[5];

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-libcelt_pitch_h,v 1.1 2011/08/28 14:13:51 naddy Exp $
Allow building with gcc3.
--- libcelt/pitch.h.orig Tue Aug 23 20:57:39 2011
+++ libcelt/pitch.h Tue Aug 23 20:57:55 2011
@@ -41,7 +41,7 @@
#include "modes.h"
-void pitch_downsample(celt_sig * restrict x[], celt_word16 * restrict x_lp, int len, int end, int _C, celt_sig * restrict xmem, celt_word16 * restrict filt_mem);
+void pitch_downsample(celt_sig * restrict * x, celt_word16 * restrict x_lp, int len, int end, int _C, celt_sig * restrict xmem, celt_word16 * restrict filt_mem);
void pitch_search(const CELTMode *m, const celt_word16 * restrict x_lp, celt_word16 * restrict y,
int len, int max_pitch, int *pitch, celt_sig *xmem, int M);