Date: Fri, 13 Nov 2009 22:58:05 +0100 (CET) From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: melifaro@ipfw.ru Subject: ports/140540: [PATCH] net/opal3: fix build after audio/celt update Message-ID: <20091113215805.256CF39B2C@pin.if.uz.zgora.pl> Resent-Message-ID: <200911132200.nADM0262033175@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 140540
>Category: ports
>Synopsis: [PATCH] net/opal3: fix build after audio/celt update
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 13 22:00:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Edward Tomasz Napierala
>Release: FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD pin.if.uz.zgora.pl 7.2-STABLE FreeBSD 7.2-STABLE #0: Sat Oct 3 02:15:11 CEST
>Description:
Fix build after audio/celt update.
Added file(s):
- files/patch-plugins-audio-celt-celtcodec.c
Port maintainer (melifaro@ipfw.ru) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- opal3-3.6.6_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/opal3/Makefile /home/trasz/opal3/Makefile
--- /usr/ports/net/opal3/Makefile 2009-10-20 08:26:32.000000000 +0200
+++ /home/trasz/opal3/Makefile 2009-11-13 22:56:50.000000000 +0100
@@ -7,7 +7,7 @@
PORTNAME= opal3
PORTVERSION= 3.6.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SF/opalvoip/v3.6%20Lalande/Stable%205
DISTNAME= opal-${PORTVERSION}
diff -ruN --exclude=CVS /usr/ports/net/opal3/files/patch-plugins-audio-celt-celtcodec.c /home/trasz/opal3/files/patch-plugins-audio-celt-celtcodec.c
--- /usr/ports/net/opal3/files/patch-plugins-audio-celt-celtcodec.c 1970-01-01 01:00:00.000000000 +0100
+++ /home/trasz/opal3/files/patch-plugins-audio-celt-celtcodec.c 2009-11-13 22:56:49.000000000 +0100
@@ -0,0 +1,41 @@
+--- 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,
+ {
+ int error = 0;
+
+- celt->mode = celt_mode_create(codec->sampleRate, 1, codec->parm.audio.samplesPerFrame, &error);
++ celt->mode = celt_mode_create(codec->sampleRate, codec->parm.audio.samplesPerFrame, &error);
+ if (celt->mode == NULL) {
+ return FALSE;
+ }
+@@ -74,7 +74,7 @@ static void * celt_create_encoder(const
+ return NULL;
+ }
+
+- celt->encoder_state = celt_encoder_create(celt->mode);
++ celt->encoder_state = celt_encoder_create(celt->mode, 1, NULL);
+ if (celt->encoder_state == NULL ) {
+ celt_mode_destroy(celt->mode);
+ free(celt);
+@@ -96,7 +96,7 @@ static void * celt_create_decoder(const
+ return NULL;
+ }
+
+- celt->decoder_state = celt_decoder_create(celt->mode);
++ celt->decoder_state = celt_decoder_create(celt->mode, 1, NULL);
+ if (celt->decoder_state == NULL ) {
+ celt_mode_destroy(celt->mode);
+ free(celt);
+@@ -143,9 +143,9 @@ static int celt_codec_encoder(const stru
+ 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);
+ #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;
--- opal3-3.6.6_2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091113215805.256CF39B2C>