Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=948c055ef0d0f8a556ec0bc398266e12835cf6b8
commit 948c055ef0d0f8a556ec0bc398266e12835cf6b8 Author: Marius Cirsta <[email protected]> Date: Sun Aug 28 02:39:50 2011 +0000 opencv-2.3.1-1-x86_64 * version bump * removed not needed patches diff --git a/source/xmultimedia-extra/opencv/FrugalBuild b/source/xmultimedia-extra/opencv/FrugalBuild index e29ea39..9bef37a 100644 --- a/source/xmultimedia-extra/opencv/FrugalBuild +++ b/source/xmultimedia-extra/opencv/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Devil505 <[email protected]> pkgname=opencv -pkgver=2.2.0 -pkgrel=2 +pkgver=2.3.1 +pkgrel=1 pkgdesc="Intel(R) Open Source Computer Vision Library" url="http://opencv.willowgarage.com"; depends=('jasper' 'gst-plugins-base' 'openexr' \ @@ -12,6 +12,7 @@ makedepends=('doxygen' 'numpy' 'eigen') _F_sourceforge_ext=".tar.bz2" _F_sourceforge_name="OpenCV" _F_sourceforge_dirname="opencvlibrary" +_F_archive_grepv="android" _F_cmake_confopts="-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ @@ -25,10 +26,6 @@ Finclude sourceforge cmake groups=('xmultimedia-extra') archs=('i686' 'x86_64') _F_cd_path="$_F_sourceforge_name-$pkgver" -source=($source ptrcvcapture.patch OpenCV-2.2-nov4l1.patch ffmpeg08_build.patch) -sha1sums=('984ed71672d50391d0617fce2ef58e7590ec0fd7' \ - '7f49f7b25d93b734435dc572b65f0e2f45f42645' \ - '40987ad833f6b44cfca6cd19eb0dcc758afce64c' \ - '80339928d442af65c6b6a8028fec84831cfd70a3') +sha1sums=('65ec38aaad6e98f19d3dc2d4f017ce1ef8cbcb1b') # optimization OK diff --git a/source/xmultimedia-extra/opencv/OpenCV-2.2-nov4l1.patch b/source/xmultimedia-extra/opencv/OpenCV-2.2-nov4l1.patch deleted file mode 100644 index cacdd77..0000000 --- a/source/xmultimedia-extra/opencv/OpenCV-2.2-nov4l1.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp ---- OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 2011-02-02 16:55:22.844244001 +0100 -+++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp 2011-02-02 16:53:22.224244002 +0100 -@@ -214,7 +214,9 @@ make & enjoy! - #include <sys/types.h> - #include <sys/mman.h> - -+#ifdef HAVE_CAMV4L - #include <linux/videodev.h> -+#endif - - #include <string.h> - #include <stdlib.h> -diff -up OpenCV-2.2.0/modules/highgui/src/cap.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap.cpp ---- OpenCV-2.2.0/modules/highgui/src/cap.cpp.nov4l1 2011-02-04 15:10:51.461243999 +0100 -+++ OpenCV-2.2.0/modules/highgui/src/cap.cpp 2011-02-04 15:11:22.040244001 +0100 -@@ -171,7 +171,7 @@ CV_IMPL CvCapture * cvCreateCameraCaptur - if (capture) - return capture; - #endif -- #if defined (HAVE_CAMV4L) || defined (HAVE_CAMV4L2) -+ #if defined (HAVE_CAMV4L) - capture = cvCreateCameraCapture_V4L (index); - if (capture) - return capture; diff --git a/source/xmultimedia-extra/opencv/ffmpeg08_build.patch b/source/xmultimedia-extra/opencv/ffmpeg08_build.patch deleted file mode 100644 index c298016..0000000 --- a/source/xmultimedia-extra/opencv/ffmpeg08_build.patch +++ /dev/null @@ -1,155 +0,0 @@ ---- OpenCV-2.2.0/modules/highgui/src/cap_ffmpeg.cpp.old 2011-08-03 16:41:31.890987657 +0200 -+++ OpenCV-2.2.0/modules/highgui/src/cap_ffmpeg.cpp 2011-08-03 16:41:57.232987643 +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) -@@ -550,15 +550,27 @@ - continue; - } - --#if LIBAVFORMAT_BUILD > 4628 -- avcodec_decode_video(video_st->codec, -- picture, &got_picture, -- packet.data, packet.size); --#else -- avcodec_decode_video(&video_st->codec, -- picture, &got_picture, -- packet.data, packet.size); --#endif -+ -+ AVPacket avpkt; -+ av_init_packet(&avpkt); -+ avpkt.data = packet.data; -+ avpkt.size = packet.size; -+ // -+ // HACK for CorePNG to decode as normal PNG by default -+ // same method used by ffmpeg -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ avcodec_decode_video2(video_st->codec, -+ picture, &got_picture, &avpkt); -+//Functions Removed from ffmpeg on 4/19/11 -+//#if LIBAVFORMAT_BUILD > 4628 -+// avcodec_decode_video(video_st->codec, -+// picture, &got_picture, -+// packet.data, packet.size); -+//#else -+// avcodec_decode_video(&video_st->codec, -+// picture, &got_picture, -+// packet.data, packet.size); -+//#endif - - if (got_picture) { - // we have a new picture, so memorize it -@@ -803,24 +815,25 @@ - #endif - }; - --static const char * icvFFMPEGErrStr(int err) --{ -- switch(err) { -- case AVERROR_NUMEXPECTED: -- return "Incorrect filename syntax"; -- case AVERROR_INVALIDDATA: -- return "Invalid data in header"; -- case AVERROR_NOFMT: -- return "Unknown format"; -- case AVERROR_IO: -- return "I/O error occurred"; -- case AVERROR_NOMEM: -- return "Memory allocation error"; -- default: -- break; -- } -- return "Unspecified error"; --} -+//Deprecated Errors, should be using AVERROR(EINVAL) to return error strings -+//static const char * icvFFMPEGErrStr(int err) -+//{ -+// switch(err) { -+// case AVERROR_NUMEXPECTED: -+// return "Incorrect filename syntax"; -+// case AVERROR_INVALIDDATA: -+// return "Invalid data in header"; -+// case AVERROR_NOFMT: -+// return "Unknown format"; -+// case AVERROR_IO: -+// return "I/O error occurred"; -+// case AVERROR_NOMEM: -+// return "Memory allocation error"; -+// default: -+// break; -+// } -+// return "Unspecified error"; -+//} - - /* function internal to FFMPEG (libavformat/riff.c) to lookup codec id by fourcc tag*/ - extern "C" { -@@ -899,7 +912,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 +924,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 +1011,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 +1031,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 +1228,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 +1251,7 @@ - #endif - - // alloc memory for context -- oc = av_alloc_format_context(); -+ oc = avformat_alloc_context(); - assert (oc); - - /* set file name */ -@@ -1310,7 +1323,7 @@ - /* open the codec */ - if ( (err=avcodec_open(c, codec)) < 0) { - char errtext[256]; -- sprintf(errtext, "Could not open codec '%s': %s", codec->name, icvFFMPEGErrStr(err)); -+ sprintf(errtext, "Could not open codec '%s': %s", codec->name, AVERROR(EINVAL)); - CV_Error(CV_StsBadArg, errtext); - } - diff --git a/source/xmultimedia-extra/opencv/ptrcvcapture.patch b/source/xmultimedia-extra/opencv/ptrcvcapture.patch deleted file mode 100644 index c1316f0..0000000 --- a/source/xmultimedia-extra/opencv/ptrcvcapture.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: modules/highgui/src/cap.cpp -=================================================================== ---- modules/highgui/src/cap.cpp (revision 4283) -+++ modules/highgui/src/cap.cpp (working copy) -@@ -52,10 +52,10 @@ - namespace cv - { - --template<> inline void Ptr<CvCapture>::delete_obj() -+template<> void Ptr<CvCapture>::delete_obj() - { cvReleaseCapture(&obj); } - --template<> inline void Ptr<CvVideoWriter>::delete_obj() -+template<> void Ptr<CvVideoWriter>::delete_obj() - { cvReleaseVideoWriter(&obj); } - - } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
