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.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

4 files changed, 116 insertions, 4 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index eec26d52521d..7ba668c3d99e 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/opal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.61 2010/02/25 00:22:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.62 2010/02/28 10:43:09 pva Exp $
+
+  28 Feb 2010; Peter Volkov <pva@gentoo.org> opal-3.6.7.ebuild,
+  +files/opal-3.6.7-celt-0.7-update.patch:
+  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.
 
   25 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> opal-3.6.7.ebuild:
   Latest opal requires a new ptlib during configure phase: Package
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index fb97d89fbc75..ee71ba8ec53c 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -1,5 +1,6 @@
 AUX opal-2.1.1-notrace.diff 263 RMD160 17b6887acd196af52de8dfec8d5accfd654d1fc7 SHA1 079474507fe63a9019a293a5a529c23788221196 SHA256 3abf99ab2a7bde2e1a2380e22a9c5e15240439bdf7766b4715c78cacd46961c0
 AUX opal-3.6.4-jdkroot.patch 507 RMD160 eeda20caf4697efa51dd24527c619f3ec0e2d3ca SHA1 72c4d9ea9f5867567a24f5a92cd66d1394b58129 SHA256 c2e930565cd91a7ec75a1ed1657ba524dad810ec934ef854c39331388661f2f6
+AUX opal-3.6.7-celt-0.7-update.patch 3927 RMD160 c6aad40d3c85f95c78c9d2b95fa2a847435cd72e SHA1 f4a4f2f47703b7ba90d9c0fd9384cc170fd6bf23 SHA256 41d885229bc5c3445e37699da342be215403f4043c72b2c5dd8639eac9cc1d20
 DIST opal-2.2.11.tar.gz 4165191 RMD160 7ef2d505cc52eca9136ca10a865c7b7f3a8dc2b5 SHA1 f8638a7dce8e9c32abd8c69c69ba2d61dfca05f0 SHA256 0990ead39728f23a1ce39997f41a8484c59809ccec0e770b9bc4f795a85a29c4
 DIST opal-3.6.4-htmldoc.tar.bz2 5844646 RMD160 0fd63fa69d443f8aa0778470d2c28d62d7351749 SHA1 42478f4ace029df1989649b3cbb9eb4a6f9baf5b SHA256 0e978f8b4175ff477491726750f615f9bfdbc05834432e88306493d2f1496c4e
 DIST opal-3.6.4.tar.bz2 7059671 RMD160 c0c6aa17aef0051d0b9fb2e794c163fbabe4bac9 SHA1 65c7462a0aa58720f1c0b6a2f3347527bd9aea8d SHA256 b1fb3bad0c8581b82f0da9c69673f43ad9aed7868a7e4f2a68c6c72ed656237b
@@ -11,6 +12,6 @@ EBUILD opal-2.2.11.ebuild 2615 RMD160 5813bfa6dfec68fd1b53b0d1e27627b159b458f8 S
 EBUILD opal-3.6.4-r1.ebuild 8115 RMD160 9e4f678fa6cfa727caa49d444e540dda738ce2e9 SHA1 8a83b051fa6c3a25b6940e9d3660f7b17d9c1d50 SHA256 31839afcc9066d2b23c441c14fb3cb350b16740c49ca6efe54ed87762ffaed31
 EBUILD opal-3.6.4.ebuild 8152 RMD160 fdeaff42736a20d13d86cf34dc5e9b2b3b6e0c6c SHA1 d2cc3e882083a0ebedec169197e58435386c41a2 SHA256 896b8c6f9d04221af8ea6883639e13533bd4bde6cb101eff0bcaf3776b7859d5
 EBUILD opal-3.6.6.ebuild 8199 RMD160 4a691f2f7c11292367997ab21b71ff03cda1b0ae SHA1 da85dd9f1143912ffa5d78b983d9d47432fcee66 SHA256 f8123d8964afcc62f3d0eae46681a881c32f16ec605f56904b6847897f0b790a
-EBUILD opal-3.6.7.ebuild 8199 RMD160 5dbb7957b146fc87c4076e42c405419467eb0a1a SHA1 c2ba4af4fb4c7532fcbb519bab96be0bd8a5f416 SHA256 8fead8061037fe245a22a6cc9781f370b9b9ef5151285d189ad1d3f8225d6626
-MISC ChangeLog 8081 RMD160 9b9009030abe7835fcbd930f90d63e30ff5125fa SHA1 2aea5476856d52897589c079c0a0091e59d398fe SHA256 00867a19797f3c85102e5b9a46eed8954f7c5beeab4aaa9b9156fc9a4553caae
+EBUILD opal-3.6.7.ebuild 8245 RMD160 4f9078d67ff459d0754d0c949200bc47c2786810 SHA1 79233864d14068b2693628cefe446ebe24cf8092 SHA256 fa0254a6bb54d97548d5e514c7cf0c9994342584088574ef40a47c2ac07c82b0
+MISC ChangeLog 8368 RMD160 cf15609090574061d8e355f8feb4a259cb04b5dd SHA1 d274cba98891309a8a8014675068966a68c79523 SHA256 dc67485d4e582c74705e16aaebbff5ac46583b33be2ade5b5d0cb9be40f4ce25
 MISC metadata.xml 2065 RMD160 72f5b31577c61334a802fa85c51b4163c81aced1 SHA1 d1b558b04691f19a9eccc648708487c8d169db82 SHA256 065bbfbad937a4e217f16a4d2f410f4ff282ca5f869ca9387986d85a99add8b4
diff --git a/net-libs/opal/files/opal-3.6.7-celt-0.7-update.patch b/net-libs/opal/files/opal-3.6.7-celt-0.7-update.patch
new file mode 100644
index 000000000000..045a20081034
--- /dev/null
+++ b/net-libs/opal/files/opal-3.6.7-celt-0.7-update.patch
@@ -0,0 +1,103 @@
+--- 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
+ 
diff --git a/net-libs/opal/opal-3.6.7.ebuild b/net-libs/opal/opal-3.6.7.ebuild
index 9c1489ec277d..3cfe43543718 100644
--- a/net-libs/opal/opal-3.6.7.ebuild
+++ b/net-libs/opal/opal-3.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.7.ebuild,v 1.2 2010/02/25 00:22:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.7.ebuild,v 1.3 2010/02/28 10:43:09 pva Exp $
 
 EAPI="2"
 
@@ -87,6 +87,8 @@ src_prepare() {
 	# upstream patch 2808915
 	epatch "${FILESDIR}"/${PN}-3.6.4-jdkroot.patch
 
+	epatch "${FILESDIR}/${P}-celt-0.7-update.patch"
+
 	# h224 really needs h323 ?
 	# TODO: get a confirmation in ml
 	sed -i -e "s:\(.*HAS_H224.*\), \[OPAL_H323\]:\1:" configure.ac \