| 1 |
loki_val 08/06/29 14:41:02 |
| 2 |
|
| 3 |
Added: opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch |
| 4 |
Log: |
| 5 |
Add patch for ffmpeg-0.4.9_p20080326 compatibility. Depends for ffmpeg raised to >=ffmpeg-0.4.9_p20080326. Bug #229621 and bug #229405. |
| 6 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-libs/opencv/files/opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/opencv/files/opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: opencv-1.0.0-ffmpeg-0.4.9_p20080326.patch |
| 15 |
=================================================================== |
| 16 |
--- opencv-1.0.0/configure.in.orig 2008-06-28 09:58:49.000000000 +0300 |
| 17 |
+++ opencv-1.0.0/configure.in 2008-06-28 10:10:23.000000000 +0300 |
| 18 |
@@ -439,8 +439,8 @@ |
| 19 |
AM_CONDITIONAL([BUILD_XINE], [test x"$have_xine" = "xyes"]) |
| 20 |
|
| 21 |
if test x"$with_ffmpeg" = x"yes"; then |
| 22 |
- AC_CHECK_HEADER(ffmpeg/avcodec.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/avcodec.h not found])]) |
| 23 |
- AC_CHECK_HEADER(ffmpeg/swscale.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/swscale.h not found])]) |
| 24 |
+ AC_CHECK_HEADER(libavcodec/avcodec.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/avcodec.h not found])]) |
| 25 |
+ AC_CHECK_HEADER(libswscale/swscale.h,, [AC_MSG_ERROR([FFmpeg requested but header file ffmpeg/swscale.h not found])]) |
| 26 |
AC_CHECK_LIB(avcodec, avcodec_decode_video,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])]) |
| 27 |
AC_CHECK_LIB(avformat, av_open_input_file,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])]) |
| 28 |
AC_CHECK_LIB(swscale, sws_getContext,, [AC_MSG_ERROR([FFmpeg requested but ffmpeg libraries not found])]) |
| 29 |
--- opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp.orig 2008-06-28 09:58:50.000000000 +0300 |
| 30 |
+++ opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp 2008-06-28 10:11:16.000000000 +0300 |
| 31 |
@@ -44,9 +44,9 @@ |
| 32 |
#define __STDC_CONSTANT_MACROS |
| 33 |
|
| 34 |
extern "C" { |
| 35 |
-#include <ffmpeg/avformat.h> |
| 36 |
-#include <ffmpeg/avcodec.h> |
| 37 |
-#include <ffmpeg/swscale.h> |
| 38 |
+#include <libavformat/avformat.h> |
| 39 |
+#include <libavcodec/avcodec.h> |
| 40 |
+#include <libswscale/swscale.h> |
| 41 |
#include <sys/types.h> /* size_t */ |
| 42 |
#include <sys/errno.h> |
| 43 |
} |
| 44 |
--- opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp.orig 2008-06-28 10:14:35.000000000 +0300 |
| 45 |
+++ opencv-1.0.0/otherlibs/highgui/cvcap_ffmpeg.cpp 2008-06-28 10:24:45.000000000 +0300 |
| 46 |
@@ -105,7 +105,8 @@ |
| 47 |
|
| 48 |
static int icvOpenAVI_FFMPEG( CvCaptureAVI_FFMPEG* capture, const char* filename ) |
| 49 |
{ |
| 50 |
- int err, valid = 0, video_index = -1, i; |
| 51 |
+ unsigned int i; |
| 52 |
+ int err, valid = 0, video_index = -1; |
| 53 |
AVFormatContext *ic; |
| 54 |
|
| 55 |
capture->ic = NULL; |
| 56 |
@@ -753,7 +754,7 @@ |
| 57 |
/// close video output stream and free associated memory |
| 58 |
CV_IMPL void cvReleaseVideoWriter( CvVideoWriter ** writer ) |
| 59 |
{ |
| 60 |
- int i; |
| 61 |
+ unsigned int i; |
| 62 |
|
| 63 |
// nothing to do if already released |
| 64 |
if ( !(*writer) ) |
| 65 |
@@ -801,7 +802,7 @@ |
| 66 |
|
| 67 |
if (!(mywriter->fmt->flags & AVFMT_NOFILE)) { |
| 68 |
/* close the output file */ |
| 69 |
- url_fclose(&mywriter->oc->pb); |
| 70 |
+ url_fclose(mywriter->oc->pb); |
| 71 |
} |
| 72 |
|
| 73 |
/* free the stream */ |
| 74 |
--- opencv-1.0.0/otherlibs/highgui/cvcap_xine.cpp.orig 2006-05-04 18:55:20.000000000 +0300 |
| 75 |
+++ opencv-1.0.0/otherlibs/highgui/cvcap_xine.cpp 2008-06-28 10:19:47.000000000 +0300 |
| 76 |
@@ -598,7 +598,7 @@ |
| 77 |
// TODO: FIX IT, DOESN'T WORK PROPERLY, YET...! |
| 78 |
int pos_t, pos_l, length; |
| 79 |
xine_get_pos_length( capture->stream, &pos_l, &pos_t, &length ); |
| 80 |
- fprintf( stderr, "ratio on GetProperty(): %n\n", pos_l ); |
| 81 |
+ fprintf( stderr, "ratio on GetProperty(): %d\n", pos_l ); |
| 82 |
|
| 83 |
/// use xinelib's seek functionality |
| 84 |
if ( xine_play( capture->stream, (int)(ratio*(float)length), 0 ) ) |
| 85 |
|
| 86 |
|
| 87 |
|
| 88 |
-- |
| 89 |
gentoo-commits@l.g.o mailing list |
Archives