Author: arekm Date: Fri Nov 26 19:56:06 2010 GMT Module: packages Tag: OPAL_3_6 ---- Log message: - rel 5; fix build with celt 0.9
---- Files affected: packages/opal: opal.spec (1.58.2.1 -> 1.58.2.2) , opal-celt.patch (NONE -> 1.2.2.1) (NEW) ---- Diffs: ================================================================ Index: packages/opal/opal.spec diff -u packages/opal/opal.spec:1.58.2.1 packages/opal/opal.spec:1.58.2.2 --- packages/opal/opal.spec:1.58.2.1 Mon Nov 15 07:00:49 2010 +++ packages/opal/opal.spec Fri Nov 26 20:56:00 2010 @@ -17,7 +17,7 @@ Summary(pl.UTF-8): Biblioteka Open Phone Abstraction Library (aka OpenH323 v2) Name: opal Version: 3.6.8 -Release: 4 +Release: 5 License: MPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/opal/3.6/%{name}-%{version}.tar.bz2 @@ -28,10 +28,11 @@ Patch2: %{name}-ac.patch Patch3: %{name}-build.patch Patch4: %{name}-ffmpeg06.patch +Patch5: %{name}-celt.patch URL: http://www.openh323.org/ BuildRequires: autoconf BuildRequires: automake -BuildRequires: celt-devel +BuildRequires: celt-devel >= 0.9 BuildRequires: expat-devel BuildRequires: libstdc++-devel BuildRequires: pkgconfig @@ -99,6 +100,7 @@ #%patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build PWLIBDIR=%{_prefix}; export PWLIBDIR @@ -224,6 +226,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.58.2.2 2010/11/26 19:56:00 arekm +- rel 5; fix build with celt 0.9 + Revision 1.58.2.1 2010/11/15 06:00:49 arekm - rel 4 ================================================================ Index: packages/opal/opal-celt.patch diff -u /dev/null packages/opal/opal-celt.patch:1.2.2.1 --- /dev/null Fri Nov 26 20:56:06 2010 +++ packages/opal/opal-celt.patch Fri Nov 26 20:56:00 2010 @@ -0,0 +1,29 @@ +--- opal-3.6.8/plugins/audio/celt.org/celtcodec.c 2010-05-27 08:52:43.000000000 +0200 ++++ opal-3.6.8/plugins/audio/celt/celtcodec.c 2010-11-26 20:34:35.418190801 +0100 +@@ -61,7 +61,7 @@ + return FALSE; + } + +- celt_mode_info(celt->mode, CELT_GET_FRAME_SIZE, &celt->frame_size); ++ celt->frame_size = 960; /* default from tools/celtenc.c, is this always correct? */ + celt->bytes_per_packet = (codec->bitsPerSec * celt->frame_size/codec->sampleRate + 4) / 8; + + return TRUE; +@@ -159,7 +159,7 @@ + #elif HAVE_CELT_0_5_0_OR_0_6_0 + byteCount = celt_encode(celt->encoder_state, (celt_int16_t *)fromPtr, NULL, (char *)toPtr, celt->bytes_per_packet); + #else +- byteCount = celt_encode(celt->encoder_state, (void *)fromPtr, NULL, (unsigned char *)toPtr, celt->bytes_per_packet); ++ byteCount = celt_encode(celt->encoder_state, (void *)fromPtr, celt->frame_size, (unsigned char *)toPtr, celt->bytes_per_packet); + #endif + if (byteCount < 0) { + return 0; +@@ -190,7 +190,7 @@ + #if defined (HAVE_CELT_0_4_OR_SOONER) || defined (HAVE_CELT_0_5_0_OR_0_6_0) + if (celt_decode(celt->decoder_state, (char *)fromPtr, *fromLen, (short *)toPtr) < 0) + #else +- if (celt_decode(celt->decoder_state, (unsigned char *)fromPtr, *fromLen, (short *)toPtr) < 0) ++ if (celt_decode(celt->decoder_state, (unsigned char *)fromPtr, *fromLen, (short *)toPtr, celt->frame_size) < 0) + #endif + return 0; + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opal/opal.spec?r1=1.58.2.1&r2=1.58.2.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
