net-libs/opal: version bump to 3.6.1

svn path=/trunk/; revision=820

4 files changed, 288 insertions, 2 deletions

diff --git a/net-libs/opal/ChangeLog b/net-libs/opal/ChangeLog
index 7179077..5659ea1 100644
--- a/net-libs/opal/ChangeLog
+++ b/net-libs/opal/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
+  +opal-3.6.1:
+  Version bump to 3.6.1 needed by ekiga-3.2
+
   18 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
   opal-3.4.5:
   Add ~x86 keyword
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
index 056b904..3b5edfb 100644
--- a/net-libs/opal/Manifest
+++ b/net-libs/opal/Manifest
@@ -2,6 +2,9 @@ AUX opal-3.4.5-stats.patch 289 RMD160 00228bd3f714f9c2c2a95d76f0c113375d16afb9 S
 AUX opal-lpcini.patch 301 RMD160 1952b7b4b40283615cad283c0407d777b62bd215 SHA1 2dd1bdb7e890e9416f03faf4f327c44267a6b498 SHA256 8a6b3ca1bd2fbe7e14883499b3fb59952f615dc5a954d544f8fdba8186aa41a4
 DIST opal-3.4.5-htmldoc.tar.bz2 5777524 RMD160 241538a00a044add293cd627474c90bb82c08c35 SHA1 ba3a2f465d703f4d1bd030e42da02be3fc913298 SHA256 4fb61f7ba9fb3bb6dd1103a1d4e43242be17b2635354934c5d4630fa8cf44bb1
 DIST opal-3.4.5.tar.bz2 8000318 RMD160 71125ff5237d3efd9c534ce23fcd814614b1fbfb SHA1 2604489702f19860f18b24244a9bd16504471e64 SHA256 efeeaad5a6d6eff7952a9f4f896fae31b0bb852e07a863f6f16f08422602503d
+DIST opal-3.6.1-htmldoc.tar.bz2 5863294 RMD160 2d90dda7a6cdbb4cb3743688fc32a3ff9b532511 SHA1 f33af480786d65c1cdb0db564f93c34f68eee9bd SHA256 41dfa29fa213eb65eff9d20c89befe4431979a45b97410d3ad2ed200071eae5d
+DIST opal-3.6.1.tar.bz2 6993734 RMD160 3a19a46d67957d26b3261804e1489ffd83ef1662 SHA1 989bad4d3bc35828da8198740eaabe249f4c30df SHA256 e6b48a294b35449c851c2a6ea6969041ed7f4148e92b3faa03a330b7bb5a59af
 EBUILD opal-3.4.5.ebuild 7816 RMD160 d513bf19ca565987b02b6d97ae4fda9335775196 SHA1 a203646872853d2c36fc340901609ed04b209c4f SHA256 d65720d9d096d720731c5f907ad2b0d561058a69c18a5637fdf90144ab491dae
-MISC ChangeLog 849 RMD160 0ada22cb26cd3f7ebe5110eb94cd4a0db1c79da0 SHA1 186c422b47e82ddd19d4038a251961f1dee5eac9 SHA256 fcc8cd8c5124287f9d5d6171ba3c70c895219ab3be687ac7a6ef7919fbc63a03
-MISC metadata.xml 1475 RMD160 4474351e31e4d996cda7a6560fb4e43ac988566b SHA1 c908b5464121355cacc38636457d028ac2ec3d80 SHA256 46fe9fc49d88f2b7d65a87062c76016c4d3ca2ca74a580988447a3f3268d4b00
+EBUILD opal-3.6.1.ebuild 8611 RMD160 e8938aff92ceaf08cccb5434933c56f7ef17afa2 SHA1 a9b4d6ee4344dfa056a245313f66e5271e12e9bc SHA256 da8a1324eb5c3534a97f5c53bc30f7d7ef526af288cc00e5b66e99fd9ebba829
+MISC ChangeLog 976 RMD160 e0502aaaa361c51e10ec8f1d0918a062ff4c6b10 SHA1 e35691c86b94891d384235991c0df1c73a2d4da6 SHA256 ab61cfcec9b2d9f84ecf0053566ce8f52e09b08cfdf261143b780337418d92ab
+MISC metadata.xml 1779 RMD160 2e4f602cc35a529a6d740c6b7d14bb3c966a5170 SHA1 ce13e4db107373de5f03d50249a5fecffb1ec226 SHA256 0b6ca25d36bbb1e4d8c63acbd1bf34daabec8e500c5881cb1a1643dbcc2fa219
diff --git a/net-libs/opal/metadata.xml b/net-libs/opal/metadata.xml
index c62914b..1317ca1 100644
--- a/net-libs/opal/metadata.xml
+++ b/net-libs/opal/metadata.xml
@@ -15,12 +15,17 @@
 		<flag name="ivr">Enable Interactive Voice Response</flag>
 		<flag name="ixj">Enable xJack cards support</flag>
 		<flag name="lid">Enable Line Interface Device</flag>
+		<flag name="msrp">Enable Message Session Relay Protocol</flag>
 		<flag name="plugins">Enable plugins support</flag>
+		<flag name="rfc4103">Enable RTP Payload for Text Conversation</flag>
 		<flag name="rfc4175">Enable RTP Payload Format for Uncompressed Video
 		</flag>
+		<flag name="sbc">Enable SubBand Codec</flag>
 		<flag name="sip">Enable Session Initiation Protocol</flag>
+		<flag name="sipim">Enable SIP Instant Messages session</flag>
 		<flag name="srtp">Enable Secure Real-time Transport Protocol</flag>
 		<flag name="stats">Enable statistic reporting</flag>
+		<flag name="swig">Use swig to generate bindings</flag>
 		<flag name="video">Enable video support</flag>
 		<flag name="vpb">Enable Voicetronics VPB card support</flag>
 		<flag name="vxml">Enable VXML support</flag>
diff --git a/net-libs/opal/opal-3.6.1.ebuild b/net-libs/opal/opal-3.6.1.ebuild
new file mode 100644
index 0000000..08b356b
--- /dev/null
+++ b/net-libs/opal/opal-3.6.1.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils 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="~ppc ~x86"
+IUSE="+audio capi debug dns doc dtmf examples fax ffmpeg g711plc h224 +h323 iax
+ipv6 ivr ixj java ldap lid msrp +plugins rfc4103 rfc4175 sbc +sip sipim srtp ssl
+stats swig theora +video vpb vxml wav x264 x264-static xml"
+
+RDEPEND=">=net-libs/ptlib-2.0.0[url,debug=,audio?,dns?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?]
+	>=media-libs/speex-1.2_beta
+	fax? ( net-libs/ptlib[asn] )
+	ivr? ( net-libs/ptlib[xml,vxml] )
+	java? ( virtual/jdk )
+	plugins? ( media-sound/gsm
+		capi? ( net-dialup/capi4k-utils )
+		fax? ( media-libs/spandsp )
+		ffmpeg? ( >=media-video/ffmpeg-0.4.7[encode] )
+		ixj? ( sys-kernel/linux-headers )
+		sbc? ( media-libs/libsamplerate )
+		theora? ( media-libs/libtheora )
+		x264? (	>=media-video/ffmpeg-0.4.7
+			media-libs/x264 ) )
+	srtp? ( net-libs/libsrtp )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/gcc-3
+	java? ( swig? ( dev-lang/swig[java] ) )"
+
+# NOTES:
+# needs speexdsp, that means >=speex-1.2
+# ffmpeg[encode] is for h263 and mpeg4
+# fax enable fax, t38 and spandsp support
+# h323 auto-enables h450, h460 and h501 wich provide supplementary services
+# h224 auto-enables h281
+# ssl, xml, vxml, ipv6, dtmf, ldap, audio, wav, dns 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, if a package still need it, create it
+# TODO: merge some use-flags or force their values ?
+#	candidates are: msrp, sipim, rfc4103 and any other without a dep
+# TODO: celt use flag can't be set because celt is not in portage, add it
+# TODO: rtp_mode from libavcodec is badly checked, see bug 2715290
+# needs to have ptlib url use flag enabled, see bug 2715377
+
+pkg_setup() {
+	local warning=false
+
+	# opal can't be built with --as-needed
+	# users where experiencing issues with --as-needed, see bug 238610
+	# TODO: should be re-tested and, if possible, fixed in a cleanier way
+	append-ldflags -Wl,--no-as-needed
+
+	# warn user about use flag that are gonna override other ones
+
+	if ! use plugins; then
+		ewarn "disabling plugins will automatialy disable a lot of ${PN} features"
+		ewarn "like gsm, capi, spandsp, ffmpeg, ixj, theora and x264"
+		ewarn "it is _not_ recommended"
+		warning=true
+	fi
+
+	if use rfc4175 && ! use video; then
+		ewarn "rfc4175 support needs video support: rfc4175 support has been disabled"
+		ewarn "enable video support if you want to use the rfc4175 support"
+		warning=true
+	fi
+
+	if use x264-static && ! use x264; then
+		ewarn "x264-static has been enabled but x264 support has been disabled"
+	fi
+
+	if ${warning}; then
+		echo
+		ewarn "If one of the warnings above is not volunteer, hit Ctrl+C now"
+		ewarn "and re-emerge ${PN} with the desired USE flags"
+		echo
+		ebeep
+		epause
+	fi
+}
+
+src_prepare() {
+	# move files from ${P}-htmldoc.tar.gz
+	if use doc; then
+		mv ../html . || die "moving doc files failed"
+	fi
+
+	# 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
+
+	# disable srtp if srtp is not enabled (prevent auto magic dep)
+	# upstream has been contacted, bug 2686485 in their bugtracker
+	if ! use srtp; then
+		sed -i -e "s/OPAL_SRTP=yes/OPAL_SRTP=no/" configure \
+			|| die "patching configure failed"
+	fi
+
+	# disable theora if theora is not enabled (prevent auto magic dep)
+	# upstream has been contacted, bug 2686488 in their bugtracker
+	if ! use theora; then
+		sed -i -e "s/HAVE_THEORA=yes/HAVE_THEORA=no/" plugins/configure \
+			|| die "patching plugins/configure failed"
+	fi
+
+	# disable mpeg4 and h263p if ffmpeg is not enabled (prevent auto magic dep)
+	# upstream has been contacted, bug 2686495 in their bugtracker
+	if ! use ffmpeg; then
+		sed -i -e "s/HAVE_H263P=yes/HAVE_H263P=no/" plugins/configure \
+			|| die "patching plugins/configure failed"
+	fi
+
+	# actually, mpeg4 plugin can't build, disable it
+	# upstream has been contacted, bug 2714854 in their bugtracker
+	# TODO: when fixed, move it back into if ! use ffmpeg
+	sed -i -e "s/HAVE_MPEG4=yes/HAVE_MPEG4=no/" plugins/configure \
+		|| die "patching plugins/configure failed"
+
+	# fix gsm wav49 support check
+	# upstream has been contacted, bug 2686500 in their bugtracker
+	if use plugins; then
+		sed -i -e "s:gsm\.h:gsm/gsm.h:" plugins/configure \
+			|| die "patching plugins/configure failed"
+	fi
+
+	# fix automatic swig detection
+	# upstream has been contacted, bug 2712521 in their bugtracker
+	if ! use swig; then
+		sed -i -e "/^SWIG=/d" configure || die "patching configure failed"
+	fi
+
+	# remove plugins install when plugins are disabled
+	# upstream has been contacted, bug 2715354 in their bugtracker
+	if ! use plugins; then
+		sed -i -e "/-C plugins/d" Makefile.in \
+			|| die "patching Makefile.in failed"
+	fi
+
+	# there is a stupid bug that shown when disabling statistics
+	# upstream has been contacted, bug 2686504 in their bugtracker
+	if ! use stats; then
+		# a sed script is not so cool because of new lines
+		epatch "${FILESDIR}"/${PN}-3.4.5-stats.patch
+	fi
+}
+
+src_configure() {
+	local myconf=""
+
+	if use ffmpeg; then
+		# with-libavcodec-source-dir: no default value
+		myconf="--with-libavcodec-source-dir=/usr/include"
+	fi
+
+	# versioncheck: check for ptlib version
+	# shared: should always be enabled for a lib
+	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
+	# 	http://zfoneproject.com/ wich is not in portage
+	# localspeex, localspeexdsp, localgsm: 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
+	# celt: not in the portage tree nor in the voip overlay
+	econf ${myconf} \
+		--enable-versioncheck \
+		--enable-shared \
+		--disable-zrtp \
+		--disable-localspeex \
+		--disable-localspeexdsp \
+		--disable-localgsm \
+		--disable-samples \
+		--disable-libavcodec-stackalign-hack \
+		--enable-default-to-full-capabilties \
+		--enable-aec \
+		--disable-celt \
+		$(use_enable debug) \
+		$(use_enable capi) \
+		$(use_enable fax) \
+		$(use_enable fax spandsp) \
+		$(use_enable fax t38) \
+		$(use_enable ffmpeg ffmpeg-h263) \
+		$(use_enable g711plc) \
+		$(use_enable h224) \
+		$(use_enable h224 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 msrp) \
+		$(use_enable plugins) \
+		$(use_enable rfc4103) \
+		$(use_enable rfc4175) \
+		$(use_enable sbc) \
+		$(use_enable sip) \
+		$(use_enable sipim) \
+		$(use_enable stats statistics) \
+		$(use_enable video) \
+		$(use_enable vpb) \
+		$(use_enable x264 h264) \
+		$(use_enable x264-static x264-link-static)
+}
+
+src_compile() {
+	local makeopts=""
+
+	use debug && makeopts="debug"
+
+	emake ${makeopts} || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use doc; then
+		dohtml -r 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
+}