From 4071339704508d583c15f5bc4e5af654dfabd192 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 18 Feb 2013 20:57:21 +0100 Subject: [PATCH] Update to 2.4.4 beta --- .gitignore | 1 + OpenCV-2.4.3-codecs.patch | 27 --------------------------- OpenCV-2.4.4-pillow.patch | 25 +++++++++++++++++++++++++ opencv-pillow.patch | 26 -------------------------- opencv.spec | 22 ++++++++++++---------- sources | 2 +- 6 files changed, 39 insertions(+), 64 deletions(-) delete mode 100644 OpenCV-2.4.3-codecs.patch create mode 100644 OpenCV-2.4.4-pillow.patch delete mode 100644 opencv-pillow.patch diff --git a/.gitignore b/.gitignore index 56d9a1a..c37073e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ OpenCV-2.1.0.tar.bz2 /OpenCV-2.4.1.tar.bz2 /OpenCV-2.4.2.tar.bz2 /OpenCV-2.4.3.tar.bz2 +/OpenCV-2.4.4-beta.tar.bz2 diff --git a/OpenCV-2.4.3-codecs.patch b/OpenCV-2.4.3-codecs.patch deleted file mode 100644 index 362fbcf..0000000 --- a/OpenCV-2.4.3-codecs.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up OpenCV-2.4.3/modules/highgui/src/cap_gstreamer.cpp.codecs OpenCV-2.4.3/modules/highgui/src/cap_gstreamer.cpp ---- OpenCV-2.4.3/modules/highgui/src/cap_gstreamer.cpp.codecs 2012-09-06 00:55:12.000000000 +0200 -+++ OpenCV-2.4.3/modules/highgui/src/cap_gstreamer.cpp 2013-01-06 00:14:14.628006270 +0100 -@@ -442,12 +442,19 @@ protected: - - void CvVideoWriter_GStreamer::init() - { -- encs[CV_FOURCC('H','F','Y','U')]=(char*)"ffenc_huffyuv"; - encs[CV_FOURCC('D','R','A','C')]=(char*)"diracenc"; -- encs[CV_FOURCC('X','V','I','D')]=(char*)"xvidenc"; -- encs[CV_FOURCC('X','2','6','4')]=(char*)"x264enc"; -+ encs[CV_FOURCC('H','F','Y','U')]=(char*)"ffenc_huffyuv"; -+ encs[CV_FOURCC('J','P','E','G')]=(char*)"jpegenc"; -+ encs[CV_FOURCC('M','J','P','G')]=(char*)"jpegenc"; - encs[CV_FOURCC('M','P','1','V')]=(char*)"mpeg2enc"; -- //encs[CV_FOURCC('M','P','2','V')]=(char*)"mpeg2enc"; -+ encs[CV_FOURCC('M','P','2','V')]=(char*)"mpeg2enc"; -+ encs[CV_FOURCC('T','H','E','O')]=(char*)"theoraenc"; -+ encs[CV_FOURCC('V','P','8','0')]=(char*)"vp8enc"; -+ encs[CV_FOURCC('H','2','6','4')]=(char*)"x264enc"; -+ encs[CV_FOURCC('X','2','6','4')]=(char*)"x264enc"; -+ encs[CV_FOURCC('X','V','I','D')]=(char*)"xvidenc"; -+ encs[CV_FOURCC('F','F','Y','U')]=(char*)"y4menc"; -+ //encs[CV_FOURCC('H','F','Y','U')]=(char*)"y4menc"; - pipeline=0; - buffer=0; - } diff --git a/OpenCV-2.4.4-pillow.patch b/OpenCV-2.4.4-pillow.patch new file mode 100644 index 0000000..33c07ad --- /dev/null +++ b/OpenCV-2.4.4-pillow.patch @@ -0,0 +1,25 @@ +diff -up OpenCV-2.4.4/modules/contrib/doc/facerec/src/crop_face.py.pillow OpenCV-2.4.4/modules/contrib/doc/facerec/src/crop_face.py +--- OpenCV-2.4.4/modules/contrib/doc/facerec/src/crop_face.py.pillow 2013-01-28 00:00:47.000000000 +0100 ++++ OpenCV-2.4.4/modules/contrib/doc/facerec/src/crop_face.py 2013-02-18 19:56:11.979405809 +0100 +@@ -31,7 +31,8 @@ + # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + # POSSIBILITY OF SUCH DAMAGE. + +-import sys, math, Image ++import sys, math ++from PIL import Image + + def Distance(p1,p2): + dx = p2[0] - p1[0] +diff -up OpenCV-2.4.4/modules/python/test/ticket_6.py.pillow OpenCV-2.4.4/modules/python/test/ticket_6.py +--- OpenCV-2.4.4/modules/python/test/ticket_6.py.pillow 2013-01-28 00:00:48.000000000 +0100 ++++ OpenCV-2.4.4/modules/python/test/ticket_6.py 2013-02-18 19:58:14.288877399 +0100 +@@ -2,7 +2,7 @@ + + import urllib + import cv2.cv as cv +-import Image ++from PIL import Image + import unittest + + class TestLoadImage(unittest.TestCase): diff --git a/opencv-pillow.patch b/opencv-pillow.patch deleted file mode 100644 index c4e94e6..0000000 --- a/opencv-pillow.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: OpenCV-2.4.3/modules/contrib/doc/facerec/src/crop_face.py -=================================================================== ---- OpenCV-2.4.3.orig/modules/contrib/doc/facerec/src/crop_face.py -+++ OpenCV-2.4.3/modules/contrib/doc/facerec/src/crop_face.py -@@ -31,7 +31,8 @@ - # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - # POSSIBILITY OF SUCH DAMAGE. - --import sys, math, Image -+import sys, math -+from PIL import Image - - def Distance(p1,p2): - dx = p2[0] - p1[0] -Index: OpenCV-2.4.3/modules/python/test/ticket_6.py -=================================================================== ---- OpenCV-2.4.3.orig/modules/python/test/ticket_6.py -+++ OpenCV-2.4.3/modules/python/test/ticket_6.py -@@ -1,6 +1,6 @@ - import urllib - import cv2.cv as cv --import Image -+from PIL import Image - import unittest - - class TestLoadImage(unittest.TestCase): diff --git a/opencv.spec b/opencv.spec index 076326c..13d5273 100644 --- a/opencv.spec +++ b/opencv.spec @@ -1,11 +1,11 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %global tar_name OpenCV -#global indice a +%global indice -beta Name: opencv -Version: 2.4.3 -Release: 7%{?dist} +Version: 2.4.4 +Release: 0.1.beta%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -17,9 +17,7 @@ Source1: opencv-samples-Makefile Patch0: opencv-pkgcmake.patch Patch1: opencv-pkgcmake2.patch #http://code.opencv.org/issues/2720 -Patch2: opencv-pillow.patch -#http://code.opencv.org/issues/2721 -Patch3: OpenCV-2.4.3-codecs.patch +Patch2: OpenCV-2.4.4-pillow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool @@ -56,7 +54,7 @@ BuildRequires: tbb-devel } BuildRequires: zlib-devel, pkgconfig BuildRequires: python-devel -BuildRequires: python-imaging, numpy, swig >= 1.3.24 +BuildRequires: numpy, swig >= 1.3.24 BuildRequires: python-sphinx %{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9} %{!?_without_gstreamer:BuildRequires: gstreamer-devel gstreamer-plugins-base-devel} @@ -94,7 +92,6 @@ This package contains the OpenCV documentation and examples programs. Summary: Python bindings for apps which use OpenCV Group: Development/Libraries Requires: opencv = %{version}-%{release} -Requires: python-imaging Requires: numpy %description python @@ -106,7 +103,6 @@ This package contains Python bindings for the OpenCV library. %patch0 -p1 -b .pkgcmake %patch1 -p1 -b .pkgcmake2 %patch2 -p1 -b .pillow -%patch3 -p1 -b .codecs # fix dos end of lines sed -i 's|\r||g' samples/c/adaptiveskindetector.cpp @@ -128,6 +124,7 @@ pushd build %{!?_with_sse3:-DENABLE_SSE3=0} \ -DCMAKE_BUILD_TYPE=ReleaseWithDebInfo \ -DBUILD_TEST=1 \ + -DBUILD_opencv_java=0 \ %{?_with_ttb: %ifarch %{ix86} x86_64 ia64 -DWITH_TBB=1 -DTBB_LIB_DIR=%{_libdir} \ @@ -224,7 +221,6 @@ rm -rf $RPM_BUILD_ROOT %files devel-docs %defattr(-,root,root,-) -%doc doc/opencv_tutorials.pdf %doc doc/*.{htm,png,jpg} %doc %{_datadir}/OpenCV/samples %doc %{_datadir}/opencv/samples @@ -236,6 +232,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 18 2013 Nicolas Chauvet - 2.4.4-0.1.beta +- Update to 2.4.4 beta +- Drop python-imaging also from requires +- Drop merged patch for additionals codecs +- Disable the java binding for now (untested) + * Fri Jan 25 2013 Honza Horak - 2.4.3-7 - Do not build with 1394 libs in rhel diff --git a/sources b/sources index afecdb0..579aeba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c0a5af4ff9d0d540684c0bf00ef35dbe OpenCV-2.4.3.tar.bz2 +eec1f1afe7b0b4a95d72336c8eaef996 OpenCV-2.4.4-beta.tar.bz2