net-im/qutecom: fixed the build with ffmpeg-20080326

svn path=/sunrise/; revision=7128

4 files changed, 102 insertions, 3 deletions

diff --git a/net-im/qutecom/ChangeLog b/net-im/qutecom/ChangeLog
index 7a317c647..03467176f 100644
--- a/net-im/qutecom/ChangeLog
+++ b/net-im/qutecom/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Sep 2008; Chi-Thanh Christopher Nguyen (chithead)
+  <chithanh@cs.tu-berlin.de> +files/qutecom-newerffmpeg2.patch,
+  qutecom-2.2_rc1-r1.ebuild:
+  fixed the build with ffmpeg-0.4.9_p20080326
+
   19 Sep 2008; Chi-Thanh Christopher Nguyen (chithead)
   <chithanh@cs.tu-berlin.de> +files/qutecom-newerffmpeg0.patch,
   qutecom-2.2_rc1-r1.ebuild, +files/qutecom-newerffmpeg1.patch:
diff --git a/net-im/qutecom/Manifest b/net-im/qutecom/Manifest
index 55cefd643..899c6d939 100644
--- a/net-im/qutecom/Manifest
+++ b/net-im/qutecom/Manifest
@@ -4,8 +4,9 @@ AUX qutecom-cstdlib-include.patch 371 RMD160 b2bf62fba4de1c384b6e2d586aea0171ba0
 AUX qutecom-gcc-4.3-switch-enum.patch 892 RMD160 89bb4421383bb263b65b302f3909edc9c250d467 SHA1 b8ee70f9f28dec35cb3bb324586872ba2b0ce666 SHA256 db5da9b715991dab954bce5cd8970dabec2cc8700540363ce1aac4242f958ce3
 AUX qutecom-newerffmpeg0.patch 5701 RMD160 4b81c76e8f0d051c09c2fb00398800ef79ac9e1d SHA1 24067b1b1ccd0156568943af12a567b6c0f5d6f3 SHA256 60f77ce35c01bd2a050a430d91cd9cbdd2c2fc177d94b0c869d6f9f50086b021
 AUX qutecom-newerffmpeg1.patch 4113 RMD160 a32916f7ad640fdf58581104fae2f8708e1d886d SHA1 67048410246512c6e92b7c24ad971804ce90d918 SHA256 cea60759770abaa03474ccd8b4bc7501a17fcaf7f2074468e292429b0194a626
+AUX qutecom-newerffmpeg2.patch 3060 RMD160 e7542b8b46c007e7f19d21a2b8719255dcac3684 SHA1 a800f733447948d3aa2e857645daa679177af5d0 SHA256 733e90db37835dfccb758c3b7795fddca1781d146ce509d58ba9ee03ec6b9848
 AUX qutecom-types.h.patch 345 RMD160 3e847c147ee686933d87bfde97b57b1d12d74898 SHA1 fdae61a25fdbc3cad0a0e6f3b3857456ca8acc4d SHA256 b65cca74d41d941aff7467cf1f0ad863b5d504f74b80378bf65457cf1ab114c4
 DIST qutecom-2.2-RC1.tar.gz 43137488 RMD160 33ce9c89660699547c9bfc3dbd77051862622a34 SHA1 fc8dd06339a03806611d93a66c98450d584fbebf SHA256 ec729be2eec6704f11401b4e0f3a2356e884b3d20702ebd3419cf02c197e8eaf
-EBUILD qutecom-2.2_rc1-r1.ebuild 1662 RMD160 946b920b81bcf66b7b5dfc7cf77f71bd137b7d9e SHA1 d63fe214efbbda21c05addde3adc84c91616169a SHA256 a9443b72a064c1b3c6fa5d0ca773a9b54ead04ea6a735d101f2b0074244db229
-MISC ChangeLog 1200 RMD160 4ec263e7ad01a67fb32286f04d18323d14984354 SHA1 a8bf6d02ccf6bed4f01226d6c3d2833c36f28d27 SHA256 576872e941e49c5abfa8c764d5835b7b86f29e9002e1c2bb0de4d814189831a5
+EBUILD qutecom-2.2_rc1-r1.ebuild 1727 RMD160 2250ebaefbced7321ec9326e685ea633f24cfdbc SHA1 27e275aba5b859a1703b4f008ef7829102088dee SHA256 0ab37ee11fedbec5a0e3a1d84f51a38de87b24ea4b1f06c67494cfbd98119c1d
+MISC ChangeLog 1395 RMD160 f675d309a226099c1f5df5f6892ac014ad466293 SHA1 df1fa7a3b28e0ca7a5d55de4cc3c37009e968cee SHA256 e54d83ed2fd8a1c0fcc3fce72bf9a1d9da40ce57099683c9831264d89e046e53
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-im/qutecom/files/qutecom-newerffmpeg2.patch b/net-im/qutecom/files/qutecom-newerffmpeg2.patch
new file mode 100644
index 000000000..32b1faec6
--- /dev/null
+++ b/net-im/qutecom/files/qutecom-newerffmpeg2.patch
@@ -0,0 +1,92 @@
+diff -ur a/libs/pixertool/config.h.cmake b/libs/pixertool/config.h.cmake
+--- a/libs/pixertool/config.h.cmake	2008-08-21 15:10:12.000000000 +0200
++++ b/libs/pixertool/config.h.cmake	2008-09-20 02:54:33.905671532 +0200
+@@ -1,6 +1,6 @@
+ #ifndef PIXERTOOL_CONFIG_H

+ #define PIXERTOOL_CONFIG_H

+ 

+-#cmakedefine HAVE_SWSCALE

++#cmakedefine SWSCALE_LIBRARY

+ 

+ #endif

+diff -ur a/libs/pixertool/include/pixertool/ffmpeg-pixertool.h b/libs/pixertool/include/pixertool/ffmpeg-pixertool.h
+--- a/libs/pixertool/include/pixertool/ffmpeg-pixertool.h	2008-08-21 15:10:12.000000000 +0200
++++ b/libs/pixertool/include/pixertool/ffmpeg-pixertool.h	2008-09-20 02:55:49.639925955 +0200
+@@ -27,7 +27,7 @@
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+-#ifdef HAVE_SWSCALE
++#ifdef SWSCALE_LIBRARY
+ #include <swscale.h>
+ #endif
+ #include <avcodec.h>
+diff -ur a/libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c b/libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c
+--- a/libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c	2008-08-21 15:10:12.000000000 +0200
++++ b/libs/pixertool/src/ffmpeg/ffmpeg-pixertool.c	2008-09-20 02:55:15.759926681 +0200
+@@ -24,7 +24,7 @@
+ #include <stdlib.h>
+ 
+ #include <avcodec.h>
+-#ifdef HAVE_SWSCALE
++#ifdef SWSCALE_LIBRARY
+ #include <swscale.h>
+ #endif
+ 
+@@ -131,7 +131,7 @@
+ }
+ 
+ pixerrorcode pix_convert_avpicture(int flags, piximage * img_dst, AVPicture * img_src, pixosi src_fmt) {
+-#ifdef HAVE_SWSCALE
++#ifdef SWSCALE_LIBRARY
+ 	struct SwsContext *convert_context;
+ #endif
+ 	pixosi desiredPalette = pix_ffmpeg_from_pix_osi(img_dst->palette);
+@@ -144,7 +144,7 @@
+ 
+ 	avpicture_fill(pictureBuffer, img_dst->data, desiredPalette, img_dst->width, img_dst->height);
+ 
+-#ifndef HAVE_SWSCALE
++#ifndef SWSCALE_LIBRARY
+        img_convert(pictureBuffer, desiredPalette,
+                img_src, pix_ffmpeg_from_pix_osi(src_fmt),
+                img_dst->width, img_dst->height);
+diff -ur a/libs/pixertool/src/pixertool.cpp b/libs/pixertool/src/pixertool.cpp
+--- a/libs/pixertool/src/pixertool.cpp	2008-08-21 15:10:12.000000000 +0200
++++ b/libs/pixertool/src/pixertool.cpp	2008-09-20 02:55:02.875921871 +0200
+@@ -27,7 +27,7 @@
+ extern "C" {

+ #endif

+ #include <avcodec.h>

+-#ifdef HAVE_SWSCALE

++#ifdef SWSCALE_LIBRARY

+ #include <swscale.h>

+ #endif

+ #ifdef __cplusplus

+@@ -90,7 +90,7 @@
+ 

+ 	uint8_t * buf_source = img_src->data;

+ 	int need_avfree = 0;

+-#ifdef HAVE_SWSCALE

++#ifdef SWSCALE_LIBRARY

+ 	struct SwsContext *convert_context;

+ #endif

+ 

+@@ -141,7 +141,7 @@
+ 			return PIX_NOK;

+ 		}

+ 

+-#ifndef HAVE_SWSCALE

++#ifndef SWSCALE_LIBRARY

+ 	      //TODO optimize this part but will need the preparation of contexts

+                ImgReSampleContext * resample_context = img_resample_init(img_dst->width, img_dst->height,

+                        img_src->width, img_src->height);

+@@ -188,7 +188,7 @@
+ #endif

+ 

+ 	} else {

+-#ifndef HAVE_SWSCALE

++#ifndef SWSCALE_LIBRARY

+                if (img_convert(&avp_target, pix_fmt_target,

+                        &avp_source, pix_fmt_source,

+                        img_src->width, img_src->height) == -1) {

diff --git a/net-im/qutecom/qutecom-2.2_rc1-r1.ebuild b/net-im/qutecom/qutecom-2.2_rc1-r1.ebuild
index 6419efd21..c9f7b686c 100644
--- a/net-im/qutecom/qutecom-2.2_rc1-r1.ebuild
+++ b/net-im/qutecom/qutecom-2.2_rc1-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND=">=dev-libs/boost-1.34
 	media-libs/libsndfile
 	portaudio? ( >=media-libs/portaudio-19_pre )
 	media-libs/speex
-	media-video/ffmpeg
+	>=media-video/ffmpeg-0.4.9_p20080326
 	net-libs/gnutls
 	>=net-libs/libosip-3
 	net-misc/curl
@@ -44,6 +44,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-gcc-4.3-switch-enum.patch
 	epatch "${FILESDIR}"/${PN}-newerffmpeg0.patch
 	epatch "${FILESDIR}"/${PN}-newerffmpeg1.patch
+	epatch "${FILESDIR}"/${PN}-newerffmpeg2.patch
 }
 
 src_compile() {