From c0adc2e90826b7764b97ce94ea49fb4940df2f30 Mon Sep 17 00:00:00 2001 From: sibel Date: Thu, 15 Jul 2010 14:50:11 +0200 Subject: maj de opencv#2.1.0-1 --- extra/opencv/.footprint | 293 +++++++----------------------------------- extra/opencv/.md5sum | 3 +- extra/opencv/Pkgfile | 24 +++- extra/opencv/libpng-1.4.patch | 12 ++ 4 files changed, 81 insertions(+), 251 deletions(-) create mode 100644 extra/opencv/libpng-1.4.patch diff --git a/extra/opencv/.footprint b/extra/opencv/.footprint index bac6eb63d..7ed76c3a6 100644 --- a/extra/opencv/.footprint +++ b/extra/opencv/.footprint @@ -1,8 +1,9 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/opencv-createsamples --rwxr-xr-x root/root usr/bin/opencv-haartraining --rwxr-xr-x root/root usr/bin/opencv-performance +-rwxr-xr-x root/root usr/bin/opencv_createsamples +-rwxr-xr-x root/root usr/bin/opencv_haartraining +-rwxr-xr-x root/root usr/bin/opencv_performance +-rwxr-xr-x root/root usr/bin/opencv_traincascade drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/opencv/ -rw-r--r-- root/root usr/include/opencv/cv.h @@ -10,8 +11,7 @@ drwxr-xr-x root/root usr/include/opencv/ -rw-r--r-- root/root usr/include/opencv/cvaux.h -rw-r--r-- root/root usr/include/opencv/cvaux.hpp -rw-r--r-- root/root usr/include/opencv/cvcompat.h --rw-r--r-- root/root usr/include/opencv/cvhaartraining.h --rw-r--r-- root/root usr/include/opencv/cvmat.hpp +-rw-r--r-- root/root usr/include/opencv/cvinternal.h -rw-r--r-- root/root usr/include/opencv/cvtypes.h -rw-r--r-- root/root usr/include/opencv/cvver.h -rw-r--r-- root/root usr/include/opencv/cvvidsurv.hpp @@ -19,271 +19,78 @@ drwxr-xr-x root/root usr/include/opencv/ -rw-r--r-- root/root usr/include/opencv/cxcore.h -rw-r--r-- root/root usr/include/opencv/cxcore.hpp -rw-r--r-- root/root usr/include/opencv/cxerror.h +-rw-r--r-- root/root usr/include/opencv/cxflann.h +-rw-r--r-- root/root usr/include/opencv/cxmat.hpp -rw-r--r-- root/root usr/include/opencv/cxmisc.h +-rw-r--r-- root/root usr/include/opencv/cxoperations.hpp -rw-r--r-- root/root usr/include/opencv/cxtypes.h -rw-r--r-- root/root usr/include/opencv/highgui.h +-rw-r--r-- root/root usr/include/opencv/highgui.hpp -rw-r--r-- root/root usr/include/opencv/ml.h drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libcv.la -lrwxrwxrwx root/root usr/lib/libcv.so -> libcv.so.2.0.0 -lrwxrwxrwx root/root usr/lib/libcv.so.2 -> libcv.so.2.0.0 --rwxr-xr-x root/root usr/lib/libcv.so.2.0.0 --rwxr-xr-x root/root usr/lib/libcvaux.la -lrwxrwxrwx root/root usr/lib/libcvaux.so -> libcvaux.so.2.0.0 -lrwxrwxrwx root/root usr/lib/libcvaux.so.2 -> libcvaux.so.2.0.0 --rwxr-xr-x root/root usr/lib/libcvaux.so.2.0.0 --rw-r--r-- root/root usr/lib/libcvhaartraining.a --rwxr-xr-x root/root usr/lib/libcxcore.la -lrwxrwxrwx root/root usr/lib/libcxcore.so -> libcxcore.so.2.0.0 -lrwxrwxrwx root/root usr/lib/libcxcore.so.2 -> libcxcore.so.2.0.0 --rwxr-xr-x root/root usr/lib/libcxcore.so.2.0.0 --rwxr-xr-x root/root usr/lib/libhighgui.la -lrwxrwxrwx root/root usr/lib/libhighgui.so -> libhighgui.so.2.0.0 -lrwxrwxrwx root/root usr/lib/libhighgui.so.2 -> libhighgui.so.2.0.0 --rwxr-xr-x root/root usr/lib/libhighgui.so.2.0.0 --rwxr-xr-x root/root usr/lib/libml.la -lrwxrwxrwx root/root usr/lib/libml.so -> libml.so.2.0.0 -lrwxrwxrwx root/root usr/lib/libml.so.2 -> libml.so.2.0.0 --rwxr-xr-x root/root usr/lib/libml.so.2.0.0 +lrwxrwxrwx root/root usr/lib/libcv.so -> libcv.so.2.1 +lrwxrwxrwx root/root usr/lib/libcv.so.2.1 -> libcv.so.2.1.0 +-rwxr-xr-x root/root usr/lib/libcv.so.2.1.0 +lrwxrwxrwx root/root usr/lib/libcvaux.so -> libcvaux.so.2.1 +lrwxrwxrwx root/root usr/lib/libcvaux.so.2.1 -> libcvaux.so.2.1.0 +-rwxr-xr-x root/root usr/lib/libcvaux.so.2.1.0 +lrwxrwxrwx root/root usr/lib/libcxcore.so -> libcxcore.so.2.1 +lrwxrwxrwx root/root usr/lib/libcxcore.so.2.1 -> libcxcore.so.2.1.0 +-rwxr-xr-x root/root usr/lib/libcxcore.so.2.1.0 +lrwxrwxrwx root/root usr/lib/libhighgui.so -> libhighgui.so.2.1 +lrwxrwxrwx root/root usr/lib/libhighgui.so.2.1 -> libhighgui.so.2.1.0 +-rwxr-xr-x root/root usr/lib/libhighgui.so.2.1.0 +lrwxrwxrwx root/root usr/lib/libml.so -> libml.so.2.1 +lrwxrwxrwx root/root usr/lib/libml.so.2.1 -> libml.so.2.1.0 +-rwxr-xr-x root/root usr/lib/libml.so.2.1.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/opencv.pc drwxr-xr-x root/root usr/lib/python2.6/ drwxr-xr-x root/root usr/lib/python2.6/site-packages/ -drwxr-xr-x root/root usr/lib/python2.6/site-packages/opencv/ --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/__init__.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/__init__.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/__init__.pyo --rwxr-xr-x root/root usr/lib/python2.6/site-packages/opencv/_cv.la --rwxr-xr-x root/root usr/lib/python2.6/site-packages/opencv/_cv.so --rwxr-xr-x root/root usr/lib/python2.6/site-packages/opencv/_highgui.la --rwxr-xr-x root/root usr/lib/python2.6/site-packages/opencv/_highgui.so --rwxr-xr-x root/root usr/lib/python2.6/site-packages/opencv/_ml.la --rwxr-xr-x root/root usr/lib/python2.6/site-packages/opencv/_ml.so --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/adaptors.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/adaptors.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/adaptors.pyo --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/cv.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/cv.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/cv.pyo --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/highgui.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/highgui.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/highgui.pyo --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/matlab_syntax.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/matlab_syntax.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/matlab_syntax.pyo --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/ml.py --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/ml.pyc --rw-r--r-- root/root usr/lib/python2.6/site-packages/opencv/ml.pyo +-rw-r--r-- root/root usr/lib/python2.6/site-packages/cv.so drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/opencv/ --rw-r--r-- root/root usr/share/opencv/ChangeLog --rw-r--r-- root/root usr/share/opencv/THANKS +-rw-r--r-- root/root usr/share/opencv/OpenCVConfig.cmake drwxr-xr-x root/root usr/share/opencv/doc/ --rw-r--r-- root/root usr/share/opencv/doc/cvcam.rtf --rw-r--r-- root/root usr/share/opencv/doc/faq.htm +-rw-r--r-- root/root usr/share/opencv/doc/CMakeLists.txt +-rw-r--r-- root/root usr/share/opencv/doc/ChangeLog.htm +-rw-r--r-- root/root usr/share/opencv/doc/README.txt +-rw-r--r-- root/root usr/share/opencv/doc/haartraining.htm -rw-r--r-- root/root usr/share/opencv/doc/index.htm -rw-r--r-- root/root usr/share/opencv/doc/license.txt -rw-r--r-- root/root usr/share/opencv/doc/opencv-logo.png -rw-r--r-- root/root usr/share/opencv/doc/opencv-logo2.png -rw-r--r-- root/root usr/share/opencv/doc/opencv.jpg --rw-r--r-- root/root usr/share/opencv/doc/opencvman_old.pdf +-rw-r--r-- root/root usr/share/opencv/doc/opencv.pdf +-rw-r--r-- root/root usr/share/opencv/doc/packaging.txt drwxr-xr-x root/root usr/share/opencv/doc/papers/ -rw-r--r-- root/root usr/share/opencv/doc/papers/algo_tracking.pdf -rw-r--r-- root/root usr/share/opencv/doc/papers/avbpa99.ps -rw-r--r-- root/root usr/share/opencv/doc/papers/camshift.pdf --rw-r--r-- root/root usr/share/opencv/doc/python-wrappers-on-windows.txt --rw-r--r-- root/root usr/share/opencv/doc/python.txt -drwxr-xr-x root/root usr/share/opencv/doc/ref/ --rw-r--r-- root/root usr/share/opencv/doc/ref/opencvref.css --rw-r--r-- root/root usr/share/opencv/doc/ref/opencvref_cv.htm --rw-r--r-- root/root usr/share/opencv/doc/ref/opencvref_cvaux.htm --rw-r--r-- root/root usr/share/opencv/doc/ref/opencvref_cxcore.htm --rw-r--r-- root/root usr/share/opencv/doc/ref/opencvref_highgui.htm --rw-r--r-- root/root usr/share/opencv/doc/ref/opencvref_ml.htm -drwxr-xr-x root/root usr/share/opencv/doc/ref/pics/ --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/backprojectpatch.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/boundingrect.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/building.jpg --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/contoursecarea.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/cornersubpix.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/defects.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/disparity.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/ellipse.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/em1.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/em3.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/em4.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/em5.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/em6.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/em7.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/em8.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/em9.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/errmsg.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/face.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/haarfeatures.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/houghp.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/inv_logpolar.jpg --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/left.jpg --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/logpolar.jpg --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/maxrect.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/memstorage1.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/memstorage2.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/minareabox.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/mlp_.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/neuron_model.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/pointpolygon.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/quadedge.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/right.jpg --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/sigmoid_bipolar.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/subdiv.png --rw-r--r-- root/root usr/share/opencv/doc/ref/pics/threshold.png +-rw-r--r-- root/root usr/share/opencv/doc/pattern.pdf +drwxr-xr-x root/root usr/share/opencv/doc/vidsurv/ +-rw-r--r-- root/root usr/share/opencv/doc/vidsurv/Blob_Tracking_Modules.doc +-rw-r--r-- root/root usr/share/opencv/doc/vidsurv/Blob_Tracking_Tests.doc +-rw-r--r-- root/root usr/share/opencv/doc/vidsurv/TestSeq.doc drwxr-xr-x root/root usr/share/opencv/haarcascades/ +-rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_eye.xml +-rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_eye_tree_eyeglasses.xml -rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_frontalface_alt.xml -rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_frontalface_alt2.xml -rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_frontalface_alt_tree.xml -rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_frontalface_default.xml -rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_fullbody.xml +-rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_lefteye_2splits.xml -rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_lowerbody.xml +-rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_mcs_eyepair_big.xml +-rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_mcs_eyepair_small.xml +-rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_mcs_lefteye.xml +-rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_mcs_mouth.xml +-rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_mcs_nose.xml +-rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_mcs_righteye.xml +-rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_mcs_upperbody.xml -rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_profileface.xml +-rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_righteye_2splits.xml -rw-r--r-- root/root usr/share/opencv/haarcascades/haarcascade_upperbody.xml --rw-r--r-- root/root usr/share/opencv/readme.txt -drwxr-xr-x root/root usr/share/opencv/samples/ -drwxr-xr-x root/root usr/share/opencv/samples/c/ --rw-r--r-- root/root usr/share/opencv/samples/c/agaricus-lepiota.data --rw-r--r-- root/root usr/share/opencv/samples/c/airplane.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/baboon.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/bgfg_codebook.cpp --rw-r--r-- root/root usr/share/opencv/samples/c/bgfg_segm.cpp --rw-r--r-- root/root usr/share/opencv/samples/c/blobtrack.cpp --rw-r--r-- root/root usr/share/opencv/samples/c/box.png --rw-r--r-- root/root usr/share/opencv/samples/c/box_in_scene.png --rw-r--r-- root/root usr/share/opencv/samples/c/build_all.sh --rw-r--r-- root/root usr/share/opencv/samples/c/camshiftdemo.c --rw-r--r-- root/root usr/share/opencv/samples/c/contours.c --rw-r--r-- root/root usr/share/opencv/samples/c/convert_cascade.c --rw-r--r-- root/root usr/share/opencv/samples/c/convexhull.c --rw-r--r-- root/root usr/share/opencv/samples/c/cvsample.dsp --rw-r--r-- root/root usr/share/opencv/samples/c/delaunay.c --rw-r--r-- root/root usr/share/opencv/samples/c/demhist.c --rw-r--r-- root/root usr/share/opencv/samples/c/dft.c --rw-r--r-- root/root usr/share/opencv/samples/c/distrans.c --rw-r--r-- root/root usr/share/opencv/samples/c/drawing.c --rw-r--r-- root/root usr/share/opencv/samples/c/edge.c --rw-r--r-- root/root usr/share/opencv/samples/c/facedetect.c --rw-r--r-- root/root usr/share/opencv/samples/c/facedetect.cmd --rw-r--r-- root/root usr/share/opencv/samples/c/ffilldemo.c --rw-r--r-- root/root usr/share/opencv/samples/c/find_obj.cpp --rw-r--r-- root/root usr/share/opencv/samples/c/fitellipse.c --rw-r--r-- root/root usr/share/opencv/samples/c/fruits.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/houghlines.c --rw-r--r-- root/root usr/share/opencv/samples/c/image.cpp --rw-r--r-- root/root usr/share/opencv/samples/c/inpaint.cpp --rw-r--r-- root/root usr/share/opencv/samples/c/kalman.c --rw-r--r-- root/root usr/share/opencv/samples/c/kmeans.c --rw-r--r-- root/root usr/share/opencv/samples/c/laplace.c --rw-r--r-- root/root usr/share/opencv/samples/c/left01.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/left02.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/left03.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/left04.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/left05.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/left06.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/left07.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/left08.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/left09.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/left11.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/left12.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/left13.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/left14.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/lena.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/letter-recognition.data --rw-r--r-- root/root usr/share/opencv/samples/c/letter_recog.cpp --rw-r--r-- root/root usr/share/opencv/samples/c/lkdemo.c --rw-r--r-- root/root usr/share/opencv/samples/c/makefile.gnu --rw-r--r-- root/root usr/share/opencv/samples/c/makefile.ms --rw-r--r-- root/root usr/share/opencv/samples/c/minarea.c --rw-r--r-- root/root usr/share/opencv/samples/c/morphology.c --rw-r--r-- root/root usr/share/opencv/samples/c/motempl.c --rw-r--r-- root/root usr/share/opencv/samples/c/mushroom.cpp --rw-r--r-- root/root usr/share/opencv/samples/c/pic1.png --rw-r--r-- root/root usr/share/opencv/samples/c/pic2.png --rw-r--r-- root/root usr/share/opencv/samples/c/pic3.png --rw-r--r-- root/root usr/share/opencv/samples/c/pic4.png --rw-r--r-- root/root usr/share/opencv/samples/c/pic5.png --rw-r--r-- root/root usr/share/opencv/samples/c/pic6.png --rw-r--r-- root/root usr/share/opencv/samples/c/pyramid_segmentation.c --rw-r--r-- root/root usr/share/opencv/samples/c/right01.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/right02.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/right03.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/right04.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/right05.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/right06.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/right07.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/right08.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/right09.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/right11.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/right12.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/right13.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/right14.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/squares.c --rw-r--r-- root/root usr/share/opencv/samples/c/stereo_calib.cpp --rw-r--r-- root/root usr/share/opencv/samples/c/stereo_calib.txt --rw-r--r-- root/root usr/share/opencv/samples/c/stuff.jpg --rw-r--r-- root/root usr/share/opencv/samples/c/tree.avi --rw-r--r-- root/root usr/share/opencv/samples/c/watershed.cpp -drwxr-xr-x root/root usr/share/opencv/samples/octave/ --rwxr-xr-x root/root usr/share/opencv/samples/octave/cam-histo.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/capture-cam.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/chessboard.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/contours.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/convexhull.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/delaunay.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/demhist.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/dft.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/distrans.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/drawing.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/edge.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/facedetect.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/ffilldemo.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/fitellipse.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/houghlines.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/inpaint.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/kalman.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/kmeans.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/laplace.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/lkdemo.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/logpolar.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/minarea.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/minidemo.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/morphology.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/motempl.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/pyramid_segmentation.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/squares.m --rwxr-xr-x root/root usr/share/opencv/samples/octave/watershed.m -drwxr-xr-x root/root usr/share/opencv/samples/python/ --rwxr-xr-x root/root usr/share/opencv/samples/python/cam-histo.py --rwxr-xr-x root/root usr/share/opencv/samples/python/capture-cam.py --rwxr-xr-x root/root usr/share/opencv/samples/python/chessboard.py --rwxr-xr-x root/root usr/share/opencv/samples/python/contours.py --rwxr-xr-x root/root usr/share/opencv/samples/python/convexhull.py --rwxr-xr-x root/root usr/share/opencv/samples/python/delaunay.py --rwxr-xr-x root/root usr/share/opencv/samples/python/demhist.py --rwxr-xr-x root/root usr/share/opencv/samples/python/dft.py --rwxr-xr-x root/root usr/share/opencv/samples/python/distrans.py --rwxr-xr-x root/root usr/share/opencv/samples/python/drawing.py --rwxr-xr-x root/root usr/share/opencv/samples/python/edge.py --rwxr-xr-x root/root usr/share/opencv/samples/python/facedetect.py --rwxr-xr-x root/root usr/share/opencv/samples/python/ffilldemo.py --rwxr-xr-x root/root usr/share/opencv/samples/python/fitellipse.py --rwxr-xr-x root/root usr/share/opencv/samples/python/houghlines.py --rwxr-xr-x root/root usr/share/opencv/samples/python/inpaint.py --rwxr-xr-x root/root usr/share/opencv/samples/python/kalman.py --rwxr-xr-x root/root usr/share/opencv/samples/python/kmeans.py --rwxr-xr-x root/root usr/share/opencv/samples/python/laplace.py --rwxr-xr-x root/root usr/share/opencv/samples/python/lkdemo.py --rwxr-xr-x root/root usr/share/opencv/samples/python/logpolar.py --rwxr-xr-x root/root usr/share/opencv/samples/python/minarea.py --rwxr-xr-x root/root usr/share/opencv/samples/python/minidemo.py --rwxr-xr-x root/root usr/share/opencv/samples/python/morphology.py --rwxr-xr-x root/root usr/share/opencv/samples/python/motempl.py --rwxr-xr-x root/root usr/share/opencv/samples/python/pyramid_segmentation.py --rwxr-xr-x root/root usr/share/opencv/samples/python/squares.py --rwxr-xr-x root/root usr/share/opencv/samples/python/watershed.py +drwxr-xr-x root/root usr/share/opencv/lbpcascades/ +-rw-r--r-- root/root usr/share/opencv/lbpcascades/lbpcascade_frontalface.xml diff --git a/extra/opencv/.md5sum b/extra/opencv/.md5sum index 98dce8e2b..c5bd2b535 100644 --- a/extra/opencv/.md5sum +++ b/extra/opencv/.md5sum @@ -1,2 +1,3 @@ +1d71584fb4e04214c0085108f95e24c8 OpenCV-2.1.0.tar.bz2 +301f9108f2ee875d889c279adadb254e libpng-1.4.patch 2d787a389b6fd47e181d3996374a0100 opencv-1.0.0-gcc44.patch -b147b7cd3c059831c415c5a2bcecdf95 opencv-1.1pre1.tar.gz diff --git a/extra/opencv/Pkgfile b/extra/opencv/Pkgfile index 4db03ec76..667ae9b8a 100644 --- a/extra/opencv/Pkgfile +++ b/extra/opencv/Pkgfile @@ -2,18 +2,28 @@ # URL: http://opencv.willowgarage.com/wiki/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: libjpeg, libtiff, jasper, libpng, ffmpeg, gstreamer, xine-lib, libdc1394 +# Depends on: libjpeg, libtiff, jasper, libpng, ffmpeg, gstreamer, xine-lib, libdc1394, libv4l name=opencv -version=1.1pre1 +version=2.1.0 release=1 -source=(http://ovh.dl.sourceforge.net/sourceforge/opencvlibrary/$name-$version.tar.gz\ - opencv-1.0.0-gcc44.patch) +source=(http://downloads.sourceforge.net/opencvlibrary/OpenCV-$version.tar.bz2 + opencv-1.0.0-gcc44.patch + libpng-1.4.patch) build() { - cd $name-1.1.0 - patch -Np1 -i ../opencv-1.0.0-gcc44.patch - ./configure --prefix=/usr + cd OpenCV-$version +# patch -Np1 -i ../opencv-1.0.0-gcc44.patch + patch -p1 -i $SRC/libpng-1.4.patch + cd $SRC + mkdir build + cd build + cmake ../OpenCV-$version \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DWITH_XINE=ON \ + -DWITH_UNICAP=OFF make -j3 make DESTDIR=$PKG install } diff --git a/extra/opencv/libpng-1.4.patch b/extra/opencv/libpng-1.4.patch new file mode 100644 index 000000000..c34c5a58a --- /dev/null +++ b/extra/opencv/libpng-1.4.patch @@ -0,0 +1,12 @@ +diff -Naur OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp OpenCV-2.0.0/src/highgui/grfmt_png.cpp +--- OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp 2010-01-21 01:08:46.000000000 -0500 ++++ OpenCV-2.0.0/src/highgui/grfmt_png.cpp 2010-01-21 01:13:11.000000000 -0500 +@@ -223,7 +223,7 @@ + png_set_palette_to_rgb( png_ptr ); + + if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 ) +- png_set_gray_1_2_4_to_8( png_ptr ); ++ png_set_expand_gray_1_2_4_to_8( png_ptr ); + + if( CV_MAT_CN(m_type) > 1 && color ) + png_set_bgr( png_ptr ); // convert RGB to BGR -- cgit v1.2.3-70-g09d2