Hi, Update audio/celt to its latest version and fix depending ports.
OK? Index: audio/celt/Makefile =================================================================== RCS file: /cvs/ports/audio/celt/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- audio/celt/Makefile 29 Mar 2012 13:38:13 -0000 1.6 +++ audio/celt/Makefile 20 Apr 2012 08:14:48 -0000 @@ -2,7 +2,7 @@ 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" Index: audio/celt/distinfo =================================================================== RCS file: /cvs/ports/audio/celt/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- audio/celt/distinfo 5 Apr 2011 14:17:55 -0000 1.4 +++ audio/celt/distinfo 20 Apr 2012 08:14:48 -0000 @@ -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 Index: audio/celt/patches/patch-configure =================================================================== RCS file: /cvs/ports/audio/celt/patches/patch-configure,v retrieving revision 1.1 diff -u -p -r1.1 patch-configure --- audio/celt/patches/patch-configure 28 Aug 2011 14:13:51 -0000 1.1 +++ audio/celt/patches/patch-configure 20 Apr 2012 08:14:48 -0000 @@ -2,14 +2,14 @@ $OpenBSD: patch-configure,v 1.1 2011/08/ -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 Index: audio/celt/patches/patch-libcelt_celt_c =================================================================== RCS file: /cvs/ports/audio/celt/patches/patch-libcelt_celt_c,v retrieving revision 1.4 diff -u -p -r1.4 patch-libcelt_celt_c --- audio/celt/patches/patch-libcelt_celt_c 28 Aug 2011 14:13:51 -0000 1.4 +++ audio/celt/patches/patch-libcelt_celt_c 20 Apr 2012 08:14:48 -0000 @@ -2,11 +2,9 @@ $OpenBSD: patch-libcelt_celt_c,v 1.4 201 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) Index: audio/celt/patches/patch-libcelt_pitch_c =================================================================== RCS file: /cvs/ports/audio/celt/patches/patch-libcelt_pitch_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-libcelt_pitch_c --- audio/celt/patches/patch-libcelt_pitch_c 28 Aug 2011 14:13:51 -0000 1.3 +++ audio/celt/patches/patch-libcelt_pitch_c 20 Apr 2012 08:14:48 -0000 @@ -2,14 +2,14 @@ $OpenBSD: patch-libcelt_pitch_c,v 1.3 20 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]; Index: audio/celt/patches/patch-libcelt_pitch_h =================================================================== RCS file: /cvs/ports/audio/celt/patches/patch-libcelt_pitch_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-libcelt_pitch_h --- audio/celt/patches/patch-libcelt_pitch_h 28 Aug 2011 14:13:51 -0000 1.1 +++ audio/celt/patches/patch-libcelt_pitch_h 20 Apr 2012 08:14:48 -0000 @@ -2,14 +2,14 @@ $OpenBSD: patch-libcelt_pitch_h,v 1.1 20 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, Index: audio/celt/patches/patch-tools_Makefile_in =================================================================== RCS file: /cvs/ports/audio/celt/patches/patch-tools_Makefile_in,v retrieving revision 1.3 diff -u -p -r1.3 patch-tools_Makefile_in --- audio/celt/patches/patch-tools_Makefile_in 5 Apr 2011 14:17:55 -0000 1.3 +++ audio/celt/patches/patch-tools_Makefile_in 20 Apr 2012 08:14:48 -0000 @@ -2,9 +2,9 @@ $OpenBSD: patch-tools_Makefile_in,v 1.3 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 Index: audio/celt/patches/patch-tools_celtdec_c =================================================================== RCS file: /cvs/ports/audio/celt/patches/patch-tools_celtdec_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-tools_celtdec_c --- audio/celt/patches/patch-tools_celtdec_c 5 Apr 2011 14:17:55 -0000 1.3 +++ audio/celt/patches/patch-tools_celtdec_c 20 Apr 2012 08:14:48 -0000 @@ -2,9 +2,9 @@ $OpenBSD: patch-tools_celtdec_c,v 1.3 20 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; + } Index: audio/jack/Makefile =================================================================== RCS file: /cvs/ports/audio/jack/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- audio/jack/Makefile 24 Jan 2012 08:03:52 -0000 1.20 +++ audio/jack/Makefile 20 Apr 2012 08:14:49 -0000 @@ -7,6 +7,7 @@ COMMENT = low latency sound server V = 0.121.3 DISTNAME = jack-audio-connection-kit-${V} PKGNAME = jack-${V} +REVISION = 0 SHARED_LIBS += jack 0.0 # 0.28 SHARED_LIBS += jackserver 0.0 # 0.28 @@ -22,14 +23,14 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB += c celt0 m pthread readline samplerate sndfile sndio -WANTLIB += termcap +WANTLIB += c celt0>=1 m pthread readline samplerate sndfile +WANTLIB += sndio termcap MASTER_SITES = ${HOMEPAGE}downloads/ LIB_DEPENDS = audio/libsndfile \ audio/libsamplerate \ - audio/celt + audio/celt>=0.11.0 # uses macros from libtool.m4 BUILD_DEPENDS = devel/libtool Index: audio/jack/patches/patch-drivers_netjack_netjack_c =================================================================== RCS file: audio/jack/patches/patch-drivers_netjack_netjack_c diff -N audio/jack/patches/patch-drivers_netjack_netjack_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ audio/jack/patches/patch-drivers_netjack_netjack_c 20 Apr 2012 08:14:49 -0000 @@ -0,0 +1,24 @@ +$OpenBSD$ + +Fix with celt>=0.11 + +--- drivers/netjack/netjack.c.orig Wed Apr 18 13:04:54 2012 ++++ drivers/netjack/netjack.c Wed Apr 18 13:05:48 2012 +@@ -407,7 +407,7 @@ void netjack_attach( netjack_driver_state_t *netj ) + if( netj->bitdepth == CELT_MODE ) { + #if HAVE_CELT + #if HAVE_CELT_API_0_7 || HAVE_CELT_API_0_8 +- netj->capture_srcs = jack_slist_append(netj->capture_srcs, celt_decoder_create( netj->celt_mode, 1, NULL ) ); ++ netj->capture_srcs = jack_slist_append(netj->capture_srcs, celt_decoder_create_custom( netj->celt_mode, 1, NULL ) ); + #else + netj->capture_srcs = jack_slist_append(netj->capture_srcs, celt_decoder_create( netj->celt_mode ) ); + #endif +@@ -454,7 +454,7 @@ void netjack_attach( netjack_driver_state_t *netj ) + #if HAVE_CELT + #if HAVE_CELT_API_0_7 || HAVE_CELT_API_0_8 + CELTMode *celt_mode = celt_mode_create( netj->sample_rate, netj->period_size, NULL ); +- netj->playback_srcs = jack_slist_append(netj->playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) ); ++ netj->playback_srcs = jack_slist_append(netj->playback_srcs, celt_encoder_create_custom( celt_mode, 1, NULL ) ); + #else + CELTMode *celt_mode = celt_mode_create( netj->sample_rate, 1, netj->period_size, NULL ); + netj->playback_srcs = jack_slist_append(netj->playback_srcs, celt_encoder_create( celt_mode ) ); Index: audio/jack/patches/patch-tools_netsource_c =================================================================== RCS file: audio/jack/patches/patch-tools_netsource_c diff -N audio/jack/patches/patch-tools_netsource_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ audio/jack/patches/patch-tools_netsource_c 20 Apr 2012 08:14:49 -0000 @@ -0,0 +1,24 @@ +$OpenBSD$ + +Fix with celt>=0.11 + +--- tools/netsource.c.orig Wed Apr 18 13:06:08 2012 ++++ tools/netsource.c Wed Apr 18 13:06:50 2012 +@@ -139,7 +139,7 @@ alloc_ports (int n_capture_audio, int n_playback_audio + #if HAVE_CELT + #if HAVE_CELT_API_0_7 || HAVE_CELT_API_0_8 + CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), jack_get_buffer_size(client), NULL ); +- capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode, 1, NULL ) ); ++ capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create_custom( celt_mode, 1, NULL ) ); + #else + CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate( client ), 1, jack_get_buffer_size(client), NULL ); + capture_srcs = jack_slist_append(capture_srcs, celt_decoder_create( celt_mode ) ); +@@ -182,7 +182,7 @@ alloc_ports (int n_capture_audio, int n_playback_audio + #if HAVE_CELT + #if HAVE_CELT_API_0_7 || HAVE_CELT_API_0_8 + CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), jack_get_buffer_size(client), NULL ); +- playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode, 1, NULL ) ); ++ playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create_custom( celt_mode, 1, NULL ) ); + #else + CELTMode *celt_mode = celt_mode_create( jack_get_sample_rate (client), 1, jack_get_buffer_size(client), NULL ); + playback_srcs = jack_slist_append(playback_srcs, celt_encoder_create( celt_mode ) ); Index: net/opal/Makefile =================================================================== RCS file: /cvs/ports/net/opal/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- net/opal/Makefile 2 Mar 2012 09:04:21 -0000 1.20 +++ net/opal/Makefile 20 Apr 2012 08:15:52 -0000 @@ -6,6 +6,8 @@ COMMENT= Open Phone Abstraction Library DISTNAME= opal-3.10.4 +REVISION= 0 + SHARED_LIBS= opal 2.0 # 3.10.3 EXTRACT_SUFX= .tar.bz2 @@ -22,13 +24,13 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += c celt0 crypto gsm m ogg pt pthread spandsp speex speexdsp -WANTLIB += stdc++ theora tiff x264 +WANTLIB += c celt0>=1 crypto gsm m ogg pt pthread spandsp speex +WANTLIB += speexdsp stdc++ theora tiff x264 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opalvoip/} LIB_DEPENDS= devel/ptlib>=2.10.4 \ - audio/celt \ + audio/celt>=0.11.0 \ telephony/spandsp # dlopen(3) libavcodec.so; shows as Extra: in check-lib-depends but Index: net/opal/patches/patch-plugins_audio_celt_celtcodec_c =================================================================== RCS file: net/opal/patches/patch-plugins_audio_celt_celtcodec_c diff -N net/opal/patches/patch-plugins_audio_celt_celtcodec_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ net/opal/patches/patch-plugins_audio_celt_celtcodec_c 20 Apr 2012 08:15:52 -0000 @@ -0,0 +1,24 @@ +$OpenBSD$ + +Fix with celt>=0.11 + +--- plugins/audio/celt/celtcodec.c.orig Wed Apr 18 13:45:31 2012 ++++ plugins/audio/celt/celtcodec.c Wed Apr 18 13:46:04 2012 +@@ -83,7 +83,7 @@ static void * celt_create_encoder(const struct PluginC + #if CELT_VERSION<700 + celt->encoder_state = celt_encoder_create(celt->mode); + #else +- celt->encoder_state = celt_encoder_create(celt->mode, 1, NULL); ++ celt->encoder_state = celt_encoder_create_custom(celt->mode, 1, NULL); + #endif + if (celt->encoder_state == NULL ) { + celt_mode_destroy(celt->mode); +@@ -109,7 +109,7 @@ static void * celt_create_decoder(const struct PluginC + #if CELT_VERSION<700 + celt->decoder_state = celt_decoder_create(celt->mode); + #else +- celt->decoder_state = celt_decoder_create(celt->mode, 1, NULL); ++ celt->decoder_state = celt_decoder_create_custom(celt->mode, 1, NULL); + #endif + if (celt->decoder_state == NULL ) { + celt_mode_destroy(celt->mode);
