New svn snapshot, update live ebuild to use system ffmpeg

(Portage version: 2.1.1_pre3-r1)

5 files changed, 112 insertions, 2 deletions

diff --git a/net-im/wengophone/ChangeLog b/net-im/wengophone/ChangeLog
index 6ef341dc277e..fbd051e61e99 100644
--- a/net-im/wengophone/ChangeLog
+++ b/net-im/wengophone/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/wengophone
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/ChangeLog,v 1.8 2006/07/19 06:55:36 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/ChangeLog,v 1.9 2006/07/19 11:36:12 genstef Exp $
+
+*wengophone-2.0_pre20060719 (19 Jul 2006)
+
+  19 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/ffmpeg-system.scons, -wengophone-2.0_pre20060524.ebuild,
+  +wengophone-2.0_pre20060719.ebuild, wengophone-2.0_pre20099999.ebuild:
+  New svn snapshot, update live ebuild to use system ffmpeg
 
   19 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
   wengophone-2.0_pre20099999.ebuild:
diff --git a/net-im/wengophone/files/digest-wengophone-2.0_pre20060719 b/net-im/wengophone/files/digest-wengophone-2.0_pre20060719
new file mode 100644
index 000000000000..09429994e7ed
--- /dev/null
+++ b/net-im/wengophone/files/digest-wengophone-2.0_pre20060719
@@ -0,0 +1,3 @@
+MD5 e3d751288cc2265c9df6160e0f5fa3ed wengophone-2.0_pre20060719.tar.bz2 8856319
+RMD160 c19cb1f49915c0162db4eb2ad31ec0e8d5c8dc06 wengophone-2.0_pre20060719.tar.bz2 8856319
+SHA256 29ec01cba5639626e90dc63557d312205b4c2602e5eabdc7a2509bae9dd5665b wengophone-2.0_pre20060719.tar.bz2 8856319
diff --git a/net-im/wengophone/files/ffmpeg-system.scons b/net-im/wengophone/files/ffmpeg-system.scons
new file mode 100644
index 000000000000..fe9a1858a8b7
--- /dev/null
+++ b/net-im/wengophone/files/ffmpeg-system.scons
@@ -0,0 +1,18 @@
+env = WengoGetEnvironment()

+

+libs = []

+lib_path = []

+include_path = []

+defines = {}

+

+libs += [

+	'avutil',

+	'avcodec',

+]

+

+env.WengoAddIncludePath(include_path)

+env.WengoAddLibPath(lib_path)

+env.WengoAddDefines(defines)

+env.WengoUseLibraries(libs)

+

+env.WengoDeclareSystemLibrary('ffmpeg')

diff --git a/net-im/wengophone/wengophone-2.0_pre20060719.ebuild b/net-im/wengophone/wengophone-2.0_pre20060719.ebuild
new file mode 100644
index 000000000000..67d34b1f61dc
--- /dev/null
+++ b/net-im/wengophone/wengophone-2.0_pre20060719.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/wengophone-2.0_pre20060719.ebuild,v 1.1 2006/07/19 11:36:12 genstef Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Wengophone NG is a VoIP client featuring the SIP protcol"
+HOMEPAGE="http://dev.openwengo.com"
+SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.bz2"
+#ESVN_REPO_URI="http://dev.openwengo.com/svn/openwengo/wengophone-ng/trunk"
+#ESVN_OPTIONS="--username guest --password guest"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="dev-libs/boost
+	dev-libs/glib
+	dev-libs/openssl
+	media-libs/alsa-lib
+	media-video/ffmpeg
+	net-libs/gnutls
+	|| ( x11-libs/libX11 virtual/x11 )
+	>=x11-libs/qt-4.1"
+
+DEPEND="${RDEPEND}
+	media-libs/speex
+	dev-util/scons"
+
+pkg_setup() {
+	if ! built_with_use dev-libs/boost threads; then
+		eerror "This package requires dev-libs/boost compiled with threads support."
+		eerror "Please reemerge dev-libs/boost with USE=\"threads\"."
+		die "Please reemerge dev-libs/boost with USE=\"threads\"."
+	fi
+
+	if test $(gcc-major-version) -ge 4 \
+		&& test $(gcc-minor-version) -ge 1 && ! grep visit_each.hpp /usr/include/boost/bind.hpp >/dev/null 2>&1; then
+		eerror "You need to add #include <boost/visit_each.hpp> in"
+		eerror "/usr/include/boost/bind.hpp to build with gcc-4.1"
+		die "Please fix your includes"
+	fi
+}
+
+src_compile() {
+	QTLIBDIR=/usr/lib/qt4 QTDIR=/usr QTINCLUDEDIR=/usr/include/qt4 \
+		scons qtwengophone \
+		mode=release || die "scons failed"
+}
+
+src_install() {
+	cd release-symbols
+	insinto /usr/share/wengophone
+	doins -r emoticons pics sounds
+	exeinto /usr/lib/wengophone
+	doexe wengophone/src/presentation/qt/qtwengophone \
+		wifo/phapi/libphapi.so libs/curl/libowcurl.so
+	make_wrapper wengophone /usr/lib/wengophone/qtwengophone /usr/share/wengophone /usr/lib/wengophone
+	newicon ${S}/wengophone/src/presentation/qt/pics/contact/wengo.png wengophone.png
+	make_desktop_entry wengophone
+}
diff --git a/net-im/wengophone/wengophone-2.0_pre20099999.ebuild b/net-im/wengophone/wengophone-2.0_pre20099999.ebuild
index 94fcc8a1bc3a..bb32604f4df5 100644
--- a/net-im/wengophone/wengophone-2.0_pre20099999.ebuild
+++ b/net-im/wengophone/wengophone-2.0_pre20099999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/wengophone-2.0_pre20099999.ebuild,v 1.3 2006/07/19 06:55:36 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/wengophone-2.0_pre20099999.ebuild,v 1.4 2006/07/19 11:36:12 genstef Exp $
 
 inherit subversion eutils toolchain-funcs
 
@@ -19,6 +19,7 @@ RDEPEND="dev-libs/boost
 	dev-libs/glib
 	dev-libs/openssl
 	media-libs/alsa-lib
+	media-video/ffmpeg
 	net-libs/gnutls
 	|| ( x11-libs/libX11 virtual/x11 )
 	>=x11-libs/qt-4.1"
@@ -43,6 +44,25 @@ pkg_setup() {
 }
 
 src_compile() {
+	# use system ffmpeg
+	cp ${FILESDIR}/ffmpeg-system.scons libs/ffmpeg/SConscript
+	sed -i -e "s:<avcodec.h:<ffmpeg/avcodec.h:" \
+		./libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c \
+		./libs/pixertool/include/pixertool/pixertool.h \
+		./libs/pixertool/include/pixertool/ffmpeg-pixertool.h \
+		./wifo/phapi/phcodec-mpeg4.c \
+		./wifo/phapi/phcodec-mpeg4.h \
+		./wifo/phapi/phcodec-avcodec-wrapper.c \
+		./wifo/phapi/phcodec-avcodec-wrapper.h \
+		./wifo/phapi/phmedia-video-bwcontrol.c \
+		./wifo/phapi/phmedia-video.c \
+		./wifo/phapi/phmedia-video-control.c \
+		./wifo/phapi/phapi.c \
+		./wifo/phapi/phcodec-h263.c \
+		./wifo/phapi/phcodec-h263.h \
+		./wifo/phapi/phcodec-h264.c \
+		./wengophone/src/presentation/qt/QtAbout.cpp
+
 	QTLIBDIR=/usr/lib/qt4 QTDIR=/usr QTINCLUDEDIR=/usr/include/qt4 \
 		scons qtwengophone \
 		mode=release || die "scons failed"