Add patch for ffmpeg-0.4.9_p20080326 compatibility. Depends for ffmpeg raised to >=ffmpeg-0.4.9_p20080326. Bug #229621 and bug #229405.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

4 files changed, 81 insertions, 15 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 145591fc5b63..08c8921e9f18 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.4 2008/06/23 00:27:07 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.5 2008/06/29 14:41:01 loki_val Exp $
+
+  29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch, opencv-1.0.0-r1.ebuild:
+  Add patch for ffmpeg-0.4.9_p20080326 compatibility. Depends for ffmpeg
+  raised to >=ffmpeg-0.4.9_p20080326. Bug #229621 and bug #229405.
 
 *opencv-1.0.0-r1 (23 Jun 2008)
 
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 5750397967d5..d5d65be08098 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX opencv-1.0.0-addoptionalsamples.patch 1070 RMD160 6e2bb79f18bab6cb2beeb2aac5428434e049891c SHA1 1d0e51a26fd4d50d1bff4f2da44beca844946586 SHA256 e25e1236188e943a8e707f852ff25fc97d646f698bf6805e2cd8a2a8628bb540
 AUX opencv-1.0.0-automagicdependencies.patch 19265 RMD160 7d9685568f47b8efd494e1b5a08ea1efe791f9a0 SHA1 e92d613747707f7701bb5ba0b9b484b7315e1748 SHA256 862596926e8cd25ff019a5e232fc03522be0103ff084dbfbd36340bfab99d547
 AUX opencv-1.0.0-cvcapffmpegundefinedsymbols.patch 2762 RMD160 cd6d3624205ecc69e5513d0e7424d85c3ea4d932 SHA1 c31d0fe278e1e7f005c668255214ec204a1d70d8 SHA256 90fc7035d3084f71319eea5a33f8440522e93dd5ec090a89fdd36a4bd84cb8ee
 AUX opencv-1.0.0-enableuseflags.patch 5107 RMD160 fb23cfe9ff83be4196f85448d462409e29797bf3 SHA1 9ad3158e2e5b0f84b13269bf9944b3753baab1c9 SHA256 af59706ebe8a4529366cfb335e4d8a2e17f9ab07127455a624df54876130e153
+AUX opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch 3076 RMD160 321211a9bfbe98875ced91c79f1744c7d9dd76d8 SHA1 9672cc37ba5bd6de0fcfc2b24e58d3d9347d1437 SHA256 844fd579d2379dc57b0e9d7ce97a36c6a6efafbae4e146c2a6d44c88b7e76222
 AUX opencv-1.0.0-fixpythonmultilib.patch 423 RMD160 a3cdb0c1a25b4f8ab8447ac6e4776ade2daad458 SHA1 f3d43b10b5cdfd77ce50cfea7cf9c1431479c5de SHA256 317750f75417b5e2434c09f8244d347c7340eebe721579c7f39639b526af61fb
 AUX opencv-1.0.0-havepngexrdefs.patch 1869 RMD160 477e487f34c9ebdc8e7666d2d6c7369a44bde7ed SHA1 9c7df4269887a5d5d3e2a4b17840f168098224f2 SHA256 5b077c9958d1699ec8b1d1c952f90d2830d4a4f9b0fe7a01a21747a6280f12d6
 DIST opencv-1.0.0.tar.gz 11146334 RMD160 f041798ea63101b90e945957e0d0ad3f7497dcd4 SHA1 c7dd500703b0060cedfa049fcb33de0846e631fb SHA256 3a6ee888e4dd4ab7f2bc80d046688c099c6a95d1267af554b7c8f1543b66f21e
-EBUILD opencv-1.0.0-r1.ebuild 2521 RMD160 c3e5e984955b7cc3104056082c4f6202e5714549 SHA1 44331282553abfc156abec98db2e6bafefcb4de2 SHA256 3f49a0eab2554e240d1e06b25f116dc3595bf65c3ee879c150c92e47e84c1bad
-MISC ChangeLog 1146 RMD160 af56183c43ad1eac481b8ec35b72a3f6dd3253c4 SHA1 50f183c461d61d9708e0a6054ade567ca774e14d SHA256 4912708ad6d4c45503063961f3357d27ed8ac19b3b3bb4ccdf32f859bdd11a01
+EBUILD opencv-1.0.0-r1.ebuild 2592 RMD160 392950ff0dc1bb550d3e708200dc970b2f9a07e6 SHA1 863ef44bfa65c5a54086186e28b6d03e016157a1 SHA256 1bf4b9315c1090ac9b5a9d5c04e7bb9eaf8cc20320cfdf2a9f94902533d04824
+MISC ChangeLog 1413 RMD160 6b128465de8860d2495b74801718c04824945c5c SHA1 5f91dce0f90e2e0f3620f6874a0116b126886183 SHA256 495712da94d20e152019fc14350bdb3e2caf653a57b7ae580e6d45cc5bf85fe6
 MISC metadata.xml 652 RMD160 5cfb86ff65264086bc032c406763d3cc46b075d2 SHA1 771ee2dc24641518bbacc47bbffa356d0c071a35 SHA256 b63ce92a359d882b519ef92ef358a73ce854bd875e19c283c72217b0d7965bdc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhe8VIACgkQF6yMcaBxwHnP4gCfZUFT8NDqkCB6uVsrI6Jj5n1e
-EJMAnRs39bU+fKW155UdcD8ZbP+ysn+A
-=Wp4x
------END PGP SIGNATURE-----
diff --git a/media-libs/opencv/files/opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch b/media-libs/opencv/files/opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch
new file mode 100644
index 000000000000..25882614de79
--- /dev/null
+++ b/media-libs/opencv/files/opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch
@@ -0,0 +1,69 @@
+--- opencv-1.0.0/configure.in.orig	2008-06-28 09:58:49.000000000 +0300
++++ opencv-1.0.0/configure.in	2008-06-28 10:10:23.000000000 +0300
+@@ -439,8 +439,8 @@
+ AM_CONDITIONAL([BUILD_XINE], [test x"$have_xine" = "xyes"])
+ 
+ if test x"$with_ffmpeg" = x"yes"; then
+-        AC_CHECK_HEADER(ffmpeg/avcodec.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/avcodec.h not found])])
+-        AC_CHECK_HEADER(ffmpeg/swscale.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/swscale.h not found])])
++        AC_CHECK_HEADER(libavcodec/avcodec.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/avcodec.h not found])])
++        AC_CHECK_HEADER(libswscale/swscale.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/swscale.h not found])])
+         AC_CHECK_LIB(avcodec, avcodec_decode_video,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])])
+         AC_CHECK_LIB(avformat, av_open_input_file,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])])
+         AC_CHECK_LIB(swscale, sws_getContext,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])])
+--- opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp.orig	2008-06-28 09:58:50.000000000 +0300
++++ opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp	2008-06-28 10:11:16.000000000 +0300
+@@ -44,9 +44,9 @@
+ #define __STDC_CONSTANT_MACROS
+ 
+ extern "C" {
+-#include <ffmpeg/avformat.h>
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/swscale.h>
++#include <libavformat/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libswscale/swscale.h>
+ #include <sys/types.h> /* size_t */
+ #include <sys/errno.h>
+ }
+--- opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp.orig	2008-06-28 10:14:35.000000000 +0300
++++ opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp	2008-06-28 10:24:45.000000000 +0300
+@@ -105,7 +105,8 @@
+ 
+ static int icvOpenAVI_FFMPEG( CvCaptureAVI_FFMPEG* capture, const char* filename )
+ {
+-    int err, valid = 0, video_index = -1, i;
++    unsigned int i;
++    int err, valid = 0, video_index = -1;
+     AVFormatContext *ic;
+ 
+     capture->ic = NULL;
+@@ -753,7 +754,7 @@
+ /// close video output stream and free associated memory
+ CV_IMPL void cvReleaseVideoWriter( CvVideoWriter ** writer )
+ {
+-	int i;
++	unsigned int i;
+ 
+ 	// nothing to do if already released
+ 	if ( !(*writer) )
+@@ -801,7 +802,7 @@
+ 
+ 	if (!(mywriter->fmt->flags & AVFMT_NOFILE)) {
+ 		/* close the output file */
+-		url_fclose(&mywriter->oc->pb);
++		url_fclose(mywriter->oc->pb);
+ 	}
+ 
+ 	/* free the stream */
+--- opencv-1.0.0/otherlibs/highgui/cvcap_xine.cpp.orig	2006-05-04 18:55:20.000000000 +0300
++++ opencv-1.0.0/otherlibs/highgui/cvcap_xine.cpp	2008-06-28 10:19:47.000000000 +0300
+@@ -598,7 +598,7 @@
+ 	// TODO: FIX IT, DOESN'T WORK PROPERLY, YET...!
+ 		int pos_t, pos_l, length;
+ 		xine_get_pos_length( capture->stream, &pos_l, &pos_t, &length );
+-		fprintf( stderr, "ratio on GetProperty(): %n\n", pos_l );
++		fprintf( stderr, "ratio on GetProperty(): %d\n", pos_l );
+ 
+ 		/// use xinelib's seek functionality
+ 		if ( xine_play( capture->stream, (int)(ratio*(float)length), 0 ) )
diff --git a/media-libs/opencv/opencv-1.0.0-r1.ebuild b/media-libs/opencv/opencv-1.0.0-r1.ebuild
index 7afaac2cf73c..9a130d4eb858 100644
--- a/media-libs/opencv/opencv-1.0.0-r1.ebuild
+++ b/media-libs/opencv/opencv-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-1.0.0-r1.ebuild,v 1.1 2008/06/23 00:27:07 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-1.0.0-r1.ebuild,v 1.2 2008/06/29 14:41:01 loki_val Exp $
 
 EAPI="1"
 inherit eutils flag-o-matic autotools
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug demos examples ffmpeg gtk ieee1394 jpeg jpeg2k openexr png python tiff xine v4l zlib"
 
-COMMON_DEPEND="ffmpeg? ( media-video/ffmpeg )
+COMMON_DEPEND="ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
 	gtk? ( x11-libs/gtk+:2 )
 	ieee1394? ( >=sys-libs/libraw1394-1.2.0 media-libs/libdc1394:1 )
 	jpeg? ( media-libs/jpeg )
@@ -44,6 +44,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-havepngexrdefs.patch
 	epatch "${FILESDIR}"/${P}-addoptionalsamples.patch
 	epatch "${FILESDIR}"/${P}-cvcapffmpegundefinedsymbols.patch
+	epatch "${FILESDIR}"/${P}-ffmpeg-0.4.9_p20080326.patch
 
 	eautoreconf || die "eautoreconf failed"
 }