diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-01-30 13:41:34 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-01-30 13:41:34 +0000 |
| commit | e2323abf8111db3403c756a4dfa029829e48a6d9 (patch) | |
| tree | 491d74e10b38c4e88c59d2962409f809ccee926a | |
| parent | Bump for #401243 (diff) | |
| download | historical-e2323abf8111db3403c756a4dfa029829e48a6d9.tar.gz historical-e2323abf8111db3403c756a4dfa029829e48a6d9.tar.bz2 historical-e2323abf8111db3403c756a4dfa029829e48a6d9.zip | |
Fix building against >=ffmpeg-0.8, bug #401175.
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
| -rw-r--r-- | net-im/qutecom/ChangeLog | 9 | ||||
| -rw-r--r-- | net-im/qutecom/Manifest | 5 | ||||
| -rw-r--r-- | net-im/qutecom/files/qutecom-2.2-no-deprecated-avcodec-decode-video.patch | 18 | ||||
| -rw-r--r-- | net-im/qutecom/qutecom-2.2_p20110210.ebuild | 5 |
4 files changed, 31 insertions, 6 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/Manifest b/net-im/qutecom/Manifest index b1caa34269b6..9eda4fd637b5 100644 --- a/net-im/qutecom/Manifest +++ b/net-im/qutecom/Manifest @@ -1,4 +1,5 @@ +AUX qutecom-2.2-no-deprecated-avcodec-decode-video.patch 673 RMD160 e5e41e8ec9d911dc0de481ba12fe93b39555a847 SHA1 8ebc432a9a2dc94d1f8d83ea2ac483d4b18173c6 SHA256 648e557c9364b3cdbd8ffe5f9967dadc64476d45c0ea2b1fedfc5aad2189cf7f DIST qutecom-2.2_p20110210.tar.xz 39408892 RMD160 f26e618d11b9fa767f19d58fedd1b202b2dca841 SHA1 1ec9418f519b5a8fa1f7d24872a80d552a2915bd SHA256 76cdfc2cee5a71c264bcc255b9657ebcd3f70fac0be37772fd47bf3c97f2677e -EBUILD qutecom-2.2_p20110210.ebuild 2240 RMD160 644ed568bfdbbecdb3f2a1d070df915b61b504b0 SHA1 4470e5ccea78ffcabbcd28fc14ce0a336edc5fe8 SHA256 6876a4fdb11b72d84569a4a7627bb39cf86b91c7deb12d0dffb506614f329b2b -MISC ChangeLog 1553 RMD160 4c7af1a1f9dc240603df549c39223d032ac3f71c SHA1 c7533be27880e39d73a8cc044adf3bc6094d2f0c SHA256 7721fadfc9bb87b0e19232c30c4ee65dea75fc9bffc2aefbbcdc855e90e66b03 +EBUILD qutecom-2.2_p20110210.ebuild 2313 RMD160 55bc670d6433eb591f4b45d0ba8d20dd6bcf32c3 SHA1 ef3b96fa0a6aac3fd2b449915ffb6c36894562ad SHA256 00e0abdd7633810bc5205dc64fc46b42107a59045434b18c4373cc789d131da0 +MISC ChangeLog 1768 RMD160 0d4e8a95221077e5fd83f943c0ceef7acb395538 SHA1 67f1d70e53ada3d5adb6d4ed90d59d107a141ce5 SHA256 4bf9b019a13bafb0b7b9fab716d4594f9dd5a11be35d461d7d0d0ea63d601d80 MISC metadata.xml 272 RMD160 4a80062ca381c4d74a4efabc38d29fb1b0c6b592 SHA1 28f9d9426442ff315737006285ca0b90b4ef833f SHA256 55558c7efd245be98e0b3a5be45c4e855ecb6f2f4d651edf3d5442d6edbd9298 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() { |