aboutsummaryrefslogtreecommitdiffstats
path: root/net/opal3
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2011-04-12 18:36:16 +0800
committerbapt <bapt@FreeBSD.org>2011-04-12 18:36:16 +0800
commitc968cb9e3ef44a49b192ea4db04001c4ec011f0c (patch)
tree2c5cd96f1187b4be7def987f7e0169b28c932566 /net/opal3
parentb86f84e54b5a3f757323c1d3f6b82b7eb0c7e63f (diff)
downloadfreebsd-ports-gnome-c968cb9e3ef44a49b192ea4db04001c4ec011f0c.tar.gz
freebsd-ports-gnome-c968cb9e3ef44a49b192ea4db04001c4ec011f0c.tar.zst
freebsd-ports-gnome-c968cb9e3ef44a49b192ea4db04001c4ec011f0c.zip
- chase celt library bump
Diffstat (limited to 'net/opal3')
-rw-r--r--net/opal3/Makefile4
-rw-r--r--net/opal3/files/patch-plugins-audio-celt-celtcodec.c29
2 files changed, 24 insertions, 9 deletions
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index 3b95a389bc7a..2372972e3020 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= opal3
PORTVERSION= 3.6.6
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= net
MASTER_SITES= SF/opalvoip/v3.6%20Lalande/Stable%205
DISTNAME= opal-${PORTVERSION}
@@ -98,7 +98,7 @@ CONFIGURE_ARGS+= --disable-java
.endif
.if defined(WITH_CELT)
-LIB_DEPENDS+= celt.0:${PORTSDIR}/audio/celt
+LIB_DEPENDS+= celt0.2:${PORTSDIR}/audio/celt
CONFIGURE_ARGS+= --enable-celt
PLIST_SUB+= CELT=""
.else
diff --git a/net/opal3/files/patch-plugins-audio-celt-celtcodec.c b/net/opal3/files/patch-plugins-audio-celt-celtcodec.c
index 9094b5b10118..823bca9cfb3c 100644
--- a/net/opal3/files/patch-plugins-audio-celt-celtcodec.c
+++ b/net/opal3/files/patch-plugins-audio-celt-celtcodec.c
@@ -1,6 +1,6 @@
---- plugins/audio/celt/celtcodec.c.orig 2009-09-22 02:57:45.000000000 +0200
-+++ plugins/audio/celt/celtcodec.c 2009-11-13 22:00:39.000000000 +0100
-@@ -52,7 +52,7 @@ static int init_mode(CELTContext *celt,
+--- ./plugins/audio/celt/celtcodec.c.orig 2009-09-22 02:57:45.000000000 +0200
++++ ./plugins/audio/celt/celtcodec.c 2011-04-12 12:26:00.485668577 +0200
+@@ -52,12 +52,12 @@
{
int error = 0;
@@ -9,7 +9,13 @@
if (celt->mode == NULL) {
return FALSE;
}
-@@ -74,7 +74,7 @@ static void * celt_create_encoder(const
+
+- celt_mode_info(celt->mode, CELT_GET_FRAME_SIZE, &celt->frame_size);
++ celt->frame_size = 960; /* default from tools/celtenc.c */
+ celt->bytes_per_packet = (codec->bitsPerSec * celt->frame_size/codec->sampleRate + 4) / 8;
+
+ return TRUE;
+@@ -74,7 +74,7 @@
return NULL;
}
@@ -18,7 +24,7 @@
if (celt->encoder_state == NULL ) {
celt_mode_destroy(celt->mode);
free(celt);
-@@ -96,7 +96,7 @@ static void * celt_create_decoder(const
+@@ -96,7 +96,7 @@
return NULL;
}
@@ -27,15 +33,24 @@
if (celt->decoder_state == NULL ) {
celt_mode_destroy(celt->mode);
free(celt);
-@@ -143,9 +143,9 @@ static int celt_codec_encoder(const stru
+@@ -143,9 +143,9 @@
return FALSE;
#ifdef HAVE_CELT_0_5_0_OR_LATER
- byteCount = celt_encode(celt->encoder_state, (celt_int16_t *)fromPtr, NULL, (char *)toPtr, celt->bytes_per_packet);
-+ byteCount = celt_encode(celt->encoder_state, (celt_int16 *)fromPtr, NULL, (char *)toPtr, celt->bytes_per_packet);
++ byteCount = celt_encode(celt->encoder_state, (celt_int16 *)fromPtr, celt->frame_size, (char *)toPtr, celt->bytes_per_packet);
#else
- byteCount = celt_encode(celt->encoder_state, (celt_int16_t *)fromPtr, (char *)toPtr, celt->bytes_per_packet);
+ byteCount = celt_encode(celt->encoder_state, (celt_int16 *)fromPtr, (char *)toPtr, celt->bytes_per_packet);
#endif
if (byteCount < 0) {
return 0;
+@@ -173,7 +173,7 @@
+ if (*fromLen == 0)
+ return FALSE;
+
+- if (celt_decode(celt->decoder_state, (char *)fromPtr, *fromLen, (short *)toPtr) < 0) {
++ if (celt_decode(celt->decoder_state, (char *)fromPtr, *fromLen, (short *)toPtr, celt->frame_size) < 0) {
+ return 0;
+ }
+