- obsoleted

Changed files:
    opencv-ffmpeg-0.8.patch -> 1.3
    opencv-multilib.patch -> 1.2

diff --git a/opencv-ffmpeg-0.8.patch b/opencv-ffmpeg-0.8.patch
deleted file mode 100644 (file)
index 6ceb5aa..0000000
--- a/opencv-ffmpeg-0.8.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- OpenCV-2.2.0/modules/highgui/src/cap_ffmpeg.cpp.orig       2010-12-05 04:35:25.000000000 +0100
-+++ OpenCV-2.2.0/modules/highgui/src/cap_ffmpeg.cpp    2011-06-29 16:24:22.527412497 +0200
-@@ -466,7 +466,7 @@
-         AVCodecContext *enc = &ic->streams[i]->codec;
- #endif
- 
--        if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
-+        if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
-             AVCodec *codec = avcodec_find_decoder(enc->codec_id);
-             if (!codec ||
-             avcodec_open(enc, codec) < 0)
-@@ -551,9 +551,16 @@
-               }
- 
- #if LIBAVFORMAT_BUILD > 4628
--        avcodec_decode_video(video_st->codec,
-+      {
-+      AVPacket avpkt;
-+      av_init_packet(&avpkt);
-+      avpkt.data = packet.data;
-+      avpkt.size = packet.size;
-+      avpkt.flags = AV_PKT_FLAG_KEY;
-+        avcodec_decode_video2(video_st->codec,
-                              picture, &got_picture,
--                             packet.data, packet.size);
-+                             &avpkt);
-+      }
- #else
-         avcodec_decode_video(&video_st->codec,
-                              picture, &got_picture,
-@@ -806,15 +813,17 @@
- static const char * icvFFMPEGErrStr(int err)
- {
-     switch(err) {
--    case AVERROR_NUMEXPECTED:
-+    case AVERROR(EINVAL):
-               return "Incorrect filename syntax";
-+#if (AVERROR_INVALIDDATA) != (AVERROR(EINVAL))
-     case AVERROR_INVALIDDATA:
-               return "Invalid data in header";
--    case AVERROR_NOFMT:
-+#endif
-+    case AVERROR(EILSEQ):
-               return "Unknown format";
--    case AVERROR_IO:
-+    case AVERROR(EIO):
-               return "I/O error occurred";
--    case AVERROR_NOMEM:
-+    case AVERROR(ENOMEM):
-               return "Memory allocation error";
-     default:
-               break;
-@@ -899,7 +908,7 @@
- #endif
- 
- #if LIBAVFORMAT_BUILD > 4621
--      c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
-+      c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
- #else
-       c->codec_id = oc->oformat->video_codec;
- #endif
-@@ -911,7 +920,7 @@
-     //if(codec_tag) c->codec_tag=codec_tag;
-       codec = avcodec_find_encoder(c->codec_id);
- 
--      c->codec_type = CODEC_TYPE_VIDEO;
-+      c->codec_type = AVMEDIA_TYPE_VIDEO;
- 
-       /* put sample parameters */
-       c->bit_rate = bitrate;
-@@ -998,7 +1007,7 @@
-         AVPacket pkt;
-         av_init_packet(&pkt);
- 
--        pkt.flags |= PKT_FLAG_KEY;
-+        pkt.flags |= AV_PKT_FLAG_KEY;
-         pkt.stream_index= video_st->index;
-         pkt.data= (uint8_t *)picture;
-         pkt.size= sizeof(AVPicture);
-@@ -1018,7 +1027,7 @@
-                       pkt.pts = c->coded_frame->pts;
- #endif
-             if(c->coded_frame->key_frame)
--                pkt.flags |= PKT_FLAG_KEY;
-+                pkt.flags |= AV_PKT_FLAG_KEY;
-             pkt.stream_index= video_st->index;
-             pkt.data= outbuf;
-             pkt.size= out_size;
-@@ -1215,7 +1224,7 @@
-       av_register_all ();
- 
-       /* auto detect the output format from the name and fourcc code. */
--      fmt = guess_format(NULL, filename, NULL);
-+      fmt = av_guess_format(NULL, filename, NULL);
-       if (!fmt)
-         return false;
- 
-@@ -1238,7 +1247,7 @@
- #endif
- 
-     // alloc memory for context
--      oc = av_alloc_format_context();
-+      oc = avformat_alloc_context();
-       assert (oc);
- 
-       /* set file name */

diff --git a/opencv-multilib.patch b/opencv-multilib.patch
deleted file mode 100644 (file)
index c7d3ae4..0000000
--- a/opencv-multilib.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- OpenCV-2.2.0/modules/highgui/CMakeLists.txt~       2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt        2010-12-07 13:43:58.544879668 +0100
-@@ -302,8 +302,8 @@
- 
- install(TARGETS ${the_target}
-       RUNTIME DESTINATION bin COMPONENT main
--      LIBRARY DESTINATION lib COMPONENT main
--      ARCHIVE DESTINATION lib COMPONENT main)
-+      LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+      ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
- 
- install(FILES ${highgui_ext_hdrs}
-         DESTINATION include/opencv2/highgui
---- OpenCV-2.2.0/modules/gpu/CMakeLists.txt~   2010-12-07 13:41:30.061546334 +0100
-+++ OpenCV-2.2.0/modules/gpu/CMakeLists.txt    2010-12-07 13:44:31.161546335 +0100
-@@ -124,8 +124,8 @@
- 
- install(TARGETS ${the_target}
-       RUNTIME DESTINATION bin COMPONENT main
--      LIBRARY DESTINATION lib COMPONENT main
--      ARCHIVE DESTINATION lib COMPONENT main)
-+      LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+      ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main)
- 
- install(FILES ${lib_hdrs}
-       DESTINATION include/opencv2/${name}
---- OpenCV-2.2.0/modules/ffmpeg/CMakeLists.txt~        2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/ffmpeg/CMakeLists.txt 2010-12-07 13:45:03.004879667 +0100
-@@ -49,6 +49,6 @@
- 
- install(TARGETS ${the_target}
-     RUNTIME DESTINATION bin COMPONENT main
--    ARCHIVE DESTINATION lib COMPONENT main
--    LIBRARY DESTINATION lib COMPONENT main
-+    ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main
-+    LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main
-     )
---- OpenCV-2.2.0/CMakeLists.txt~       2010-12-07 13:49:56.981546334 +0100
-+++ OpenCV-2.2.0/CMakeLists.txt        2010-12-07 13:50:17.114879668 +0100
-@@ -513,8 +513,8 @@
- 
-     string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
-     if(UNIX)
--        set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
--        set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
-+      set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
-+      set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
-     endif()
-     if(WIN32)
-         get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)