Version bump, fixing several bugs. Adjusted opal-3.6.8 dep on ptlib =< 2.10.8. Added myself as maintainer

(Portage version: 2.2.0_alpha138/cvs/Linux i686, signed Manifest commit with key 1F6F0683)

7 files changed, 304 insertions, 3 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 1690e4eb71f2..9be9ab2934bf 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/opal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.81 2012/09/30 18:24:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/ChangeLog,v 1.82 2012/10/23 22:48:38 neurogeek Exp $
+
+*opal-3.10.8 (23 Oct 2012)
+
+  23 Oct 2012; Jesus Rivero <neurogeek@gentoo.org> opal-3.6.8-r2.ebuild,
+  +opal-3.10.8.ebuild, +files/opal-3.10.8-disable-h323-workaround.patch,
+  +files/opal-3.10.8-labs_is_in_stdlib.patch,
+  +files/opal-3.10.8-svn_revision_override.patch, metadata.xml:
+  Version bump, fixing several bugs. Adjusted opal-3.6.8 dep on ptlib  <
+  2.10.8. Added myself as maintainer
 
   30 Sep 2012; Raúl Porcel <armin76@gentoo.org> opal-3.6.8-r2.ebuild:
   alpha stable wrt #397617
diff --git a/net-libs/opal/files/opal-3.10.8-disable-h323-workaround.patch b/net-libs/opal/files/opal-3.10.8-disable-h323-workaround.patch
new file mode 100644
index 000000000000..3d1761566ed1
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.8-disable-h323-workaround.patch
@@ -0,0 +1,13 @@
+# Sent to upstream on 2012-10-23
+# By Jesus Rivero <neurogeek@gentoo.org>
+diff -uNr opal-3.10.8.orig/include/h323/h323.h opal-3.10.8/include/h323/h323.h
+--- opal-3.10.8.orig/include/h323/h323.h        2012-10-22 07:50:37.000000000 -0400
++++ opal-3.10.8/include/h323/h323.h     2012-10-23 14:10:37.000000000 -0400
+@@ -40,6 +40,7 @@
+ #include <h323/h323con.h>
+ #include <h323/gkclient.h>
+ #include <opal/buildopts.h>
++#include <ptlib.h>
+ 
+ PString  OpalGetVersion();
+ unsigned OpalGetMajorVersion();
diff --git a/net-libs/opal/files/opal-3.10.8-labs_is_in_stdlib.patch b/net-libs/opal/files/opal-3.10.8-labs_is_in_stdlib.patch
new file mode 100644
index 000000000000..ac8a7ef2000f
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.8-labs_is_in_stdlib.patch
@@ -0,0 +1,11 @@
+diff -uNr opal-3.10.8.orig/plugins/audio/G.722.2/AMR-WB/dec_lpc.c opal-3.10.8/plugins/audio/G.722.2/AMR-WB/dec_lpc.c
+--- opal-3.10.8.orig/plugins/audio/G.722.2/AMR-WB/dec_lpc.c	2012-10-22 07:50:37.000000000 -0400
++++ opal-3.10.8/plugins/audio/G.722.2/AMR-WB/dec_lpc.c	2012-10-22 10:20:49.000000000 -0400
+@@ -3,6 +3,7 @@
+  *  3GPP AMR Wideband Floating-point Speech Codec
+  *===================================================================
+  */
++#include <stdlib.h>
+ #include <math.h>
+ #include "typedef.h"
+ #include "dec_util.h"
diff --git a/net-libs/opal/files/opal-3.10.8-svn_revision_override.patch b/net-libs/opal/files/opal-3.10.8-svn_revision_override.patch
new file mode 100644
index 000000000000..c2a15b16ef82
--- /dev/null
+++ b/net-libs/opal/files/opal-3.10.8-svn_revision_override.patch
@@ -0,0 +1,15 @@
+diff -uNr opal-3.10.8.orig/src/opal/manager.cxx opal-3.10.8/src/opal/manager.cxx
+--- opal-3.10.8.orig/src/opal/manager.cxx	2012-10-22 07:50:36.000000000 -0400
++++ opal-3.10.8/src/opal/manager.cxx	2012-10-22 08:30:45.000000000 -0400
+@@ -56,7 +56,10 @@
+ #include <ptclib/url.h>
+ 
+ #include "../../version.h"
+-#include "../../revision.h"
++
++# define SVN_REVISION 0
++//#include "../../revision.h"
++
+ 
+ 
+ static const char * const DefaultMediaFormatOrder[] = {
diff --git a/net-libs/opal/metadata.xml b/net-libs/opal/metadata.xml
index bc24125b7373..158a258211da 100644
--- a/net-libs/opal/metadata.xml
+++ b/net-libs/opal/metadata.xml
@@ -7,6 +7,11 @@
         <name>Mounir Lamouri</name>
 	<description>Assign to herd and CC me</description>
 </maintainer>
+<maintainer>
+        <email>neurogeek@gentoo.org</email>
+        <name>Jesus Rivero</name>
+	<description>Assign to herd and CC me</description>
+</maintainer>
 	<use> 
 		<flag name="audio">Enable audio support</flag>
 		<flag name="capi">Enable CAPI support</flag>
diff --git a/net-libs/opal/opal-3.10.8.ebuild b/net-libs/opal/opal-3.10.8.ebuild
new file mode 100644
index 000000000000..de75da59e5d5
--- /dev/null
+++ b/net-libs/opal/opal-3.10.8.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.8.ebuild,v 1.1 2012/10/23 22:48:38 neurogeek Exp $
+
+EAPI=4
+
+inherit eutils autotools toolchain-funcs java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="C++ class library normalising numerous telephony protocols"
+HOMEPAGE="http://www.opalvoip.org/"
+SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
+	doc? ( mirror://sourceforge/opalvoip/${P}-htmldoc.tar.bz2 )"
+
+LICENSE="MPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+audio capi celt debug doc examples fax ffmpeg h224 h281 h323 iax
+ilbc ipv6 ivr ixj java ldap lid +plugins sbc sip sipim srtp ssl static-libs
+stats swig theora +video vpb vxml wav x264 x264-static xml"
+
+REQUIRED_USE="x264-static? ( x264 )
+	h281? ( h224 )"
+
+RDEPEND=">=net-libs/ptlib-2.10.0[stun,debug=,audio?,dtmf,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
+	>=media-libs/speex-1.2_beta
+	fax? ( net-libs/ptlib[asn] )
+	h323? ( net-libs/ptlib[asn] )
+	ivr? ( net-libs/ptlib[http,xml,vxml] )
+	java? ( >=virtual/jre-1.4 )
+	plugins? (
+		media-sound/gsm
+		capi? ( net-dialup/capi4k-utils )
+		celt? ( media-libs/celt )
+		ffmpeg? ( virtual/ffmpeg[encode] )
+		ixj? ( sys-kernel/linux-headers )
+		ilbc? ( dev-libs/ilbc-rfc3951 )
+		sbc? ( media-libs/libsamplerate )
+		theora? ( media-libs/libtheora )
+		x264? (	virtual/ffmpeg
+			media-libs/x264 ) )
+	srtp? ( net-libs/libsrtp )
+	vxml? ( net-libs/ptlib[http,vxml] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/gcc-3
+	java? ( swig? ( dev-lang/swig )
+		>=virtual/jdk-1.4 )"
+
+REQUIRED_USE="sip? ( sipim )"
+# NOTES:
+# ffmpeg[encode] is for h263 and mpeg4
+# ssl, xml, vxml, ipv6, ldap, audio, wav, and video are use flags
+#   herited from ptlib: feature is enabled if ptlib has enabled it
+#   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
+#   forcing ptlib to disable it for opal is not a solution too
+#   atm, accepting the "auto-feature" looks like a good solution
+#   (asn is used for fax and config _only_ for examples)
+# OPALDIR should not be used anymore but if a package still need it, create it
+
+pkg_setup() {
+	# workaround for bug 282838
+	append-cxxflags "-fno-visibility-inlines-hidden"
+	append-cxxflags "-fno-strict-aliasing"
+
+	# need >=gcc-3
+	if [[ $(gcc-major-version) -lt 3 ]]; then
+		eerror "You need to use gcc-3 at least."
+		eerror "Please change gcc version with 'gcc-config'."
+		die "You need to use gcc-3 at least."
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	# remove visual studio related files from samples/
+	if use examples; then
+		rm -f samples/*/*.vcproj
+		rm -f samples/*/*.sln
+		rm -f samples/*/*.dsp
+		rm -f samples/*/*.dsw
+	fi
+
+	epatch "${FILESDIR}/${P}-svn_revision_override.patch"
+	epatch "${FILESDIR}/${P}-labs_is_in_stdlib.patch"
+
+	if ! use h323; then
+		# Without this patch, ekiga wont compile, even with
+		# USE=-h323.
+		epatch "${FILESDIR}/${P}-disable-h323-workaround.patch"
+	fi
+
+	sed -i -e "s:\(.*HAS_H224.*\), \[OPAL_H323\]:\1:" configure.ac \
+		|| die "sed failed"
+
+	eaclocal
+	eautoconf
+
+	# in plugins
+	cd plugins/
+	eaclocal
+	eautoconf
+	cd ..
+
+	# disable celt if celt is not enabled (prevent auto magic dep)
+	# already in repository
+	if ! use celt; then
+		sed -i -e "s/HAVE_CELT=yes/HAVE_CELT=no/" plugins/configure \
+			|| die "sed failed"
+	fi
+
+	# fix automatic swig detection, upstream bug 2712521 (upstream reject it)
+	if ! use swig; then
+		sed -i -e "/^SWIG=/d" configure || die "patching configure failed"
+	fi
+
+	use ilbc || { rm -r plugins/audio/iLBC/ || die "removing iLBC failed"; }
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local forcedconf=""
+
+	# fix bug 277233, upstream bug 2820939
+	if use fax; then
+		forcedconf="${forcedconf} --enable-statistics"
+	fi
+
+	# --with-libavcodec-source-dir should _not_ be set, it's for trunk sources
+	# versioncheck: check for ptlib version
+	# shared: should always be enabled for a lib
+	# localspeex, localspeexdsp, localgsm, localilbc: never use bundled libs
+	# samples: only build some samples, useless
+	# libavcodec-stackalign-hack: prevent hack (default disable by upstream)
+	# default-to-full-capabilties: default enable by upstream
+	# aec: atm, only used when bundled speex, so it's painless for us
+	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+	# 	http://zfoneproject.com/ wich is not in portage
+	# msrp: highly experimental
+	# spandsp: doesn't work with newest spandsp, upstream bug 2796047
+	# g711plc: force enable
+	# rfc4103: not really used, upstream bug 2795831
+	# t38, spandsp: merged in fax
+	# h450, h460, h501: merged in h323 (they are additional features of h323)
+	econf \
+		--enable-versioncheck \
+		--enable-shared \
+		--disable-zrtp \
+		--disable-localspeex \
+		--disable-localspeexdsp \
+		--disable-localgsm \
+		--disable-localilbc \
+		--disable-samples \
+		--disable-libavcodec-stackalign-hack \
+		--enable-default-to-full-capabilties \
+		--enable-aec \
+		--disable-msrp \
+		--disable-spandsp \
+		--enable-g711plc \
+		--enable-rfc4103 \
+		$(use_enable debug) \
+		$(use_enable capi) \
+		$(use_enable fax) \
+		$(use_enable fax t38) \
+		$(use_enable h224) \
+		$(use_enable h281) \
+		$(use_enable h323) \
+		$(use_enable h323 h450) \
+		$(use_enable h323 h460) \
+		$(use_enable h323 h501) \
+		$(use_enable iax) \
+		$(use_enable ivr) \
+		$(use_enable ixj) \
+		$(use_enable java) \
+		$(use_enable lid) \
+		$(use_enable plugins) \
+		$(use_enable sbc) \
+		$(use_enable sip) \
+		$(use_enable sipim) \
+		$(use_enable stats statistics) \
+		$(use_enable video) $(use_enable video rfc4175) \
+		$(use_enable vpb) \
+		$(use_enable x264 h264) \
+		$(use_enable x264-static x264-link-static) \
+		${forcedconf}
+}
+
+src_compile() {
+	local makeopts=""
+
+	use debug && makeopts="debug"
+
+	emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Get rid of static libraries if not requested
+	# There seems to be no easy way to disable this in the build system
+	if ! use static-libs; then
+		rm -v "${D}"/usr/lib*/*.a || die
+	fi
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/html/* docs/* || die "dohtml failed"
+	fi
+
+	# ChangeLog is not standard
+	dodoc ChangeLog-${PN}-v${PV//./_}.txt || die "dodoc failed"
+
+	if use examples; then
+		local exampledir="/usr/share/doc/${PF}/examples"
+		local basedir="samples"
+		local sampledirs="`ls ${basedir} --hide=configure* \
+			--hide=opal_samples.mak.in`"
+
+		# first, install files
+		insinto ${exampledir}/
+		doins ${basedir}/{configure*,opal_samples*} \
+			|| die "doins failed"
+
+		# now, all examples
+		for x in ${sampledirs}; do
+			insinto ${exampledir}/${x}/
+			doins ${basedir}/${x}/* || die "doins failed"
+		done
+
+		# some examples need version.h
+		insinto "/usr/share/doc/${PF}/"
+		doins version.h || die "doins failed"
+	fi
+}
+
+pkg_postinst() {
+	if use examples; then
+		ewarn "All examples have been installed, some of them will not work on your system"
+		ewarn "it will depend of the enabled USE flags in ptlib and opal"
+	fi
+
+	if ! use plugins || ! use audio || ! use video; then
+		ewarn "You have disabled audio, video or plugins USE flags."
+		ewarn "Most audio/video features or plugins have been disabled silently"
+		ewarn "even if enabled via USE flags."
+		ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
+	fi
+}
diff --git a/net-libs/opal/opal-3.6.8-r2.ebuild b/net-libs/opal/opal-3.6.8-r2.ebuild
index 679fa562073f..74b2b2e19f9a 100644
--- a/net-libs/opal/opal-3.6.8-r2.ebuild
+++ b/net-libs/opal/opal-3.6.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.8-r2.ebuild,v 1.9 2012/09/30 18:24:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.6.8-r2.ebuild,v 1.10 2012/10/23 22:48:38 neurogeek Exp $
 
 EAPI="4"
 
@@ -22,7 +22,7 @@ stats swig theora +video vpb vxml wav x264 x264-static xml"
 REQUIRED_USE="x264-static? ( x264 )
 	h281? ( h224 )"
 
-RDEPEND=">=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
+RDEPEND="<net-libs/ptlib-2.10.8[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
 	>=media-libs/speex-1.2_beta
 	fax? ( net-libs/ptlib[asn] )
 	h323? ( net-libs/ptlib[asn] )