summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-08-14 21:55:41 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-08-14 21:55:41 +0000
commite9265706986fe45cb32abaebfde04ff640cd4752 (patch)
treed166e51c0def758c55257b501fac89a5c46b308e /net-im
parentVersion bump, cleaned up old versions. (diff)
downloadgentoo-2-e9265706986fe45cb32abaebfde04ff640cd4752.tar.gz
gentoo-2-e9265706986fe45cb32abaebfde04ff640cd4752.tar.bz2
gentoo-2-e9265706986fe45cb32abaebfde04ff640cd4752.zip
patch to fix ffmpeg problem, thanks to Stephan <fatty@gsklan.de> in bug 143907
(Portage version: 2.1.1_pre5-r1)
Diffstat (limited to 'net-im')
-rw-r--r--net-im/wengophone/ChangeLog6
-rw-r--r--net-im/wengophone/files/ffmpeg-include.patch11
-rw-r--r--net-im/wengophone/wengophone-2.0_rc2.ebuild5
3 files changed, 20 insertions, 2 deletions
diff --git a/net-im/wengophone/ChangeLog b/net-im/wengophone/ChangeLog
index 0528eba4cc16..6c5ffd5b9e37 100644
--- a/net-im/wengophone/ChangeLog
+++ b/net-im/wengophone/ChangeLog
@@ -1,6 +1,10 @@
# 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.10 2006/08/13 18:14:43 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/ChangeLog,v 1.11 2006/08/14 21:55:41 genstef Exp $
+
+ 14 Aug 2006; Stefan Schweizer <genstef@gentoo.org>
+ +files/ffmpeg-include.patch, wengophone-2.0_rc2.ebuild:
+ patch to fix ffmpeg problem, thanks to Stephan <fatty@gsklan.de> in bug 143907
*wengophone-2.0_rc2 (13 Aug 2006)
diff --git a/net-im/wengophone/files/ffmpeg-include.patch b/net-im/wengophone/files/ffmpeg-include.patch
new file mode 100644
index 000000000000..7f2f2815a30b
--- /dev/null
+++ b/net-im/wengophone/files/ffmpeg-include.patch
@@ -0,0 +1,11 @@
+--- wengophone/src/presentation/qt/QtAbout.cpp.old 2006-08-14 23:09:34.260923224 +0200
++++ wengophone/src/presentation/qt/QtAbout.cpp 2006-08-14 23:09:03.997523960 +0200
+@@ -33,7 +33,7 @@
+ #include <portaudio.h>
+ #endif
+ #include <boost/version.hpp>
+-#include <avcodec.h>
++#include <ffmpeg/avcodec.h>
+ #include <tinyxml.h>
+ extern "C" {
+ #include <glib.h>
diff --git a/net-im/wengophone/wengophone-2.0_rc2.ebuild b/net-im/wengophone/wengophone-2.0_rc2.ebuild
index f3eed5c3fc10..1c2fdcc2c801 100644
--- a/net-im/wengophone/wengophone-2.0_rc2.ebuild
+++ b/net-im/wengophone/wengophone-2.0_rc2.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_rc2.ebuild,v 1.1 2006/08/13 18:14:43 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/wengophone-2.0_rc2.ebuild,v 1.2 2006/08/14 21:55:41 genstef Exp $
inherit eutils toolchain-funcs
@@ -57,6 +57,9 @@ src_unpack() {
for dpatch in debian/patches/*.patch; do
epatch ${dpatch}
done
+
+ # ffmpeg include is not always found, bug 143907
+ epatch ${FILESDIR}/ffmpeg-include.patch
}
src_compile() {