Hello community, here is the log from the commit of package opal for openSUSE:Factory checked in at Mon Dec 20 13:25:39 CET 2010. -------- --- opal/opal.changes 2010-10-14 10:00:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/opal/opal.changes 2010-12-14 20:34:49.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 14 20:14:29 CET 2010 - vuntz@opensuse.org + +- Add opal-new-celt.patch to fix build with celt 0.9, on openSUSE + 11.4 and later. The patch is taken from PLD Linux. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- opal-new-celt.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opal.spec ++++++ --- /var/tmp/diff_new_pack.TbZqDR/_old 2010-12-20 13:19:57.000000000 +0100 +++ /var/tmp/diff_new_pack.TbZqDR/_new 2010-12-20 13:19:57.000000000 +0100 @@ -50,7 +50,7 @@ License: MPLv1.0 Group: System/Libraries Version: 3.6.8 -Release: 2 +Release: 3 # FIXME: we should probably list all plugins in %files to make sure we don't lose some when updating the package. %define _version 3_6_8 Source0: %{name}-%{version}.tar.bz2 @@ -69,6 +69,8 @@ Patch6: %{name}-x264.patch # PATCH-FIX-UPSTREAM %{name}-missing_links.patch sf#3082716 reddwarf@opensuse.org -- Fix underlinking and makes IxJ plugin installable Patch7: %{name}-missing_links.patch +# PATCH-FIX-UPSTREAM opal-new-celt.patch vuntz@opensuse.org -- Fix build with recent version of celt, taken from PLD Linux, http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opal/opal-celt.patch +Patch8: opal-new-celt.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -118,6 +120,9 @@ %patch5 %patch6 -p1 %patch7 +%if 0%{?suse_version} > 1130 +%patch8 -p1 +%endif # this subdir contains GPL - to avoid license issues delete it before build rm -rf plugins/LID/VPB ++++++ opal-new-celt.patch ++++++ Index: opal-3.6.8/plugins/audio/celt/celtcodec.c =================================================================== --- opal-3.6.8.orig/plugins/audio/celt/celtcodec.c +++ opal-3.6.8/plugins/audio/celt/celtcodec.c @@ -61,7 +61,7 @@ static int init_mode(CELTContext *celt, 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 @@ static int celt_codec_encoder(const stru #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 @@ static int celt_codec_decoder(const stru #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; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org