summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-01-30 13:41:34 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2012-01-30 13:41:34 +0000
commit53321f25e1f4c15f57561ce537906da7f51009dd (patch)
treec953dafaaf5c1b0edda42d4c20406c2d6c70b5a3 /net-im
parentBump for #401243 (diff)
downloadgentoo-2-53321f25e1f4c15f57561ce537906da7f51009dd.tar.gz
gentoo-2-53321f25e1f4c15f57561ce537906da7f51009dd.tar.bz2
gentoo-2-53321f25e1f4c15f57561ce537906da7f51009dd.zip
Fix building against >=ffmpeg-0.8, bug #401175.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'net-im')
-rw-r--r--net-im/qutecom/ChangeLog9
-rw-r--r--net-im/qutecom/files/qutecom-2.2-no-deprecated-avcodec-decode-video.patch18
-rw-r--r--net-im/qutecom/qutecom-2.2_p20110210.ebuild5
3 files changed, 28 insertions, 4 deletions
diff --git a/net-im/qutecom/ChangeLog b/net-im/qutecom/ChangeLog
index 862c4f1b33ec..ea31343964bf 100644
--- a/net-im/qutecom/ChangeLog
+++ b/net-im/qutecom/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-im/qutecom
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutecom/ChangeLog,v 1.11 2011/10/03 08:08:29 chithanh Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutecom/ChangeLog,v 1.12 2012/01/30 13:41:34 chithanh Exp $
+
+ 30 Jan 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ qutecom-2.2_p20110210.ebuild,
+ +files/qutecom-2.2-no-deprecated-avcodec-decode-video.patch:
+ Fix building against >=ffmpeg-0.8, bug #401175.
03 Oct 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
qutecom-2.2_p20110210.ebuild:
diff --git a/net-im/qutecom/files/qutecom-2.2-no-deprecated-avcodec-decode-video.patch b/net-im/qutecom/files/qutecom-2.2-no-deprecated-avcodec-decode-video.patch
new file mode 100644
index 000000000000..b8f423be791b
--- /dev/null
+++ b/net-im/qutecom/files/qutecom-2.2-no-deprecated-avcodec-decode-video.patch
@@ -0,0 +1,18 @@
+diff -ur a/wifo/phapi/phcodec-avcodec-wrapper.c b/wifo/phapi/phcodec-avcodec-wrapper.c
+--- a/wifo/phapi/phcodec-avcodec-wrapper.c 2011-02-10 11:03:43.000000000 +0100
++++ b/wifo/phapi/phcodec-avcodec-wrapper.c 2012-01-30 14:05:15.000000000 +0100
+@@ -63,8 +63,12 @@
+ int dec_len, got_picture = 0;
+ ph_avcodec_decoder_ctx_t * decoder_t = (ph_avcodec_decoder_ctx_t *) ctx;
+
+- dec_len = avcodec_decode_video(decoder_t->context,
+- dst, &got_picture, (uint8_t *)src, srcsize);
++ AVPacket pkt;
++ av_init_packet(&pkt);
++ pkt.data = (uint8_t*) src;
++ pkt.size = srcsize;
++ dec_len = avcodec_decode_video2(decoder_t->context,
++ dst, &got_picture, &pkt);
+
+ if (got_picture)
+ {
diff --git a/net-im/qutecom/qutecom-2.2_p20110210.ebuild b/net-im/qutecom/qutecom-2.2_p20110210.ebuild
index a7510a6621d1..c4b0e9b16cd8 100644
--- a/net-im/qutecom/qutecom-2.2_p20110210.ebuild
+++ b/net-im/qutecom/qutecom-2.2_p20110210.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutecom/qutecom-2.2_p20110210.ebuild,v 1.7 2011/10/03 08:08:29 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutecom/qutecom-2.2_p20110210.ebuild,v 1.8 2012/01/30 13:41:34 chithanh Exp $
EAPI="3"
@@ -56,6 +56,7 @@ src_prepare() {
libs/pixertool/src/v4l/v4l-pixertool.c \
libs/webcam/include/webcam/V4LWebcamDriver.h \
libs/webcam/src/v4l/V4LWebcamDriver.cpp || die
+ epatch "${FILESDIR}"/${PN}-2.2-no-deprecated-avcodec-decode-video.patch
}
src_configure() {