ekiga, ptlib, opal

8 files changed, 29 insertions, 280 deletions

diff --git a/net-libs/opal/files/gcc-4.4.patch b/net-libs/opal/files/gcc-4.4.patch
new file mode 100644
index 0000000..8514e67
--- /dev/null
+++ b/net-libs/opal/files/gcc-4.4.patch
@@ -0,0 +1,23 @@
+diff -ruN ../original/configure ./configure
+--- ../original/configure	2009-05-19 12:52:57.000000000 +0300
++++ ./configure	2009-06-21 04:19:51.687358162 +0300
+@@ -5080,7 +5080,6 @@
+                  opal_debug_flags="-g -D_DEBUG -DSOLARIS"
+                ;;
+                *)
+-                 opal_release_flags="-Os"
+                  opal_debug_flags="-g3 -ggdb -O0 -D_DEBUG"
+                ;;
+            esac
+diff -ruN ../original/plugins/video/H.264/gpl/enc-ctx.cxx ./plugins/video/H.264/gpl/enc-ctx.cxx
+--- ../original/plugins/video/H.264/gpl/enc-ctx.cxx	2009-05-19 12:52:39.000000000 +0300
++++ ./plugins/video/H.264/gpl/enc-ctx.cxx	2009-06-21 04:19:37.890368559 +0300
+@@ -25,6 +25,8 @@
+ #include "trace.h"
+ #include "rtpframe.h"
+ 
++#include <cstdio>
++#include <cstring>
+ #include <stdlib.h>
+ #include <math.h>
+ #if defined(_WIN32) || defined(_WIN32_WCE)
diff --git a/net-libs/opal/files/gcc4.4.patch b/net-libs/opal/files/gcc4.4.patch
deleted file mode 100644
index 5d809da..0000000
--- a/net-libs/opal/files/gcc4.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: enc-ctx.cxx
-===================================================================
---- plugins/video/H.264/gpl/enc-ctx.cxx	(revision 22408)
-+++ plugins/video/H.264/gpl/enc-ctx.cxx	(working copy)
-@@ -27,6 +27,8 @@
- 
- #include <stdlib.h>
- #include <math.h>
-+#include <cstdio>
-+
- #if defined(_WIN32) || defined(_WIN32_WCE)
-   #include <malloc.h>
-   #define STRCMPI  _strcmpi
diff --git a/net-libs/opal/files/opal-3.4.1-eapi2.patch b/net-libs/opal/files/opal-3.4.1-eapi2.patch
deleted file mode 100644
index a9c0346..0000000
--- a/net-libs/opal/files/opal-3.4.1-eapi2.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- opal-3.4.1.ebuild	2008-10-09 19:47:27.000000000 -0400
-+++ opal-3.4.1-eapi2.ebuild	2008-10-09 20:06:51.000000000 -0400
-@@ -4,6 +4,8 @@
- 
- inherit eutils
- 
-+EAPI="2"
-+
- DESCRIPTION="C++ class library normalising numerous telephony protocols"
- HOMEPAGE="http://www.ekiga.org"
- SRC_URI="http://www.ekiga.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
-@@ -13,33 +15,16 @@
- KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
- IUSE="debug doc java"
- 
--RDEPEND="~dev-libs/ptlib-2.4.1
-+RDEPEND="~dev-libs/ptlib-2.4.1[debug=]
- 	>=media-video/ffmpeg-0.4.7
- 	media-libs/speex
- 	java? ( virtual/jdk )"
- 
--pkg_setup() {
--	if use debug && ! built_with_use dev-libs/ptlib debug; then
--		eerror "You need to build dev-libs/ptlib with USE=debug enabled."
--		die "dev-libs/ptlib has to be built with USE=debug"
--	fi
--
--	if ! use debug && built_with_use dev-libs/ptlib debug; then
--		eerror "You need to build dev-libs/ptlib without USE=debug."
--		die "dev-libs/ptlib has not to be built with USE=debug"
--	fi
--}
--
--src_unpack() {
--	unpack ${A}
--	cd "${S}"
--
-+src_prepare() {
- 	epatch "${FILESDIR}"/${P}-lpcini.patch
- }
- 
--src_compile() {
--	local makeopts
--
-+src_configure() {
- 	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
- 	# http://zfoneproject.com/ that is not in portage
- 	econf \
-@@ -49,6 +34,10 @@
- 		--disable-localspeex \
- 		--disable-zrtp \
- 		|| die "econf failed"
-+}
-+
-+src_compile() {
-+	local makeopts
- 
- 	if use debug; then
- 		makeopts="debug"
diff --git a/net-libs/opal/opal-3.4.1.ebuild b/net-libs/opal/opal-3.4.1.ebuild
deleted file mode 100644
index 64a3a70..0000000
--- a/net-libs/opal/opal-3.4.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="C++ class library normalising numerous telephony protocols"
-HOMEPAGE="http://www.ekiga.org"
-SRC_URI="http://www.ekiga.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
-
-LICENSE="MPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc java"
-
-RDEPEND="~dev-libs/ptlib-2.4.1
-	>=media-video/ffmpeg-0.4.7
-	media-libs/speex
-	java? ( virtual/jdk )"
-
-pkg_setup() {
-	if use debug && ! built_with_use dev-libs/ptlib debug; then
-		eerror "You need to build dev-libs/ptlib with USE=debug enabled."
-		die "dev-libs/ptlib has to be built with USE=debug"
-	fi
-
-	if ! use debug && built_with_use dev-libs/ptlib debug; then
-		eerror "You need to build dev-libs/ptlib without USE=debug."
-		die "dev-libs/ptlib has not to be built with USE=debug"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-lpcini.patch
-}
-
-src_compile() {
-	local makeopts
-
-	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
-	# http://zfoneproject.com/ that is not in portage
-	econf \
-		$(use_enable debug) \
-		$(use_enable java) \
-		--enable-plugins \
-		--disable-localspeex \
-		--disable-zrtp \
-		|| die "econf failed"
-
-	if use debug; then
-		makeopts="debug"
-	else
-		makeopts="opt"
-	fi
-
-	emake ${makeopts} || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
-
-	if use doc; then
-		dohtml -r html/* docs/* || die "documentation installation failed"
-	fi
-}
diff --git a/net-libs/opal/opal-3.4.2.ebuild b/net-libs/opal/opal-3.4.2.ebuild
deleted file mode 100644
index 7231f62..0000000
--- a/net-libs/opal/opal-3.4.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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"
-
-LICENSE="MPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc java"
-
-RDEPEND=">=dev-libs/ptlib-2.0.0
-	>=media-video/ffmpeg-0.4.7
-	media-libs/speex
-	java? ( virtual/jdk )"
-
-pkg_setup() {
-	if use debug && ! built_with_use dev-libs/ptlib debug; then
-		eerror "You need to build dev-libs/ptlib with USE=debug enabled."
-		die "dev-libs/ptlib has to be built with USE=debug"
-	fi
-
-	if ! use debug && built_with_use dev-libs/ptlib debug; then
-		eerror "You need to build dev-libs/ptlib without USE=debug."
-		die "dev-libs/ptlib has not to be built with USE=debug"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-lpcini.patch
-}
-
-src_compile() {
-	local makeopts
-
-	filter-ldflags -Wl,--as-needed --as-needed
-
-	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
-	# http://zfoneproject.com/ that is not in portage
-	econf \
-		$(use_enable debug) \
-		$(use_enable java) \
-		--enable-plugins \
-		--disable-localspeex \
-		--disable-zrtp \
-		|| die "econf failed"
-
-	if use debug; then
-		makeopts="debug"
-	else
-		makeopts="opt"
-	fi
-
-	emake ${makeopts} || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
-
-	if use doc; then
-		dohtml -r html/* docs/* || die "documentation installation failed"
-	fi
-}
diff --git a/net-libs/opal/opal-3.4.4.ebuild b/net-libs/opal/opal-3.4.4.ebuild
deleted file mode 100644
index 7231f62..0000000
--- a/net-libs/opal/opal-3.4.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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"
-
-LICENSE="MPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc java"
-
-RDEPEND=">=dev-libs/ptlib-2.0.0
-	>=media-video/ffmpeg-0.4.7
-	media-libs/speex
-	java? ( virtual/jdk )"
-
-pkg_setup() {
-	if use debug && ! built_with_use dev-libs/ptlib debug; then
-		eerror "You need to build dev-libs/ptlib with USE=debug enabled."
-		die "dev-libs/ptlib has to be built with USE=debug"
-	fi
-
-	if ! use debug && built_with_use dev-libs/ptlib debug; then
-		eerror "You need to build dev-libs/ptlib without USE=debug."
-		die "dev-libs/ptlib has not to be built with USE=debug"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-lpcini.patch
-}
-
-src_compile() {
-	local makeopts
-
-	filter-ldflags -Wl,--as-needed --as-needed
-
-	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
-	# http://zfoneproject.com/ that is not in portage
-	econf \
-		$(use_enable debug) \
-		$(use_enable java) \
-		--enable-plugins \
-		--disable-localspeex \
-		--disable-zrtp \
-		|| die "econf failed"
-
-	if use debug; then
-		makeopts="debug"
-	else
-		makeopts="opt"
-	fi
-
-	emake ${makeopts} || die "emake failed"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
-
-	if use doc; then
-		dohtml -r html/* docs/* || die "documentation installation failed"
-	fi
-}
diff --git a/net-libs/opal/opal-3.4.5.ebuild b/net-libs/opal/opal-3.4.5.ebuild
index 7231f62..6939ab2 100644
--- a/net-libs/opal/opal-3.4.5.ebuild
+++ b/net-libs/opal/opal-3.4.5.ebuild
@@ -35,6 +35,11 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-lpcini.patch
+	cd "${S}/plugins/video/H.264/gpl"
+	epatch ${FILESDIR}/enc-ctx.cxx.diff
+	cd "${S}/plugins/video/THEORA"
+	epatch ${FILESDIR}/theora_frame.cxx.diff
+	epatch ${FILESDIR}/theora__plugin.cxx.diff
 }
 
 src_compile() {
diff --git a/net-libs/opal/opal-3.6.0.ebuild b/net-libs/opal/opal-3.6.2.ebuild
index c11179e..28b5324 100644
--- a/net-libs/opal/opal-3.6.0.ebuild
+++ b/net-libs/opal/opal-3.6.2.ebuild
@@ -34,6 +34,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch ${FILESDIR}/gcc-4.4.patch
 #	epatch "${FILESDIR}"/${PN}-lpcini.patch
 }