* [gentoo-commits] gentoo-x86 commit in net-libs/opal/files: opal-3.6.7-celt-0.7-update.patch
@ 2010-02-28 10:43 Peter Volkov (pva)
0 siblings, 0 replies; 2+ messages in thread
From: Peter Volkov (pva) @ 2010-02-28 10:43 UTC (permalink / raw
To: gentoo-commits
pva 10/02/28 10:43:11
Added: opal-3.6.7-celt-0.7-update.patch
Log:
Fixed build issue with newer celt codec, #300629 thank Matti Nykyri for report and Stefan Knoblich for this fix. Updated ptlib dep, bug #306141, thank Andrey Grozin for report.
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Revision Changes Path
1.1 net-libs/opal/files/opal-3.6.7-celt-0.7-update.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/opal/files/opal-3.6.7-celt-0.7-update.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/opal/files/opal-3.6.7-celt-0.7-update.patch?rev=1.1&content-type=text/plain
Index: opal-3.6.7-celt-0.7-update.patch
===================================================================
--- a/plugins/audio/celt/celtcodec.c
+++ b/plugins/audio/celt/celtcodec.c
@@ -52,7 +52,12 @@ static int init_mode(CELTContext *celt, const struct PluginCodec_Definition * co
{
int error = 0;
- celt->mode = celt_mode_create(codec->sampleRate, 1, codec->parm.audio.samplesPerFrame, &error);
+ celt->mode = celt_mode_create(codec->sampleRate,
+#if !defined(HAVE_CELT_0_7_0_OR_LATER)
+ 1,
+#endif
+ codec->parm.audio.samplesPerFrame,
+ &error);
if (celt->mode == NULL) {
return FALSE;
}
@@ -65,6 +70,9 @@ static int init_mode(CELTContext *celt, const struct PluginCodec_Definition * co
static void * celt_create_encoder(const struct PluginCodec_Definition * codec)
{
+#if defined(HAVE_CELT_0_7_0_OR_LATER)
+ int error = 0;
+#endif
CELTContext * celt = malloc(sizeof(CELTContext));
if (celt == NULL)
return NULL;
@@ -73,8 +81,12 @@ static void * celt_create_encoder(const struct PluginCodec_Definition * codec)
free(celt);
return NULL;
}
-
+
+#if defined(HAVE_CELT_0_7_0_OR_LATER)
+ celt->encoder_state = celt_encoder_create(celt->mode, 1, &error);
+#else
celt->encoder_state = celt_encoder_create(celt->mode);
+#endif
if (celt->encoder_state == NULL ) {
celt_mode_destroy(celt->mode);
free(celt);
@@ -87,6 +99,9 @@ static void * celt_create_encoder(const struct PluginCodec_Definition * codec)
static void * celt_create_decoder(const struct PluginCodec_Definition * codec)
{
+#if defined(HAVE_CELT_0_7_0_OR_LATER)
+ int error = 0;
+#endif
CELTContext * celt = malloc(sizeof(CELTContext));
if (celt == NULL)
return NULL;
@@ -96,7 +111,11 @@ static void * celt_create_decoder(const struct PluginCodec_Definition * codec)
return NULL;
}
+#if defined(HAVE_CELT_0_7_0_OR_LATER)
+ celt->decoder_state = celt_decoder_create(celt->mode, 1, &error);
+#else
celt->decoder_state = celt_decoder_create(celt->mode);
+#endif
if (celt->decoder_state == NULL ) {
celt_mode_destroy(celt->mode);
free(celt);
@@ -142,7 +161,9 @@ static int celt_codec_encoder(const struct PluginCodec_Definition * codec,
if (*toLen < celt->bytes_per_packet)
return FALSE;
-#ifdef HAVE_CELT_0_5_0_OR_LATER
+#if defined(HAVE_CELT_0_7_0_OR_LATER)
+ byteCount = celt_encode(celt->encoder_state, (celt_int16 *)fromPtr, NULL, (char *)toPtr, celt->bytes_per_packet);
+#elif defined(HAVE_CELT_0_5_0_OR_LATER)
byteCount = celt_encode(celt->encoder_state, (celt_int16_t *)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);
--- a/plugins/configure.ac
+++ b/plugins/configure.ac
@@ -313,9 +313,12 @@
AC_SUBST(CELT_LIBS)
AC_DEFINE([HAVE_CELT], [1], [celt])
HAVE_CELT=yes
- PKG_CHECK_EXISTS([celt >= 0.5.0],
- [
- AC_DEFINE([HAVE_CELT_0_5_0_OR_LATER], [1], [celt 0.5.0 or later found])
+ PKG_CHECK_EXISTS([celt >= 0.7.0], [
+ AC_DEFINE([HAVE_CELT_0_7_0_OR_LATER], [1], [celt 0.7.0 or later found])
+ ],
+ [PKG_CHECK_EXISTS([celt >= 0.5.0], [
+ AC_DEFINE([HAVE_CELT_0_5_0_OR_LATER], [1], [celt 0.5.0 or later found])
+ ])
])
],
[
--- a/plugins/plugin-config.h.in 2010-02-14 16:07:28.000000000 +0100
+++ b/plugins/plugin-config.h.in 2010-02-14 16:07:42.000000000 +0100
@@ -15,6 +15,9 @@
/* celt 0.5.0 or later found */
#undef HAVE_CELT_0_5_0_OR_LATER
+/* celt 0.7.0 or later found */
+#undef HAVE_CELT_0_7_0_OR_LATER
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-libs/opal/files: opal-3.6.7-celt-0.7-update.patch
@ 2010-10-27 23:22 Mounir Lamouri (volkmar)
0 siblings, 0 replies; 2+ messages in thread
From: Mounir Lamouri (volkmar) @ 2010-10-27 23:22 UTC (permalink / raw
To: gentoo-commits
volkmar 10/10/27 23:22:06
Removed: opal-3.6.7-celt-0.7-update.patch
Log:
Removing old ebulid and patches.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-10-27 23:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-27 23:22 [gentoo-commits] gentoo-x86 commit in net-libs/opal/files: opal-3.6.7-celt-0.7-update.patch Mounir Lamouri (volkmar)
-- strict thread matches above, loose matches on Subject: below --
2010-02-28 10:43 Peter Volkov (pva)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox