cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to celt-0.11.3

Browse Source 
ok ajacoutot@
This commit is contained in:
dcoppa 2012-04-20 13:25:34 +00:00
parent c454617982
commit 9e7619ca15
8 changed files with 59 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/celt/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2012/03/29 13:38:13 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2012/04/20 13:25:34 dcoppa Exp $
COMMENT = ultra-low delay audio codec
DISTNAME = celt-0.10.0
DISTNAME = celt-0.11.3
EPOCH = 0
@ -10,7 +10,7 @@ CATEGORIES = audio
HOMEPAGE = http://www.celt-codec.org/
SHARED_LIBS += celt0 0.0 # 1.0
SHARED_LIBS += celt0 1.0 # 2.0
# BSD
PERMIT_PACKAGE_CDROM = Yes
@ -29,6 +29,8 @@ USE_LIBTOOL = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
--enable-assertions \
--enable-custom-modes \
--with-ogg=${LOCALBASE}
CONFIGURE_ENV = CPPFLAGS="-DUSE_SNDIO"

10
audio/celt/distinfo
View File

@ -1,5 +1,5 @@
MD5 (celt-0.10.0.tar.gz) = plb2F26b6EAnwOUc7t1xDw==
RMD160 (celt-0.10.0.tar.gz) = k1aqzfoeNTxb/xV9/s4HPqsT08g=
SHA1 (celt-0.10.0.tar.gz) = EStkHlanwOp7HDURrBcW+dSo6lQ=
SHA256 (celt-0.10.0.tar.gz) = FHxbyMajeyrSyLivF8kcs1SUQh7JtoEQAYpLzscuRdw=
SIZE (celt-0.10.0.tar.gz) = 435953
MD5 (celt-0.11.3.tar.gz) = VRFzKkJsxCv5hsp5tc3QLw==
RMD160 (celt-0.11.3.tar.gz) = rl+t0+Dvbg+tZv2z3IHOOQynbKI=
SHA1 (celt-0.11.3.tar.gz) = dzC5amYVGDUF5f8jzZtP6oNUDhU=
SHA256 (celt-0.11.3.tar.gz) = fmSBXUqKAJ0CgOzSNevZF9o6vc/Y99CBIhjAhflICDY=
SIZE (celt-0.11.3.tar.gz) = 465020

12
audio/celt/patches/patch-configure
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-configure,v 1.1 2011/08/28 14:13:51 naddy Exp $
$OpenBSD: patch-configure,v 1.2 2012/04/20 13:25:34 dcoppa 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"
--- configure.orig Mon Mar 14 23:05:13 2011
+++ configure Wed Apr 18 11:19:35 2012
@@ -11789,7 +11789,7 @@ CFLAGS="$saved_CFLAGS $SYMBOL_VISIBILITY"
fi
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
for ac_func in lrintf

23
audio/celt/patches/patch-libcelt_celt_c
View File

@ -1,12 +1,10 @@
$OpenBSD: patch-libcelt_celt_c,v 1.4 2011/08/28 14:13:51 naddy Exp $
$OpenBSD: patch-libcelt_celt_c,v 1.5 2012/04/20 13:25:34 dcoppa Exp $
Allow building with gcc3.
Missing commas (from upstream git)
--- libcelt/celt.c.orig Tue Dec 21 03:14:48 2010
+++ libcelt/celt.c Tue Aug 23 20:59:10 2011
@@ -316,8 +316,8 @@ static void compute_mdcts(const CELTMode *mode, int sh
--- libcelt/celt.c.orig Fri Mar 11 23:38:07 2011
+++ libcelt/celt.c Wed Apr 18 11:19:35 2012
@@ -400,8 +400,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,
@ -17,16 +15,3 @@ Missing commas (from upstream git)
{
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] = {
{0, -1, 0, -1, 0,-1, 0,-1},
- {0, -1, 0, -2, 1, 0, 1 -1},
- {0, -2, 0, -3, 2, 0, 1 -1},
- {0, -2, 0, -3, 2, 0, 1 -1},
+ {0, -1, 0, -2, 1, 0, 1,-1},
+ {0, -2, 0, -3, 2, 0, 1,-1},
+ {0, -2, 0, -3, 2, 0, 1,-1},
};
static celt_word32 l1_metric(const celt_norm *tmp, int N, int LM, int width)

14
audio/celt/patches/patch-libcelt_pitch_c
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-libcelt_pitch_c,v 1.3 2011/08/28 14:13:51 naddy Exp $
$OpenBSD: patch-libcelt_pitch_c,v 1.4 2012/04/20 13:25:34 dcoppa 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
--- libcelt/pitch.c.orig Wed Apr 18 11:22:14 2012
+++ libcelt/pitch.c Wed Apr 18 11:22:53 2012
@@ -99,7 +99,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)
-void pitch_downsample(celt_sig * restrict x[], celt_word16 * restrict x_lp,
+void pitch_downsample(celt_sig * restrict * x, celt_word16 * restrict x_lp,
int len, int _C)
{
int i;
celt_word32 ac[5];

16
audio/celt/patches/patch-libcelt_pitch_h
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-libcelt_pitch_h,v 1.1 2011/08/28 14:13:51 naddy Exp $
$OpenBSD: patch-libcelt_pitch_h,v 1.2 2012/04/20 13:25:34 dcoppa 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 @@
--- libcelt/pitch.h.orig Wed Apr 18 11:22:18 2012
+++ libcelt/pitch.h Wed Apr 18 11:23:14 2012
@@ -37,7 +37,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_downsample(celt_sig * restrict x[], celt_word16 * restrict x_lp,
+void pitch_downsample(celt_sig * restrict * x, celt_word16 * restrict x_lp,
int len, int _C);
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);
void pitch_search(const celt_word16 * restrict x_lp, celt_word16 * restrict y,

8
audio/celt/patches/patch-tools_Makefile_in
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-tools_Makefile_in,v 1.3 2011/04/05 14:17:55 dcoppa Exp $
$OpenBSD: patch-tools_Makefile_in,v 1.4 2012/04/20 13:25:34 dcoppa Exp $
Use sndio for audio
--- tools/Makefile.in.orig Thu Dec 2 08:12:27 2010
+++ tools/Makefile.in Thu Dec 2 08:13:31 2010
@@ -237,7 +237,8 @@ noinst_HEADERS = wav_io.h
--- tools/Makefile.in.orig Mon Mar 14 23:05:12 2011
+++ tools/Makefile.in Wed Apr 18 09:13:34 2012
@@ -236,7 +236,8 @@ noinst_HEADERS = wav_io.h
celtenc_SOURCES = celtenc.c wav_io.c skeleton.c
celtenc_LDADD = $(top_builddir)/libcelt/libcelt@LIBCELT_SUFFIX@.la $(OGG_LIBS)
celtdec_SOURCES = celtdec.c wav_io.c

30
audio/celt/patches/patch-tools_celtdec_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-tools_celtdec_c,v 1.3 2011/04/05 14:17:55 dcoppa Exp $
$OpenBSD: patch-tools_celtdec_c,v 1.4 2012/04/20 13:25:34 dcoppa Exp $
Use sndio for audio
--- tools/celtdec.c.orig Thu Dec 2 08:16:46 2010
+++ tools/celtdec.c Thu Dec 2 08:17:40 2010
@@ -70,6 +70,9 @@
--- tools/celtdec.c.orig Mon Mar 14 14:16:13 2011
+++ tools/celtdec.c Fri Apr 20 09:40:30 2012
@@ -66,6 +66,9 @@
#include <fcntl.h>
#include <sys/ioctl.h>
@ -14,7 +14,7 @@ Use sndio for audio
#elif defined HAVE_SYS_AUDIOIO_H
#include <sys/types.h>
#include <fcntl.h>
@@ -92,6 +95,10 @@
@@ -88,6 +91,10 @@
((buf[base+1]<<8)&0xff00)| \
(buf[base]&0xff))
@ -25,7 +25,7 @@ Use sndio for audio
static void print_comments(char *comments, int length)
{
char *c=comments;
@@ -187,6 +194,32 @@ FILE *out_file_open(char *outFile, int rate, int *chan
@@ -183,6 +190,32 @@ FILE *out_file_open(char *outFile, int rate, int *chan
exit(1);
}
fout = fdopen(audio_fd, "w");
@ -58,14 +58,24 @@ Use sndio for audio
#elif defined HAVE_SYS_AUDIOIO_H
audio_info_t info;
int audio_fd;
@@ -615,6 +648,10 @@ int main(int argc, char **argv)
#if defined WIN32 || defined _WIN32
@@ -612,6 +645,10 @@ int main(int argc, char **argv)
if (strlen(outFile)==0)
WIN_Play_Samples (out+frame_offset*channels, sizeof(short) * new_frame_size*channels);
+ else
else
+#elif defined USE_SNDIO
+ if (strlen(outFile)==0)
+ sio_write (hdl, out+frame_offset*channels, sizeof(short) * new_frame_size*channels);
else
+ else
#endif
fwrite(out+frame_offset*channels, sizeof(short), new_frame_size*channels, fout);
@@ -668,6 +705,9 @@ int main(int argc, char **argv)
fclose(fin);
if (fout != NULL)
fclose(fout);
+
+ if (print_bitrate)
+ fprintf (stderr, "\n");
return 0;
}